Remove remaining PLATFORM(CHROMIUM)-guarded code in WebCore
authorbenjamin@webkit.org <benjamin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Apr 2013 00:52:39 +0000 (00:52 +0000)
committerbenjamin@webkit.org <benjamin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Apr 2013 00:52:39 +0000 (00:52 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114081

Remove the remaining PLATFORM(CHROMIUM) build guards. There are still a couple of guards
that most likely apply only to Chromium, like OS(ANDROID) or USE(SKIA_ON_MAC_CHROMIUM),
but removal of these should go into separate patches.

Patch by Zan Dobersek <zdobersek@igalia.com> on 2013-04-07

* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore):
* config.h:
* history/PageCache.cpp:
(WebCore):
(WebCore::logCanCacheFrameDecision):
(WebCore::logCanCachePageDecision):
(WebCore::PageCache::canCache):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext):
(WebCore::HTMLCanvasElement::shouldAccelerate):
* html/HTMLCanvasElement.h:
* html/HTMLMediaElement.cpp:
(WebCore::createFileURLForApplicationCacheResource):
(WebCore::HTMLMediaElement::loadResource):
* html/HTMLSelectElement.cpp:
(WebCore):
(WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
* html/MediaDocument.cpp:
(WebCore::MediaDocument::defaultEventHandler):
* html/canvas/EXTDrawBuffers.cpp:
(WebCore::EXTDrawBuffers::satisfiesWebGLRequirements):
* html/canvas/WebGLRenderingContext.cpp:
(WebCore):
(WebCore::WebGLRenderingContext::create):
(WebCore::WebGLRenderingContext::WebGLRenderingContext):
(WebCore::WebGLRenderingContext::paintRenderingResultsToCanvas):
(WebCore::WebGLRenderingContext::platformLayer):
* inspector/InspectorInstrumentation.cpp:
(WebCore):
(WebCore::InspectorInstrumentation::willPaintImpl):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didBeginFrame):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::notifyFinished):
* page/FeatureObserver.cpp:
(WebCore::FeatureObserver::~FeatureObserver):
* platform/AsyncFileSystem.cpp:
(WebCore):
* platform/ContextMenu.h:
(ContextMenu):
* platform/ContextMenuItem.h:
* platform/Cursor.h:
* platform/DragData.cpp:
(WebCore):
* platform/DragData.h:
* platform/DragImage.h:
* platform/LocalizedStrings.h:
(WebCore):
* platform/Pasteboard.h:
(Pasteboard):
* platform/PlatformExportMacros.h:
* platform/PlatformInstrumentation.h:
(WebCore::PlatformInstrumentation::willDecodeImage):
(WebCore::PlatformInstrumentation::didDecodeImage):
(WebCore::PlatformInstrumentation::willResizeImage):
(WebCore::PlatformInstrumentation::didResizeImage):
* platform/PlatformMenuDescription.h:
(WebCore):
* platform/PlatformSpeechSynthesizer.h:
(PlatformSpeechSynthesizer):
* platform/PlatformWheelEvent.h:
(WebCore::PlatformWheelEvent::PlatformWheelEvent):
(PlatformWheelEvent):
* platform/ScrollAnimator.cpp:
(WebCore):
(WebCore::ScrollAnimator::handleWheelEvent):
* platform/ScrollAnimator.h:
(ScrollAnimator):
* platform/ScrollAnimatorNone.cpp:
(WebCore::ScrollAnimatorNone::scroll):
(WebCore::ScrollAnimatorNone::animationTimerFired):
* platform/ScrollView.cpp:
(WebCore::ScrollView::updateOverhangAreas):
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::scrollPositionChanged):
* platform/Scrollbar.cpp:
* platform/SecureTextInput.cpp: Removed.
* platform/SecureTextInput.h:
(WebCore):
* platform/SuddenTermination.h:
(WebCore):
* platform/Widget.h:
(Widget):
* platform/graphics/ANGLEWebKitBridge.h:
* platform/graphics/BitmapImage.h:
* platform/graphics/FloatPoint.h:
(FloatPoint):
* platform/graphics/FloatRect.h:
(FloatRect):
* platform/graphics/FloatSize.h:
(FloatSize):
* platform/graphics/Font.cpp:
(WebCore):
(WebCore::Font::width):
* platform/graphics/Font.h:
(Font):
* platform/graphics/FontCache.cpp:
(WebCore):
* platform/graphics/FontCache.h:
(FontCache):
* platform/graphics/FontDescription.h:
* platform/graphics/FontPlatformData.cpp:
* platform/graphics/GlyphBuffer.h:
(WebCore):
(WebCore::GlyphBuffer::add):
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::drawImage):
(WebCore::GraphicsContext::drawImageBuffer):
* platform/graphics/GraphicsContext3D.h:
(GraphicsContext3D):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::supportsBackgroundColorContent):
* platform/graphics/Icon.h:
(Icon):
* platform/graphics/ImageSource.cpp:
* platform/graphics/ImageSource.h:
(WebCore):
* platform/graphics/IntRect.h:
(IntRect):
(WebCore):
* platform/graphics/MediaPlayer.cpp:
* platform/graphics/PlatformLayer.h:
* platform/graphics/SimpleFontData.h:
(SimpleFontData):
(DerivedFontData):
* platform/graphics/filters/FECustomFilter.cpp:
(WebCore::FECustomFilter::resizeContext):
* platform/graphics/gpu/DrawingBuffer.h:
(WebCore):
(DrawingBuffer):
* platform/graphics/gpu/SharedGraphicsContext3D.cpp:
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
(WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):
* platform/image-decoders/ImageDecoder.h:
* platform/leveldb/LevelDBDatabase.cpp:
(WebCore::LevelDBDatabase::open):
* platform/network/BlobRegistry.cpp:
(WebCore::blobRegistry):
* platform/network/BlobRegistryImpl.cpp:
* platform/network/NetworkStateNotifier.cpp:
* platform/network/NetworkStateNotifier.h:
(NetworkStateNotifier):
* platform/network/NetworkingContext.h:
(NetworkingContext):
* platform/network/ResourceHandleClient.h:
* platform/network/ResourceRequestBase.cpp:
(WebCore):
* platform/text/cf/HyphenationCF.cpp:
* plugins/PluginViewNone.cpp:
(WebCore):
* testing/Internals.cpp:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147888 268f45cc-cd09-0410-ab3c-d52691b4dbfc

78 files changed:
Source/WebCore/ChangeLog
Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
Source/WebCore/config.h
Source/WebCore/history/PageCache.cpp
Source/WebCore/html/HTMLCanvasElement.cpp
Source/WebCore/html/HTMLCanvasElement.h
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/html/HTMLSelectElement.cpp
Source/WebCore/html/MediaDocument.cpp
Source/WebCore/html/canvas/EXTDrawBuffers.cpp
Source/WebCore/html/canvas/WebGLRenderingContext.cpp
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorTimelineAgent.cpp
Source/WebCore/loader/DocumentLoader.cpp
Source/WebCore/page/FeatureObserver.cpp
Source/WebCore/platform/AsyncFileSystem.cpp
Source/WebCore/platform/ContextMenu.h
Source/WebCore/platform/ContextMenuItem.h
Source/WebCore/platform/Cursor.h
Source/WebCore/platform/DragData.cpp
Source/WebCore/platform/DragData.h
Source/WebCore/platform/DragImage.h
Source/WebCore/platform/LocalizedStrings.h
Source/WebCore/platform/Pasteboard.h
Source/WebCore/platform/PlatformExportMacros.h
Source/WebCore/platform/PlatformInstrumentation.h
Source/WebCore/platform/PlatformMenuDescription.h
Source/WebCore/platform/PlatformSpeechSynthesizer.h
Source/WebCore/platform/PlatformWheelEvent.h
Source/WebCore/platform/ScrollAnimator.cpp
Source/WebCore/platform/ScrollAnimator.h
Source/WebCore/platform/ScrollAnimatorNone.cpp
Source/WebCore/platform/ScrollView.cpp
Source/WebCore/platform/ScrollableArea.cpp
Source/WebCore/platform/Scrollbar.cpp
Source/WebCore/platform/SecureTextInput.cpp [deleted file]
Source/WebCore/platform/SecureTextInput.h
Source/WebCore/platform/SuddenTermination.h
Source/WebCore/platform/Widget.h
Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
Source/WebCore/platform/graphics/BitmapImage.h
Source/WebCore/platform/graphics/FloatPoint.h
Source/WebCore/platform/graphics/FloatRect.h
Source/WebCore/platform/graphics/FloatSize.h
Source/WebCore/platform/graphics/Font.cpp
Source/WebCore/platform/graphics/Font.h
Source/WebCore/platform/graphics/FontCache.cpp
Source/WebCore/platform/graphics/FontCache.h
Source/WebCore/platform/graphics/FontDescription.h
Source/WebCore/platform/graphics/FontPlatformData.cpp
Source/WebCore/platform/graphics/GlyphBuffer.h
Source/WebCore/platform/graphics/GraphicsContext.cpp
Source/WebCore/platform/graphics/GraphicsContext3D.h
Source/WebCore/platform/graphics/GraphicsLayer.h
Source/WebCore/platform/graphics/Icon.h
Source/WebCore/platform/graphics/ImageSource.cpp
Source/WebCore/platform/graphics/ImageSource.h
Source/WebCore/platform/graphics/IntRect.h
Source/WebCore/platform/graphics/MediaPlayer.cpp
Source/WebCore/platform/graphics/PlatformLayer.h
Source/WebCore/platform/graphics/SimpleFontData.h
Source/WebCore/platform/graphics/filters/FECustomFilter.cpp
Source/WebCore/platform/graphics/gpu/DrawingBuffer.h
Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp
Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
Source/WebCore/platform/image-decoders/ImageDecoder.h
Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
Source/WebCore/platform/network/BlobRegistry.cpp
Source/WebCore/platform/network/BlobRegistryImpl.cpp
Source/WebCore/platform/network/NetworkStateNotifier.cpp
Source/WebCore/platform/network/NetworkStateNotifier.h
Source/WebCore/platform/network/NetworkingContext.h
Source/WebCore/platform/network/ResourceHandleClient.h
Source/WebCore/platform/network/ResourceRequestBase.cpp
Source/WebCore/platform/text/cf/HyphenationCF.cpp
Source/WebCore/plugins/PluginViewNone.cpp
Source/WebCore/testing/Internals.cpp
Source/WebCore/xml/XMLHttpRequest.cpp

index c5023be..0b89910 100644 (file)
@@ -1,3 +1,167 @@
+2013-04-07  Zan Dobersek  <zdobersek@igalia.com>
+
+        Remove remaining PLATFORM(CHROMIUM)-guarded code in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=114081
+
+        Remove the remaining PLATFORM(CHROMIUM) build guards. There are still a couple of guards
+        that most likely apply only to Chromium, like OS(ANDROID) or USE(SKIA_ON_MAC_CHROMIUM),
+        but removal of these should go into separate patches.
+
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
+        (WebCore):
+        * config.h:
+        * history/PageCache.cpp:
+        (WebCore):
+        (WebCore::logCanCacheFrameDecision):
+        (WebCore::logCanCachePageDecision):
+        (WebCore::PageCache::canCache):
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::getContext):
+        (WebCore::HTMLCanvasElement::shouldAccelerate):
+        * html/HTMLCanvasElement.h:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::createFileURLForApplicationCacheResource):
+        (WebCore::HTMLMediaElement::loadResource):
+        * html/HTMLSelectElement.cpp:
+        (WebCore):
+        (WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
+        * html/MediaDocument.cpp:
+        (WebCore::MediaDocument::defaultEventHandler):
+        * html/canvas/EXTDrawBuffers.cpp:
+        (WebCore::EXTDrawBuffers::satisfiesWebGLRequirements):
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore):
+        (WebCore::WebGLRenderingContext::create):
+        (WebCore::WebGLRenderingContext::WebGLRenderingContext):
+        (WebCore::WebGLRenderingContext::paintRenderingResultsToCanvas):
+        (WebCore::WebGLRenderingContext::platformLayer):
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore):
+        (WebCore::InspectorInstrumentation::willPaintImpl):
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::didBeginFrame):
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::notifyFinished):
+        * page/FeatureObserver.cpp:
+        (WebCore::FeatureObserver::~FeatureObserver):
+        * platform/AsyncFileSystem.cpp:
+        (WebCore):
+        * platform/ContextMenu.h:
+        (ContextMenu):
+        * platform/ContextMenuItem.h:
+        * platform/Cursor.h:
+        * platform/DragData.cpp:
+        (WebCore):
+        * platform/DragData.h:
+        * platform/DragImage.h:
+        * platform/LocalizedStrings.h:
+        (WebCore):
+        * platform/Pasteboard.h:
+        (Pasteboard):
+        * platform/PlatformExportMacros.h:
+        * platform/PlatformInstrumentation.h:
+        (WebCore::PlatformInstrumentation::willDecodeImage):
+        (WebCore::PlatformInstrumentation::didDecodeImage):
+        (WebCore::PlatformInstrumentation::willResizeImage):
+        (WebCore::PlatformInstrumentation::didResizeImage):
+        * platform/PlatformMenuDescription.h:
+        (WebCore):
+        * platform/PlatformSpeechSynthesizer.h:
+        (PlatformSpeechSynthesizer):
+        * platform/PlatformWheelEvent.h:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+        (PlatformWheelEvent):
+        * platform/ScrollAnimator.cpp:
+        (WebCore):
+        (WebCore::ScrollAnimator::handleWheelEvent):
+        * platform/ScrollAnimator.h:
+        (ScrollAnimator):
+        * platform/ScrollAnimatorNone.cpp:
+        (WebCore::ScrollAnimatorNone::scroll):
+        (WebCore::ScrollAnimatorNone::animationTimerFired):
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::updateOverhangAreas):
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::scrollPositionChanged):
+        * platform/Scrollbar.cpp:
+        * platform/SecureTextInput.cpp: Removed.
+        * platform/SecureTextInput.h:
+        (WebCore):
+        * platform/SuddenTermination.h:
+        (WebCore):
+        * platform/Widget.h:
+        (Widget):
+        * platform/graphics/ANGLEWebKitBridge.h:
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/FloatPoint.h:
+        (FloatPoint):
+        * platform/graphics/FloatRect.h:
+        (FloatRect):
+        * platform/graphics/FloatSize.h:
+        (FloatSize):
+        * platform/graphics/Font.cpp:
+        (WebCore):
+        (WebCore::Font::width):
+        * platform/graphics/Font.h:
+        (Font):
+        * platform/graphics/FontCache.cpp:
+        (WebCore):
+        * platform/graphics/FontCache.h:
+        (FontCache):
+        * platform/graphics/FontDescription.h:
+        * platform/graphics/FontPlatformData.cpp:
+        * platform/graphics/GlyphBuffer.h:
+        (WebCore):
+        (WebCore::GlyphBuffer::add):
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::drawImage):
+        (WebCore::GraphicsContext::drawImageBuffer):
+        * platform/graphics/GraphicsContext3D.h:
+        (GraphicsContext3D):
+        * platform/graphics/GraphicsLayer.h:
+        (WebCore::GraphicsLayer::supportsBackgroundColorContent):
+        * platform/graphics/Icon.h:
+        (Icon):
+        * platform/graphics/ImageSource.cpp:
+        * platform/graphics/ImageSource.h:
+        (WebCore):
+        * platform/graphics/IntRect.h:
+        (IntRect):
+        (WebCore):
+        * platform/graphics/MediaPlayer.cpp:
+        * platform/graphics/PlatformLayer.h:
+        * platform/graphics/SimpleFontData.h:
+        (SimpleFontData):
+        (DerivedFontData):
+        * platform/graphics/filters/FECustomFilter.cpp:
+        (WebCore::FECustomFilter::resizeContext):
+        * platform/graphics/gpu/DrawingBuffer.h:
+        (WebCore):
+        (DrawingBuffer):
+        * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
+        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+        (WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):
+        * platform/image-decoders/ImageDecoder.h:
+        * platform/leveldb/LevelDBDatabase.cpp:
+        (WebCore::LevelDBDatabase::open):
+        * platform/network/BlobRegistry.cpp:
+        (WebCore::blobRegistry):
+        * platform/network/BlobRegistryImpl.cpp:
+        * platform/network/NetworkStateNotifier.cpp:
+        * platform/network/NetworkStateNotifier.h:
+        (NetworkStateNotifier):
+        * platform/network/NetworkingContext.h:
+        (NetworkingContext):
+        * platform/network/ResourceHandleClient.h:
+        * platform/network/ResourceRequestBase.cpp:
+        (WebCore):
+        * platform/text/cf/HyphenationCF.cpp:
+        * plugins/PluginViewNone.cpp:
+        (WebCore):
+        * testing/Internals.cpp:
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::createRequest):
+
 2013-04-07  Ed Bartosh  <bartosh@gmail.com>
 
         [EFL] --minimal build fails because of incorrect usage of GENERATE_THEME in CMakeLists.txt
index c7c19bf..399bc74 100644 (file)
@@ -178,7 +178,7 @@ bool RuntimeEnabledFeatures::isMediaSourceEnabled = false;
 #endif
 
 #if ENABLE(VIDEO_TRACK)
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
     bool RuntimeEnabledFeatures::isVideoTrackEnabled = true;
 #else
     bool RuntimeEnabledFeatures::isVideoTrackEnabled = false;
index ca31f88..ad37e28 100644 (file)
 #define WTF_USE_NEW_THEME 1
 #endif // PLATFORM(MAC)
 
-#if PLATFORM(CHROMIUM)
-
-// Chromium uses this file instead of JavaScriptCore/config.h to compile
-// JavaScriptCore/wtf (chromium doesn't compile the rest of JSC). Therefore,
-// this define is required.
-#define WTF_CHANGES 1
-
-#endif /* PLATFORM(CHROMIUM) */
-
 #if USE(CG)
 #ifndef CGFLOAT_DEFINED
 #ifdef __LP64__
index d667500..35bc52d 100644 (file)
@@ -57,7 +57,7 @@ using namespace std;
 
 namespace WebCore {
 
-#if PLATFORM(CHROMIUM) || !defined(NDEBUG)
+#if !defined(NDEBUG)
 
 #define PCLOG(...) LOG(PageCache, "%*s%s", indentLevel*4, "", makeString(__VA_ARGS__).utf8().data())
     
@@ -83,29 +83,8 @@ enum ReasonFrameCannotBeInPageCache {
 };
 COMPILE_ASSERT(NumberOfReasonsFramesCannotBeInPageCache <= sizeof(unsigned)*8, ReasonFrameCannotBeInPageCacheDoesNotFitInBitmap);
 
-#if PLATFORM(CHROMIUM)
-static int indexOfSingleBit(int32_t v)
-{
-    int index = 0;
-    if (v & 0xFFFF0000)
-        index = 16;
-    if (v & 0xFF00FF00)
-        index += 8;
-    if (v & 0xF0F0F0F0)
-        index += 4;
-    if (v & 0xCCCCCCCC)
-        index += 2;
-    if (v & 0xAAAAAAAA)
-        index += 1;
-    return index;
-}
-#endif // PLATFORM(CHROMIUM)
-
 static unsigned logCanCacheFrameDecision(Frame* frame, int indentLevel)
 {
-#ifdef NDEBUG
-    UNUSED_PARAM(indentLevel);
-#endif
     PCLOG("+---");
     if (!frame->loader()->documentLoader()) {
         PCLOG("   -There is no DocumentLoader object");
@@ -296,24 +275,11 @@ static void logCanCachePageDecision(Page* page)
             HistogramSupport::histogramEnumeration("PageCache.FrameRejectReasonByPage", i, NumberOfReasonsFramesCannotBeInPageCache);
         }
     }
-#if PLATFORM(CHROMIUM)
-    // This strangely specific histogram is particular to chromium: as of 2012-03-16, the FrameClientImpl always denies caching, so
-    // of particular interest are solitary reasons other than the frameRejectReasons. If we didn't get to the ClientDeniesCaching, we
-    // took the early exit for the boring reason NoDocumentLoader, so we should have only one reason, and not two.
-    // FIXME: remove this histogram after data is gathered.
-    if (frameReasonCount == 2) {
-        ASSERT(frameRejectReasons & (1 << ClientDeniesCaching));
-        const unsigned singleReasonForRejectingFrameOtherThanClientDeniesCaching = frameRejectReasons & ~(1 << ClientDeniesCaching);
-        COMPILE_ASSERT(NumberOfReasonsPagesCannotBeInPageCache <= 32, ReasonPageCannotBeInPageCacheDoesNotFitInInt32);
-        const int index = indexOfSingleBit(static_cast<int32_t>(singleReasonForRejectingFrameOtherThanClientDeniesCaching));
-        HistogramSupport::histogramEnumeration("PageCache.FrameRejectReasonByPageWhenSingleExcludingFrameClient", index, NumberOfReasonsPagesCannotBeInPageCache);
-    }
-#endif
 
     HistogramSupport::histogramEnumeration("PageCache.FrameRejectReasonCountByPage", frameReasonCount, 1 + NumberOfReasonsFramesCannotBeInPageCache);
 }
 
-#endif 
+#endif // !defined(NDEBUG)
 
 PageCache* pageCache()
 {
@@ -372,7 +338,7 @@ bool PageCache::canCache(Page* page) const
     if (!page)
         return false;
     
-#if PLATFORM(CHROMIUM) || !defined(NDEBUG)
+#if !defined(NDEBUG)
     logCanCachePageDecision(page);
 #endif
     
index fab875e..1c1605a 100644 (file)
 #include "WebGLRenderingContext.h"
 #endif
 
-#if PLATFORM(CHROMIUM)
-#include <public/Platform.h>
-#endif
-
 namespace WebCore {
 
 using namespace HTMLNames;
@@ -187,7 +183,7 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas
 #if ENABLE(WEBGL)    
     Settings* settings = document()->settings();
     if (settings && settings->webGLEnabled()
-#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)
+#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)
         && settings->acceleratedCompositingEnabled()
 #endif
         ) {
@@ -195,11 +191,6 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas
         // Accept the legacy "webkit-3d" name as well as the provisional "experimental-webgl" name.
         bool is3dContext = (type == "webkit-3d") || (type == "experimental-webgl");
 
-#if PLATFORM(CHROMIUM) && !OS(ANDROID)
-        // Now that WebGL is ratified, we will also accept "webgl" as the context name in Chrome.
-        is3dContext |= (type == "webgl");
-#endif
-
         if (is3dContext) {
             if (m_context && !m_context->is3d())
                 return 0;
@@ -512,11 +503,6 @@ bool HTMLCanvasElement::shouldAccelerate(const IntSize& size) const
     if (size.width() * size.height() < settings->minimumAccelerated2dCanvasSize())
         return false;
 
-#if PLATFORM(CHROMIUM)
-    if (!WebKit::Platform::current()->canAccelerate2dCanvas())
-        return false;
-#endif
-
     return true;
 #else
     UNUSED_PARAM(size);
index bf713d3..5500707 100644 (file)
@@ -33,7 +33,7 @@
 #include "IntSize.h"
 #include <wtf/Forward.h>
 
-#if PLATFORM(CHROMIUM) || PLATFORM(QT)
+#if PLATFORM(QT)
 #define DefaultInterpolationQuality InterpolationMedium
 #elif USE(CG)
 #define DefaultInterpolationQuality InterpolationLow
index 3a876cd..260d0a6 100644 (file)
@@ -942,7 +942,6 @@ void HTMLMediaElement::loadNextSourceChild()
     loadResource(mediaURL, contentType, keySystem);
 }
 
-#if !PLATFORM(CHROMIUM)
 static KURL createFileURLForApplicationCacheResource(const String& path)
 {
     // KURL should have a function to create a url from a path, but it does not. This function
@@ -961,7 +960,6 @@ static KURL createFileURLForApplicationCacheResource(const String& path)
 #endif
     return url;
 }
-#endif
 
 void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& contentType, const String& keySystem)
 {
@@ -984,7 +982,6 @@ void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& content
     // The resource fetch algorithm 
     m_networkState = NETWORK_LOADING;
 
-#if !PLATFORM(CHROMIUM)
     // If the url should be loaded from the application cache, pass the url of the cached file
     // to the media engine.
     ApplicationCacheHost* cacheHost = frame->loader()->documentLoader()->applicationCacheHost();
@@ -997,18 +994,15 @@ void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& content
             return;
         }
     }
-#endif
 
     // Set m_currentSrc *before* changing to the cache url, the fact that we are loading from the app
     // cache is an internal detail not exposed through the media element API.
     m_currentSrc = url;
 
-#if !PLATFORM(CHROMIUM)
     if (resource) {
         url = createFileURLForApplicationCacheResource(resource->path());
         LOG(Media, "HTMLMediaElement::loadResource - will load from app cache -> %s", urlForLoggingMedia(url).utf8().data());
     }
-#endif
 
     LOG(Media, "HTMLMediaElement::loadResource - m_currentSrc -> %s", urlForLoggingMedia(m_currentSrc).utf8().data());
 
index f6511ea..1e71cf6 100644 (file)
@@ -1062,7 +1062,7 @@ void HTMLSelectElement::reset()
     setNeedsValidityCheck();
 }
 
-#if (!PLATFORM(WIN) && !(PLATFORM(CHROMIUM) && OS(WINDOWS))) || OS(WINCE)
+#if !PLATFORM(WIN) || OS(WINCE)
 bool HTMLSelectElement::platformHandleKeydownEvent(KeyboardEvent* event)
 {
     const Page* page = document()->page();
@@ -1299,7 +1299,7 @@ void HTMLSelectElement::listBoxDefaultEventHandler(Event* event)
         int listIndex = toRenderListBox(renderer())->listIndexAtOffset(toIntSize(localOffset));
         if (listIndex >= 0) {
             if (!isDisabledFormControl()) {
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
                 updateSelectedState(listIndex, mouseEvent->metaKey(), mouseEvent->shiftKey());
 #else
                 updateSelectedState(listIndex, mouseEvent->ctrlKey(), mouseEvent->shiftKey());
index cfdf50b..b4464c3 100644 (file)
@@ -166,7 +166,6 @@ void MediaDocument::defaultEventHandler(Event* event)
     if (!targetNode)
         return;
 
-#if !PLATFORM(CHROMIUM)
     if (HTMLVideoElement* video = ancestorVideoElement(targetNode)) {
         if (event->type() == eventNames().clickEvent) {
             if (!video->canPlay()) {
@@ -180,7 +179,6 @@ void MediaDocument::defaultEventHandler(Event* event)
             }
         }
     }
-#endif
 
     if (event->type() == eventNames().keydownEvent && event->isKeyboardEvent()) {
         HTMLVideoElement* video = descendentVideoElement(targetNode);
index 59b2f6c..3b2a00e 100644 (file)
@@ -114,11 +114,7 @@ bool EXTDrawBuffers::satisfiesWebGLRequirements(WebGLRenderingContext* webglCont
     Platform3DObject fbo = context->createFramebuffer();
     context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, fbo);
 
-#if PLATFORM(CHROMIUM)
-    const unsigned char* buffer = 0; // Chromium doesn't allow init data for depth/stencil tetxures.
-#else
     const unsigned char buffer[4] = { 0, 0, 0, 0 }; // textures are required to be initialized for other ports.
-#endif
     bool supportsDepth = (context->getExtensions()->supports("GL_CHROMIUM_depth_texture")
         || context->getExtensions()->supports("GL_OES_depth_texture")
         || context->getExtensions()->supports("GL_ARB_depth_texture"));
index 37d0b49..9a2880e 100644 (file)
@@ -428,11 +428,7 @@ PassOwnPtr<WebGLRenderingContext> WebGLRenderingContext::create(HTMLCanvasElemen
     }
 
     attributes.noExtensions = true;
-#if PLATFORM(CHROMIUM)
-    attributes.shareResources = true;
-#else
     attributes.shareResources = false;
-#endif
     attributes.preferDiscreteGPU = true;
     attributes.topDocumentURL = document->topDocument()->url();
 
@@ -450,13 +446,6 @@ PassOwnPtr<WebGLRenderingContext> WebGLRenderingContext::create(HTMLCanvasElemen
     OwnPtr<WebGLRenderingContext> renderingContext = adoptPtr(new WebGLRenderingContext(canvas, context, attributes));
     renderingContext->suspendIfNeeded();
 
-#if PLATFORM(CHROMIUM)
-    if (!renderingContext->m_drawingBuffer) {
-        canvas->dispatchEvent(WebGLContextEvent::create(eventNames().webglcontextcreationerrorEvent, false, true, "Could not create a WebGL context."));
-        return nullptr;
-    }
-#endif
-
     return renderingContext.release();
 }
 
@@ -483,13 +472,6 @@ WebGLRenderingContext::WebGLRenderingContext(HTMLCanvasElement* passedCanvas, Pa
     m_maxViewportDims[0] = m_maxViewportDims[1] = 0;
     m_context->getIntegerv(GraphicsContext3D::MAX_VIEWPORT_DIMS, m_maxViewportDims);
 
-#if PLATFORM(CHROMIUM)
-    // Create the DrawingBuffer and initialize the platform layer.
-    DrawingBuffer::PreserveDrawingBuffer preserve = m_attributes.preserveDrawingBuffer ? DrawingBuffer::Preserve : DrawingBuffer::Discard;
-    DrawingBuffer::AlphaRequirement alpha = m_attributes.alpha ? DrawingBuffer::Alpha : DrawingBuffer::Opaque;
-    m_drawingBuffer = DrawingBuffer::create(m_context.get(), clampedCanvasSize(), preserve, alpha);
-#endif
-
     if (m_drawingBuffer)
         m_drawingBuffer->bind();
 
@@ -764,11 +746,6 @@ void WebGLRenderingContext::paintRenderingResultsToCanvas()
     if (m_context->layerComposited() && !m_attributes.preserveDrawingBuffer) {
         m_context->paintCompositedResultsToCanvas(canvas()->buffer());
 
-#if USE(ACCELERATED_COMPOSITING) && PLATFORM(CHROMIUM)
-        if (m_drawingBuffer)
-            m_drawingBuffer->paintCompositedResultsToCanvas(canvas()->buffer());
-#endif
-
         canvas()->makePresentationCopy();
     } else
         canvas()->clearPresentationCopy();
@@ -4692,11 +4669,6 @@ void WebGLRenderingContext::forceRestoreContext()
 #if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* WebGLRenderingContext::platformLayer() const
 {
-#if PLATFORM(CHROMIUM)
-    if (m_drawingBuffer)
-        return m_drawingBuffer->platformLayer();
-#endif
-
     return m_context->platformLayer();
 }
 #endif
index 0574958..496729e 100644 (file)
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/CString.h>
 
-#if PLATFORM(CHROMIUM)
-#include "platform/chromium/TraceEvent.h"
-#endif
-
 namespace WebCore {
 
 static const char* const requestAnimationFrameEventName = "requestAnimationFrame";
@@ -528,10 +524,6 @@ void InspectorInstrumentation::didDispatchXHRLoadEventImpl(const InspectorInstru
 
 void InspectorInstrumentation::willPaintImpl(InstrumentingAgents* instrumentingAgents, RenderObject* renderer)
 {
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT_INSTANT1("instrumentation", InstrumentationEvents::Paint, InstrumentationEventArguments::PageId, reinterpret_cast<unsigned long long>(renderer->frame()->page()));
-#endif
-
     if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
         timelineAgent->willPaint(renderer->frame());
 }
index d039e86..0728aae 100644 (file)
@@ -225,9 +225,6 @@ void InspectorTimelineAgent::supportsFrameInstrumentation(ErrorString*, bool* re
 
 void InspectorTimelineAgent::didBeginFrame()
 {
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT_INSTANT0("webkit", InstrumentationEvents::BeginFrame);
-#endif
     m_pendingFrameRecord = TimelineRecordFactory::createGenericRecord(timestamp(), 0);
 }
 
index 175a5c5..03d70d4 100644 (file)
@@ -345,13 +345,10 @@ void DocumentLoader::notifyFinished(CachedResource* resource)
         return;
     }
 
-    // FIXME: we should fix the design to eliminate the need for a platform ifdef here
-#if !PLATFORM(CHROMIUM)
     if (m_request.cachePolicy() == ReturnCacheDataDontLoad && !m_mainResource->wasCanceled()) {
         frameLoader()->retryAfterFailedCacheOnlyMainResourceLoad();
         return;
     }
-#endif
 
     mainReceivedError(m_mainResource->resourceError());
 }
index 902126a..f5397ab 100644 (file)
@@ -39,11 +39,6 @@ FeatureObserver::FeatureObserver()
 
 FeatureObserver::~FeatureObserver()
 {
-#if PLATFORM(CHROMUM)
-    // We always log PageDestruction so that we have a scale for the rest of the features.
-    HistogramSupport::histogramEnumeration("WebCore.FeatureObserver", PageDestruction, NumberOfFeatures);
-#endif
-
     updateMeasurements();
 }
 
index 186642f..bff4f92 100644 (file)
@@ -39,7 +39,7 @@
 
 namespace WebCore {
 
-#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(BLACKBERRY) && !PLATFORM(EFL)
+#if !PLATFORM(GTK) && !PLATFORM(BLACKBERRY) && !PLATFORM(EFL)
 bool AsyncFileSystem::isAvailable()
 {
     notImplemented();
index ee799dc..ef2dbbb 100644 (file)
@@ -95,8 +95,6 @@ namespace WebCore {
 #if PLATFORM(MAC)
         // Keep this in sync with the PlatformMenuDescription typedef
         RetainPtr<NSMutableArray> m_platformDescription;
-#elif PLATFORM(CHROMIUM)
-        Vector<ContextMenuItem> m_items;
 #else
         PlatformMenuDescription m_platformDescription;
 #if OS(WINCE)
index 731716f..d5d69a7 100644 (file)
@@ -197,20 +197,6 @@ namespace WebCore {
         bool checked;
         bool enabled;
     };
-#elif PLATFORM(CHROMIUM)
-    struct PlatformMenuItemDescription {
-        PlatformMenuItemDescription()
-            : type(ActionType)
-            , action(ContextMenuItemTagNoAction)
-            , checked(false)
-            , enabled(true) { }
-        ContextMenuItemType type;
-        ContextMenuAction action;
-        String title;
-        Vector<ContextMenuItem> subMenuItems;
-        bool checked;
-        bool enabled;
-    };
 #else
     typedef void* PlatformMenuItemDescription;
 #endif
index 6551252..89a8e17 100644 (file)
@@ -60,7 +60,7 @@ typedef HICON HCURSOR;
 #endif
 
 // Looks like it's just PLATFORM(WX) and PLATFORM(BLACKBERRY) still not using this?
-#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(CHROMIUM)
+#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
 #define WTF_USE_LAZY_NATIVE_CURSOR 1
 #endif
 
index 4d302eb..976b908 100644 (file)
@@ -53,7 +53,6 @@ DragData::DragData(const String&, const IntPoint& clientPosition, const IntPoint
 }
 #endif
 
-#if !PLATFORM(CHROMIUM)
 int DragData::modifierKeyState() const
 {
     bool shiftKey, ctrlKey, altKey, metaKey;
@@ -77,7 +76,6 @@ String DragData::droppedFileSystemId() const
     return String();
 }
 #endif
-#endif
 
 } // namespace WebCore
 
index d639693..fe8cdbc 100644 (file)
@@ -61,8 +61,6 @@ namespace WebCore {
 class DataObjectGtk;
 }
 typedef WebCore::DataObjectGtk* DragDataRef;
-#elif PLATFORM(CHROMIUM)
-#include "DragDataRef.h"
 #elif PLATFORM(EFL) || PLATFORM(BLACKBERRY)
 typedef void* DragDataRef;
 #endif
index dd970d2..581ab24 100644 (file)
@@ -42,8 +42,6 @@ QT_END_NAMESPACE
 typedef struct HBITMAP__* HBITMAP;
 #elif PLATFORM(WX)
 class wxDragImage;
-#elif PLATFORM(CHROMIUM)
-#include "DragImageRef.h"
 #elif PLATFORM(GTK)
 typedef struct _cairo_surface cairo_surface_t;
 #endif
index 1823fab..43e01f1 100644 (file)
@@ -282,12 +282,10 @@ namespace WebCore {
     String snapshottedPlugInLabelTitle();
     String snapshottedPlugInLabelSubtitle();
 
-#if !PLATFORM(CHROMIUM)
 #define WEB_UI_STRING(string, description) WebCore::localizedString(string)
 #define WEB_UI_STRING_KEY(string, key, description) WebCore::localizedString(key)
 
     String localizedString(const char* key);
-#endif
 
 } // namespace WebCore
 
index 08b6865..db6f2ef 100644 (file)
@@ -102,7 +102,7 @@ public:
     PassRefPtr<DocumentFragment> documentFragment(Frame*, PassRefPtr<Range>, bool allowPlainText, bool& chosePlainText);
     String plainText(Frame* = 0);
     
-#if PLATFORM(QT) || PLATFORM(CHROMIUM) || PLATFORM(GTK)
+#if PLATFORM(QT) || PLATFORM(GTK)
     bool isSelectionMode() const;
     void setSelectionMode(bool);
 #else
@@ -125,7 +125,7 @@ private:
     HWND m_owner;
 #endif
 
-#if PLATFORM(QT) || PLATFORM(CHROMIUM)
+#if PLATFORM(QT)
     bool m_selectionMode;
 #endif
 
index 9c264c2..8b3c89b 100644 (file)
@@ -48,7 +48,7 @@
 
 #else // !USE(EXPORT_MACROS)
 
-#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
+#if OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
 
 #if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)
 #define WEBKIT_EXPORTDATA __declspec(dllexport)
index 6baad9a..30b59fe 100644 (file)
 #include <wtf/MainThread.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(CHROMIUM)
-#include "TraceEvent.h"
-#endif
-
 namespace WebCore {
 
 class PlatformInstrumentationClient {
@@ -76,36 +72,24 @@ private:
 
 inline void PlatformInstrumentation::willDecodeImage(const String& imageType)
 {
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT_BEGIN1(CategoryName, ImageDecodeEvent, ImageTypeArgument, TRACE_STR_COPY(imageType.ascii().data()));
-#endif
     FAST_RETURN_IF_NO_CLIENT_OR_NOT_MAIN_THREAD();
     m_client->willDecodeImage(imageType);
 }
 
 inline void PlatformInstrumentation::didDecodeImage()
 {
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT_END0(CategoryName, ImageDecodeEvent);
-#endif
     FAST_RETURN_IF_NO_CLIENT_OR_NOT_MAIN_THREAD();
     m_client->didDecodeImage();
 }
 
 inline void PlatformInstrumentation::willResizeImage(bool shouldCache)
 {
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT_BEGIN1(CategoryName, ImageResizeEvent, CachedArgument, shouldCache);
-#endif
     FAST_RETURN_IF_NO_CLIENT_OR_NOT_MAIN_THREAD();
     m_client->willResizeImage(shouldCache);
 }
 
 inline void PlatformInstrumentation::didResizeImage()
 {
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT_END0(CategoryName, ImageResizeEvent);
-#endif
     FAST_RETURN_IF_NO_CLIENT_OR_NOT_MAIN_THREAD();
     m_client->didResizeImage();
 }
index 9a31260..a86be01 100644 (file)
@@ -36,8 +36,6 @@ OBJC_CLASS NSMutableArray;
 typedef struct _GtkMenu GtkMenu;
 #elif PLATFORM(WX)
 class wxMenu;
-#elif PLATFORM(CHROMIUM)
-#include <wtf/Vector.h>
 #endif
 
 namespace WebCore {
@@ -52,9 +50,6 @@ namespace WebCore {
     typedef GtkMenu* PlatformMenuDescription;
 #elif PLATFORM(WX)
     typedef wxMenu* PlatformMenuDescription;
-#elif PLATFORM(CHROMIUM)
-    class ContextMenuItem;
-    typedef const Vector<ContextMenuItem>* PlatformMenuDescription;
 #else
     typedef void* PlatformMenuDescription;
 #endif
index f0d6893..d21b84b 100644 (file)
 OBJC_CLASS WebSpeechSynthesisWrapper;
 #endif
 
-#if PLATFORM(CHROMIUM)
-namespace WebKit {
-class WebSpeechSynthesizer;
-class WebSpeechSynthesizerClient;
-}
-#endif
-
 namespace WebCore {
 
 enum SpeechBoundary {
@@ -93,10 +86,6 @@ private:
 #if PLATFORM(MAC)
     RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
 #endif
-#if PLATFORM(CHROMIUM)
-    OwnPtr<WebKit::WebSpeechSynthesizer> m_webSpeechSynthesizer;
-    OwnPtr<WebKit::WebSpeechSynthesizerClient> m_webSpeechSynthesizerClient;
-#endif
 };
     
 } // namespace WebCore
index 94db9f7..53dcea4 100644 (file)
@@ -60,7 +60,7 @@ namespace WebCore {
         ScrollByPixelWheelEvent,
     };
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
     enum PlatformWheelEventPhase {
         PlatformWheelEventPhaseNone        = 0,
         PlatformWheelEventPhaseBegan       = 1 << 0,
@@ -82,10 +82,8 @@ namespace WebCore {
             , m_wheelTicksY(0)
             , m_granularity(ScrollByPixelWheelEvent)
             , m_directionInvertedFromDevice(false)
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
             , m_hasPreciseScrollingDeltas(false)
-#endif
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
             , m_phase(PlatformWheelEventPhaseNone)
             , m_momentumPhase(PlatformWheelEventPhaseNone)
             , m_scrollCount(0)
@@ -105,10 +103,8 @@ namespace WebCore {
             , m_wheelTicksY(wheelTicksY)
             , m_granularity(granularity)
             , m_directionInvertedFromDevice(false)
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
             , m_hasPreciseScrollingDeltas(false)
-#endif
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
             , m_phase(PlatformWheelEventPhaseNone)
             , m_momentumPhase(PlatformWheelEventPhaseNone)
             , m_scrollCount(0)
@@ -151,11 +147,9 @@ namespace WebCore {
         explicit PlatformWheelEvent(const Evas_Event_Mouse_Wheel*);
 #endif
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
         bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
         void setHasPreciseScrollingDeltas(bool b) { m_hasPreciseScrollingDeltas = b; }
-#endif
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
         PlatformWheelEventPhase phase() const { return m_phase; }
         PlatformWheelEventPhase momentumPhase() const { return m_momentumPhase; }
         unsigned scrollCount() const { return m_scrollCount; }
@@ -184,10 +178,8 @@ namespace WebCore {
         float m_wheelTicksY;
         PlatformWheelEventGranularity m_granularity;
         bool m_directionInvertedFromDevice;
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
         bool m_hasPreciseScrollingDeltas;
-#endif
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
         PlatformWheelEventPhase m_phase;
         PlatformWheelEventPhase m_momentumPhase;
         unsigned m_scrollCount;
index 57742e6..729af75 100644 (file)
@@ -41,7 +41,7 @@ using namespace std;
 
 namespace WebCore {
 
-#if !ENABLE(SMOOTH_SCROLLING) && !(PLATFORM(CHROMIUM) && OS(DARWIN))
+#if !ENABLE(SMOOTH_SCROLLING)
 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea)
 {
     return adoptPtr(new ScrollAnimator(scrollableArea));
@@ -93,12 +93,7 @@ bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
 
     bool handled = false;
 
-#if PLATFORM(CHROMIUM) && !OS(DARWIN)
-    ScrollGranularity granularity = e.hasPreciseScrollingDeltas() ? ScrollByPrecisePixel : ScrollByPixel;
-#else
     ScrollGranularity granularity = ScrollByPixel;
-#endif
-
     IntSize maxForwardScrollDelta = m_scrollableArea->maximumScrollPosition() - m_scrollableArea->scrollPosition();
     IntSize maxBackwardScrollDelta = m_scrollableArea->scrollPosition() - m_scrollableArea->minimumScrollPosition();
     if ((deltaX < 0 && maxForwardScrollDelta.width() > 0)
index 2889f42..f315618 100644 (file)
@@ -65,7 +65,7 @@ public:
 
     virtual bool handleWheelEvent(const PlatformWheelEvent&);
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
     virtual void handleWheelEventPhase(PlatformWheelEventPhase) { }
 #endif
 
index 2442a96..5607524 100644 (file)
 #include <wtf/CurrentTime.h>
 #include <wtf/PassOwnPtr.h>
 
-#if PLATFORM(CHROMIUM)
-#include "TraceEvent.h"
-#endif
-
 #if ENABLE(GESTURE_EVENTS)
 #include "PlatformGestureEvent.h"
 #endif
@@ -436,10 +432,6 @@ bool ScrollAnimatorNone::scroll(ScrollbarOrientation orientation, ScrollGranular
     if (!m_scrollableArea->scrollAnimatorEnabled())
         return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
 
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT0("webkit", "ScrollAnimatorNone::scroll");
-#endif
-
     // FIXME: get the type passed in. MouseWheel could also be by line, but should still have different
     // animation parameters than the keyboard.
     Parameters parameters;
@@ -531,10 +523,6 @@ void ScrollAnimatorNone::animationTimerFired(Timer<ScrollAnimatorNone>* timer)
 
 void ScrollAnimatorNone::animationTimerFired()
 {
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT0("webkit", "ScrollAnimatorNone::animationTimerFired");
-#endif
-
     double currentTime = WTF::monotonicallyIncreasingTime();
     double deltaToNextFrame = ceil((currentTime - m_startTime) * kFrameRate) / kFrameRate - (currentTime - m_startTime);
     currentTime += deltaToNextFrame;
@@ -554,9 +542,6 @@ void ScrollAnimatorNone::animationTimerFired()
         m_animationActive = false;
 #endif
 
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT0("webkit", "ScrollAnimatorNone::notifyPositionChanged");
-#endif
     notifyPositionChanged(FloatSize());
 
     if (!continueAnimation)
index 0ba06d1..99be4e0 100644 (file)
@@ -1156,14 +1156,6 @@ void ScrollView::updateOverhangAreas()
     IntRect horizontalOverhangRect;
     IntRect verticalOverhangRect;
     calculateOverhangAreasForPainting(horizontalOverhangRect, verticalOverhangRect);
-#if USE(ACCELERATED_COMPOSITING) && PLATFORM(CHROMIUM) && ENABLE(RUBBER_BANDING)
-    if (GraphicsLayer* overhangLayer = layerForOverhangAreas()) {
-        bool hasOverhangArea = !horizontalOverhangRect.isEmpty() || !verticalOverhangRect.isEmpty();
-        overhangLayer->setDrawsContent(hasOverhangArea);
-        if (hasOverhangArea)
-            overhangLayer->setNeedsDisplay();
-    }
-#endif
     if (!horizontalOverhangRect.isEmpty())
         hostWindow()->invalidateContentsAndRootView(horizontalOverhangRect, false /*immediate*/);
     if (!verticalOverhangRect.isEmpty())
index b03525f..08a626b 100644 (file)
 #include "ScrollbarTheme.h"
 #include <wtf/PassOwnPtr.h>
 
-#if PLATFORM(CHROMIUM)
-#include "TraceEvent.h"
-#endif
-
 namespace WebCore {
 
 struct SameSizeAsScrollableArea {
@@ -145,10 +141,6 @@ void ScrollableArea::notifyScrollPositionChanged(const IntPoint& position)
 
 void ScrollableArea::scrollPositionChanged(const IntPoint& position)
 {
-#if PLATFORM(CHROMIUM)
-    TRACE_EVENT0("webkit", "ScrollableArea::scrollPositionChanged");
-#endif
-
     IntPoint oldPosition = scrollPosition();
     // Tell the derived class to scroll its contents.
     setScrollOffset(position);
index bb1ce57..db92552 100644 (file)
@@ -47,7 +47,7 @@
 
 using namespace std;
 
-#if (PLATFORM(CHROMIUM) && (OS(UNIX) && !OS(DARWIN))) || PLATFORM(GTK)
+#if PLATFORM(GTK)
 // The position of the scrollbar thumb affects the appearance of the steppers, so
 // when the thumb moves, we have to invalidate them for painting.
 #define THUMB_POSITION_AFFECTS_BUTTONS
diff --git a/Source/WebCore/platform/SecureTextInput.cpp b/Source/WebCore/platform/SecureTextInput.cpp
deleted file mode 100644 (file)
index 06e1c86..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-// FIXME: This should be moved to WebKit, because browser process needs to track secure input state anyway to manipulate input contexts.
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
-#include "SecureTextInput.h"
-
-#import <Carbon/Carbon.h>
-
-namespace WebCore {
-
-void enableSecureTextInput()
-{
-    if (IsSecureEventInputEnabled())
-        return;
-    EnableSecureEventInput();
-}
-
-void disableSecureTextInput()
-{
-    if (!IsSecureEventInputEnabled())
-        return;
-    DisableSecureEventInput();
-}
-
-} // namespace WebCore
-
-#endif // PLATFORM(CHROMIUM) && OS(DARWIN)
index 608aa63..830f4fd 100644 (file)
 
 namespace WebCore {
 
-// Once enableSecureTextInput is called, secure text input mode is set until
-// disableSecureTextInput has been called.
-void enableSecureTextInput();
-void disableSecureTextInput();
-
-#if !(PLATFORM(CHROMIUM) && OS(DARWIN))
+// FIXME: Remove these methods. (http://wkb.ug/114126)
 inline void enableSecureTextInput() { }
 inline void disableSecureTextInput() { }
-#endif
 
 } // namespace WebCore
 
index b66ae1a..7252149 100644 (file)
@@ -34,7 +34,7 @@ namespace WebCore {
     void disableSuddenTermination();
     void enableSuddenTermination();
 
-#if !PLATFORM(MAC) && !PLATFORM(CHROMIUM)
+#if !PLATFORM(MAC)
     inline void disableSuddenTermination() { }
     inline void enableSuddenTermination() { }
 #endif
index 77ccf91..e7f1e59 100644 (file)
 #include <wtf/Forward.h>
 #include <wtf/RefCounted.h>
 
-#if PLATFORM(CHROMIUM)
-#include "PageClientChromium.h"
-#include "PlatformWidget.h"
-#endif
-
 #if PLATFORM(MAC)
 #include <wtf/RetainPtr.h>
 #endif
@@ -96,8 +91,6 @@ typedef PageClientBlackBerry* PlatformPageClient;
 #elif PLATFORM(EFL)
 class PageClientEfl;
 typedef PageClientEfl* PlatformPageClient;
-#elif PLATFORM(CHROMIUM)
-typedef WebCore::PageClientChromium* PlatformPageClient;
 #else
 typedef PlatformWidget PlatformPageClient;
 #endif
@@ -227,10 +220,6 @@ public:
     Evas_Object* evasObject() { return m_evasObject; }
 #endif
 
-#if PLATFORM(CHROMIUM)
-    virtual bool isPluginContainer() const { return false; }
-#endif
-
 #if PLATFORM(QT)
     QObject* bindingObject() const;
     void setBindingObject(QObject*);
index 52f71dd..3de7fa3 100644 (file)
@@ -29,7 +29,7 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(BLACKBERRY) && !PLATFORM(CHROMIUM) && !PLATFORM(QT)
+#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(BLACKBERRY) && !PLATFORM(QT)
 #include "ANGLE/ShaderLang.h"
 #else
 #include "ShaderLang.h"
index 1636a0e..b7d5f92 100644 (file)
@@ -205,7 +205,7 @@ protected:
     virtual void drawFrameMatchingSourceSize(GraphicsContext*, const FloatRect& dstRect, const IntSize& srcSize, ColorSpace styleColorSpace, CompositeOperator);
 #endif
     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode);
-#if USE(CG) || PLATFORM(CHROMIUM) || USE(CAIRO) || PLATFORM(BLACKBERRY)
+#if USE(CG) || USE(CAIRO) || PLATFORM(BLACKBERRY)
     virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, RespectImageOrientationEnum) OVERRIDE;
 #endif
 
index 7bd21fc..17d4eba 100644 (file)
@@ -43,7 +43,7 @@ class FloatPoint;
 typedef struct CGPoint CGPoint;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGPoint NSPoint;
 #else
@@ -155,8 +155,7 @@ public:
     operator CGPoint() const;
 #endif
 
-#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
-        && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
+#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     FloatPoint(const NSPoint&);
     operator NSPoint() const;
 #endif
index 8b8d33a..2b7ad47 100644 (file)
@@ -34,7 +34,7 @@
 typedef struct CGRect CGRect;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGRect NSRect;
 #else
@@ -200,8 +200,7 @@ public:
     operator CGRect() const;
 #endif
 
-#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
-        && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
+#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     FloatRect(const NSRect&);
     operator NSRect() const;
 #endif
index ad4ddfa..526ed14 100644 (file)
@@ -49,7 +49,7 @@ class FloatSize;
 typedef struct CGSize CGSize;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGSize NSSize;
 #else
@@ -135,9 +135,7 @@ public:
     operator CGSize() const;
 #endif
 
-#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
-        && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) \
-        || (PLATFORM(QT) && USE(QTKIT))
+#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) || (PLATFORM(QT) && USE(QTKIT))
     explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
     operator NSSize() const;
 #endif
index 7637a8e..e18ac5c 100644 (file)
@@ -237,8 +237,7 @@ float Font::width(const TextRun& run, int& charsConsumed, String& glyphName) con
     return width(run);
 }
 
-#if !(PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)))
-
+#if !PLATFORM(MAC)
 PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const
 {
     return nullptr;
@@ -253,7 +252,6 @@ float Font::width(TextLayout&, unsigned, unsigned, HashSet<const SimpleFontData*
     ASSERT_NOT_REACHED();
     return 0;
 }
-
 #endif
 
 FloatRect Font::selectionRectForText(const TextRun& run, const FloatPoint& point, int h, int from, int to) const
index d6d393a..e093c64 100644 (file)
@@ -155,7 +155,7 @@ public:
     {
         return glyphDataAndPageForCharacter(c, mirror, variant).first;
     }
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
     const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, size_t length, FontDataVariant) const;
 #endif
     std::pair<GlyphData, GlyphPage*> glyphDataAndPageForCharacter(UChar32, bool mirror, FontDataVariant = AutoVariant) const;
index bd7beac..82b0b61 100644 (file)
@@ -288,13 +288,8 @@ typedef HashMap<FontPlatformData, pair<RefPtr<SimpleFontData>, unsigned>, FontDa
 
 static FontDataCache* gFontDataCache = 0;
 
-#if PLATFORM(CHROMIUM) && !OS(ANDROID)
-const int cMaxInactiveFontData = 250;
-const int cTargetInactiveFontData = 200;
-#else
 const int cMaxInactiveFontData = 225;
 const int cTargetInactiveFontData = 200;
-#endif
 static ListHashSet<RefPtr<SimpleFontData> >* gInactiveFontData = 0;
 
 PassRefPtr<SimpleFontData> FontCache::getCachedFontData(const FontDescription& fontDescription, const AtomicString& family, bool checkingAlternateName, ShouldRetain shouldRetain)
index 3d4b47b..f908e8c 100644 (file)
@@ -107,8 +107,6 @@ public:
 
 #if PLATFORM(WIN)
     PassRefPtr<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT&, AtomicString& outFontFamilyName);
-#elif PLATFORM(CHROMIUM) && OS(WINDOWS)
-    PassRefPtr<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT&, wchar_t* outFontFamilyName);
 #endif
 
 #if ENABLE(OPENTYPE_VERTICAL)
@@ -157,7 +155,7 @@ private:
     // Don't purge if this count is > 0;
     int m_purgePreventCount;
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || OS(ANDROID)
+#if PLATFORM(MAC) || OS(ANDROID)
     friend class ComplexTextController;
 #endif
     friend class SimpleFontData; // For getCachedFontData(const FontPlatformData*)
index 6cfb85c..17c00d4 100644 (file)
@@ -147,11 +147,7 @@ public:
     void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
     void setWeight(FontWeight w) { m_weight = w; }
     void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = genericFamily; }
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
-    void setUsePrinterFont(bool) { }
-#else
     void setUsePrinterFont(bool p) { m_usePrinterFont = p; }
-#endif
     void setRenderingMode(FontRenderingMode mode) { m_renderingMode = mode; }
     void setKerning(Kerning kerning) { m_kerning = kerning; }
     void setCommonLigaturesState(LigaturesState commonLigaturesState) { m_commonLigaturesState = commonLigaturesState; }
index a55558e..913ad90 100644 (file)
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
-#include "HarfBuzzFace.h"
-#endif
-
 using namespace std;
 
 namespace WebCore {
index 3aec08e..882f2a0 100644 (file)
@@ -39,7 +39,7 @@
 #include <CoreGraphics/CGGeometry.h>
 #endif
 
-#if OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM))
+#if OS(DARWIN) && PLATFORM(WX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
@@ -64,7 +64,7 @@ typedef Glyph GlyphBufferGlyph;
 
 // CG uses CGSize instead of FloatSize so that the result of advances()
 // can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
-#if USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
+#if USE(CG) || (OS(DARWIN) && PLATFORM(WX))
 struct GlyphBufferAdvance : CGSize {
 public:
     GlyphBufferAdvance(CGSize size) : CGSize(size)
@@ -165,7 +165,7 @@ public:
         m_glyphs.append(glyph);
 #endif
 
-#if USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
+#if USE(CG) || (OS(DARWIN) && PLATFORM(WX))
         CGSize advance = { width, 0 };
         m_advances.append(advance);
 #elif OS(WINCE)
index 27bc3a9..762c60b 100644 (file)
@@ -508,12 +508,8 @@ void GraphicsContext::drawImage(Image* image, ColorSpace styleColorSpace, const
 
     if (useLowQualityScale) {
         previousInterpolationQuality = imageInterpolationQuality();
-#if PLATFORM(CHROMIUM)
-        setImageInterpolationQuality(InterpolationLow);
-#else
         // FIXME (49002): Should be InterpolationLow
         setImageInterpolationQuality(InterpolationNone);
-#endif
     }
 
     image->draw(this, dest, src, styleColorSpace, op, blendMode, shouldRespectImageOrientation);
@@ -595,12 +591,8 @@ void GraphicsContext::drawImageBuffer(ImageBuffer* image, ColorSpace styleColorS
 
     if (useLowQualityScale) {
         InterpolationQuality previousInterpolationQuality = imageInterpolationQuality();
-#if PLATFORM(CHROMIUM)
-        setImageInterpolationQuality(InterpolationLow);
-#else
         // FIXME (49002): Should be InterpolationLow
         setImageInterpolationQuality(InterpolationNone);
-#endif
         image->draw(this, styleColorSpace, dest, src, op, blendMode, useLowQualityScale);
         setImageInterpolationQuality(previousInterpolationQuality);
     } else
index 3a384b3..6a04498 100644 (file)
@@ -40,7 +40,7 @@
 #include <wtf/text/WTFString.h>
 
 // FIXME: Find a better way to avoid the name confliction for NO_ERROR.
-#if ((PLATFORM(CHROMIUM) && OS(WINDOWS)) || PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)))
+#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS))
 #undef NO_ERROR
 #elif PLATFORM(GTK)
 // This define is from the X11 headers, but it's used below, so we must undefine it.
@@ -80,7 +80,7 @@ typedef void* PlatformGraphicsContext3D;
 typedef void* PlatformGraphicsSurface3D;
 #endif
 
-#if (PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)) && USE(SKIA)
+#if PLATFORM(BLACKBERRY) && USE(SKIA)
 class GrContext;
 #endif
 
@@ -492,7 +492,7 @@ public:
     PlatformGraphicsContext3D platformGraphicsContext3D() const { return m_contextObj; }
     Platform3DObject platformTexture() const { return m_compositorTexture; }
     CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_webGLLayer.get()); }
-#elif PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
+#elif PLATFORM(BLACKBERRY)
     PlatformGraphicsContext3D platformGraphicsContext3D() const;
     Platform3DObject platformTexture() const;
 #if USE(SKIA)
@@ -528,7 +528,7 @@ public:
 #endif
     bool makeContextCurrent();
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
+#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
     // With multisampling on, blit from multisampleFBO to regular FBO.
     void prepareTexture();
 #endif
@@ -1056,7 +1056,7 @@ private:
 #if PLATFORM(BLACKBERRY) || (PLATFORM(QT) && defined(QT_OPENGL_ES_2)) || ((PLATFORM(GTK) || PLATFORM(EFL)) && USE(OPENGL_ES_2))
     friend class Extensions3DOpenGLES;
     OwnPtr<Extensions3DOpenGLES> m_extensions;
-#elif !PLATFORM(CHROMIUM)
+#else
     friend class Extensions3DOpenGL;
     OwnPtr<Extensions3DOpenGL> m_extensions;
 #endif
index 2f0e3d1..12675ba 100644 (file)
@@ -428,7 +428,7 @@ public:
 
     static bool supportsBackgroundColorContent()
     {
-#if USE(CA) || USE(TEXTURE_MAPPER) || PLATFORM(CHROMIUM)
+#if USE(CA) || USE(TEXTURE_MAPPER)
         return true;
 #else
         return false;
index c585807..a78b265 100644 (file)
@@ -35,9 +35,6 @@ typedef struct HICON__* HICON;
 #include <QIcon>
 #elif PLATFORM(GTK)
 typedef struct _GdkPixbuf GdkPixbuf;
-#elif PLATFORM(CHROMIUM)
-#include "Image.h"
-#include "PlatformIcon.h"
 #endif
 
 namespace WebCore {
@@ -55,8 +52,6 @@ public:
 
 #if PLATFORM(WIN)
     static PassRefPtr<Icon> create(HICON hIcon) { return adoptRef(new Icon(hIcon)); }
-#elif PLATFORM(CHROMIUM)
-    static PassRefPtr<Icon> create(PassRefPtr<PlatformIcon> icon) { return adoptRef(new Icon(icon)); }
 #endif
 
 private:
@@ -75,9 +70,6 @@ private:
 #elif PLATFORM(EFL)
     Icon();
     Evas_Object* m_icon;
-#elif PLATFORM(CHROMIUM)
-    Icon(PassRefPtr<PlatformIcon>);
-    RefPtr<PlatformIcon> m_icon;
 #endif
 };
 
index c066ce7..5db1a4f 100644 (file)
 #include "NotImplemented.h"
 #include "PlatformMemoryInstrumentation.h"
 
-#if PLATFORM(CHROMIUM)
-#include "DeferredImageDecoder.h"
-#endif
-
 namespace WebCore {
 
 #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
index ca99770..e3053d6 100644 (file)
@@ -48,16 +48,12 @@ class SharedBuffer;
 
 #if USE(CG)
 typedef CGImageSourceRef NativeImageDecoderPtr;
-#elif !PLATFORM(CHROMIUM)
+#else
 class ImageDecoder;
 typedef ImageDecoder* NativeImageDecoderPtr;
 #endif
 
-#if PLATFORM(CHROMIUM)
-class DeferredImageDecoder;
-typedef DeferredImageDecoder NativeImageDecoder;
-typedef DeferredImageDecoder* NativeImageDecoderPtr;
-#elif USE(CG)
+#if USE(CG)
 #define NativeImageDecoder ImageDecoder
 #else
 typedef ImageDecoder NativeImageDecoder;
index e5ad321..4cf1890 100644 (file)
@@ -33,7 +33,7 @@
 typedef struct CGRect CGRect;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(QT) && USE(QTKIT))
+#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGRect NSRect;
 #else
@@ -230,9 +230,7 @@ public:
     operator SkIRect() const;
 #endif
 
-#if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
-        && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) \
-        || (PLATFORM(QT) && USE(QTKIT))
+#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) || (PLATFORM(QT) && USE(QTKIT))
     operator NSRect() const;
 #endif
 
@@ -283,8 +281,7 @@ inline IntRect enclosingIntRect(const IntRect& rect)
 IntRect enclosingIntRect(const CGRect&);
 #endif
 
-#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
-        || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(QT) && USE(QTKIT))
+#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) || (PLATFORM(QT) && USE(QTKIT))
 IntRect enclosingIntRect(const NSRect&);
 #endif
 
index 12576fb..1bf0618 100644 (file)
@@ -76,9 +76,6 @@
 #include "MediaPlayerPrivateQt.h"
 #define PlatformMediaEngineClassName MediaPlayerPrivateQt
 #endif
-#elif PLATFORM(CHROMIUM)
-#include "MediaPlayerPrivateChromium.h"
-#define PlatformMediaEngineClassName MediaPlayerPrivate
 #elif PLATFORM(BLACKBERRY)
 #include "MediaPlayerPrivateBlackBerry.h"
 #define PlatformMediaEngineClassName MediaPlayerPrivate
index 30407cd..183673b 100644 (file)
@@ -38,13 +38,6 @@ namespace WebCore {
 class TextureMapperPlatformLayer;
 typedef TextureMapperPlatformLayer PlatformLayer;
 };
-#elif PLATFORM(CHROMIUM)
-namespace WebKit {
-class WebLayer;
-}
-namespace WebCore {
-typedef WebKit::WebLayer PlatformLayer;
-}
 #elif PLATFORM(GTK)
 #if USE(TEXTURE_MAPPER_CAIRO) || USE(TEXTURE_MAPPER_GL)
 namespace WebCore {
index 49e2899..4a97bd4 100644 (file)
@@ -45,7 +45,7 @@
 #include "WebCoreSystemInterface.h"
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN))
 #include <wtf/RetainPtr.h>
 #endif
 
@@ -185,7 +185,7 @@ public:
     virtual String description() const;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
     const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
     NSFont* getNSFont() const { return m_platformData.font(); }
 #elif (PLATFORM(WX) && OS(DARWIN)) 
@@ -193,11 +193,11 @@ public:
     NSFont* getNSFont() const { return m_platformData.nsFont(); }
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN))
     CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
+#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
     bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
 #endif
 
@@ -300,7 +300,7 @@ private:
         RefPtr<SimpleFontData> brokenIdeograph;
         RefPtr<SimpleFontData> verticalRightOrientation;
         RefPtr<SimpleFontData> uprightOrientation;
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
         mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
 #endif
         
@@ -317,11 +317,11 @@ private:
     float m_syntheticBoldOffset;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN))
+#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN))
     mutable HashMap<unsigned, RetainPtr<CFDictionaryRef> > m_CFStringAttributes;
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
+#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
     mutable OwnPtr<HashMap<String, bool> > m_combiningCharacterSequenceSupport;
 #endif
 
index 3a5ec85..1581311 100644 (file)
@@ -331,12 +331,7 @@ bool FECustomFilter::resizeContext(const IntSize& newContextSize)
     m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_frameBuffer);
     m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_destTexture);
     // We are going to clear the output buffer anyway, so we can safely initialize the destination texture with garbage data.
-#if PLATFORM(CHROMIUM)
-    // FIXME: GraphicsContext3D::texImage2DDirect is not implemented on Chromium.
-    m_context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, newContextSize.width(), newContextSize.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, 0);
-#else
     m_context->texImage2DDirect(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, newContextSize.width(), newContextSize.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, 0);
-#endif
     m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, m_destTexture, 0);
 
     // We don't need the depth buffer for the texture framebuffer, if we already
index b446101..c827a0e 100644 (file)
@@ -46,9 +46,6 @@
 namespace WebCore {
 class GraphicsContext3D;
 class ImageData;
-#if PLATFORM(CHROMIUM)
-class DrawingBufferPrivate;
-#endif
 
 // Manages a rendering target (framebuffer + attachment) for a canvas.  Can publish its rendering
 // results to a PlatformLayer for compositing.
@@ -172,10 +169,6 @@ private:
     // True if our contents have been modified since the last presentation of this buffer.
     bool m_contentsChanged;
 
-#if PLATFORM(CHROMIUM)
-    OwnPtr<DrawingBufferPrivate> m_private;
-#endif
-
 #if PLATFORM(MAC)
     RetainPtr<WebGLLayer> m_platformLayer;
 #endif
index 1b40a29..8b98e78 100644 (file)
 #include "SharedGraphicsContext3D.h"
 
 #include "Extensions3D.h"
-#if PLATFORM(CHROMIUM)
-#include "GraphicsContext3DPrivate.h"
-#include <public/Platform.h>
-#include <public/WebGraphicsContext3D.h>
-#endif
 #include <wtf/MainThread.h>
 
 namespace WebCore {
index 5b87c56..401a156 100644 (file)
@@ -170,17 +170,11 @@ String Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE(Platform3DObject
 
     String translatedShaderSource;
     String shaderInfoLog;
-    int extraCompileOptions = SH_MAP_LONG_VARIABLE_NAMES;
+    int extraCompileOptions = SH_MAP_LONG_VARIABLE_NAMES | SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
 
     if (m_requiresBuiltInFunctionEmulation)
         extraCompileOptions |= SH_EMULATE_BUILT_IN_FUNCTIONS;
 
-#if !PLATFORM(CHROMIUM)
-    // Chromium does not use the ANGLE bundled in WebKit source, and thus
-    // does not yet have the symbol SH_CLAMP_INDIRECT_ARRAY_BOUNDS.
-    extraCompileOptions |= SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
-#endif
-
     Vector<ANGLEShaderSymbol> symbols;
     bool isValid = compiler.compileShaderSource(entry.source.utf8().data(), shaderType, translatedShaderSource, shaderInfoLog, symbols, extraCompileOptions);
 
index a4e7066..4a659a1 100644 (file)
@@ -147,25 +147,6 @@ namespace WebCore {
 #endif
         }
 
-#if PLATFORM(CHROMIUM)
-        void setSkBitmap(const SkBitmap& bitmap)
-        {
-            m_bitmap = NativeImageSkia::create(bitmap);
-        }
-
-        const SkBitmap& getSkBitmap() const
-        {
-            return m_bitmap->bitmap();
-        }
-
-        void setMemoryAllocator(SkBitmap::Allocator* allocator)
-        {
-            m_allocator = allocator;
-        }
-
-        SkBitmap::Allocator* allocator() const { return m_allocator; }
-#endif
-
         // Use fix point multiplier instead of integer division or floating point math.
         // This multipler produces exactly the same result for all values in range 0 - 255.
         static const unsigned fixPointShift = 24;
index e4fbb52..cd3b013 100644 (file)
@@ -34,6 +34,7 @@
 #include "LevelDBSlice.h"
 #include "LevelDBWriteBatch.h"
 #include "Logging.h"
+#include "NotImplemented.h"
 #include <helpers/memenv/memenv.h>
 #include <leveldb/comparator.h>
 #include <leveldb/db.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(CHROMIUM)
-#include <env_idb.h>
-#include <public/Platform.h>
-#endif
-
-#if !PLATFORM(CHROMIUM)
 namespace leveldb {
 
 static Env* IDBEnv()
@@ -58,7 +53,6 @@ static Env* IDBEnv()
 }
 
 }
-#endif
 
 namespace WebCore {
 
@@ -143,22 +137,6 @@ bool LevelDBDatabase::destroy(const String& fileName)
     return s.ok();
 }
 
-static void histogramFreeSpace(const char* type, String fileName)
-{
-#if PLATFORM(CHROMIUM)
-    String name = "WebCore.IndexedDB.LevelDB.Open" + String(type) + "FreeDiskSpace";
-    long long freeDiskSpaceInKBytes = WebKit::Platform::current()->availableDiskSpaceInBytes(fileName) / 1024;
-    if (freeDiskSpaceInKBytes < 0) {
-        HistogramSupport::histogramEnumeration("WebCore.IndexedDB.LevelDB.FreeDiskSpaceFailure", 1/*sample*/, 2/*boundary*/);
-        return;
-    }
-    int clampedDiskSpaceKBytes = freeDiskSpaceInKBytes > INT_MAX ? INT_MAX : freeDiskSpaceInKBytes;
-    const uint64_t histogramMax = static_cast<uint64_t>(1e9);
-    COMPILE_ASSERT(histogramMax <= INT_MAX, histogramMaxTooBig);
-    HistogramSupport::histogramCustomCounts(name.utf8().data(), clampedDiskSpaceKBytes, 1, histogramMax, 11/*buckets*/);
-#endif
-}
-
 static void histogramLevelDBError(const char* histogramName, const leveldb::Status& s)
 {
     ASSERT(!s.ok());
@@ -188,14 +166,11 @@ PassOwnPtr<LevelDBDatabase> LevelDBDatabase::open(const String& fileName, const
 
     if (!s.ok()) {
         histogramLevelDBError("WebCore.IndexedDB.LevelDBOpenErrors", s);
-        histogramFreeSpace("Failure", fileName);
 
         LOG_ERROR("Failed to open LevelDB database from %s: %s", fileName.ascii().data(), s.ToString().c_str());
         return nullptr;
     }
 
-    histogramFreeSpace("Success", fileName);
-
     OwnPtr<LevelDBDatabase> result = adoptPtr(new LevelDBDatabase);
     result->m_db = adoptPtr(db);
     result->m_comparatorAdapter = comparatorAdapter.release();
index de3ee5a..9cb137b 100644 (file)
@@ -35,7 +35,6 @@
 
 namespace WebCore {
 
-#if !PLATFORM(CHROMIUM)
 BlobRegistry& blobRegistry()
 {
     ASSERT(isMainThread());
@@ -47,7 +46,6 @@ BlobRegistry& blobRegistry()
 #endif
     return instance;
 }
-#endif
 
 BlobRegistry::~BlobRegistry()
 {
index bc12849..61cf39a 100644 (file)
@@ -49,7 +49,6 @@ BlobRegistryImpl::~BlobRegistryImpl()
 {
 }
 
-#if !PLATFORM(CHROMIUM)
 static PassRefPtr<ResourceHandle> createResourceHandle(const ResourceRequest& request, ResourceHandleClient* client)
 {
     return static_cast<BlobRegistryImpl&>(blobRegistry()).createResourceHandle(request, client);
@@ -71,13 +70,6 @@ static void registerBlobResourceHandleConstructor()
     }
 }
 
-#else
-
-static void registerBlobResourceHandleConstructor()
-{
-}
-#endif
-
 PassRefPtr<ResourceHandle> BlobRegistryImpl::createResourceHandle(const ResourceRequest& request, ResourceHandleClient* client)
 {
     RefPtr<BlobResourceHandle> handle = BlobResourceHandle::createAsync(getBlobDataFromURL(request.url()), request, client);
index 6c85fd9..6bc93e8 100644 (file)
@@ -46,17 +46,4 @@ void NetworkStateNotifier::setNetworkStateChangedFunction(void(*function)())
     m_networkStateChangedFunction = function;
 }
 
-#if PLATFORM(CHROMIUM)
-void NetworkStateNotifier::setOnLine(bool onLine)
-{
-    if (m_isOnLine == onLine)
-        return;
-
-    m_isOnLine = onLine;
-
-    if (m_networkStateChangedFunction)
-        m_networkStateChangedFunction();
-}
-#endif // PLATFORM(CHROMIUM) || PLATFORM(EFL)
-
 }
index d12d4b5..61decf5 100644 (file)
@@ -71,8 +71,6 @@ public:
 
 #if (PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT))
     void setNetworkAccessAllowed(bool);
-#elif PLATFORM(CHROMIUM)
-    void setOnLine(bool);
 #endif
 
 #if PLATFORM(BLACKBERRY)
index 29230db..73a66c9 100644 (file)
 #include <wtf/SchedulePair.h>
 #endif
 
-#if PLATFORM(CHROMIUM)
-namespace WebKit {
-class WebCookieJar;
-}
-#endif
-
 #if PLATFORM(QT)
 #include <qglobal.h>
 #endif
@@ -67,11 +61,6 @@ public:
 
     virtual bool shouldClearReferrerOnHTTPSToHTTPRedirect() const = 0;
 
-#if PLATFORM(CHROMIUM)
-    // FIXME: Wrap WebCookieJar into a NetworkStorageSession to make the code cross-platform.
-    virtual WebKit::WebCookieJar* cookieJar() const = 0;
-#endif
-
 #if PLATFORM(MAC)
     virtual bool needsSiteSpecificQuirks() const = 0;
     virtual bool localFileContentSniffingEnabled() const = 0; // FIXME: Reconcile with ResourceHandle::forceContentSniffing().
index fcdc014..af6b921 100644 (file)
@@ -116,9 +116,6 @@ namespace WebCore {
 #if PLATFORM(WIN) && USE(CFNETWORK)
         virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) { return true; }
 #endif
-#if PLATFORM(CHROMIUM)
-        virtual void didDownloadData(ResourceHandle*, int /*dataLength*/) { }
-#endif
 
 #if USE(SOUP)
 private:
index 5ec94a4..0190259 100644 (file)
@@ -526,7 +526,7 @@ void ResourceRequestBase::updateResourceRequest(HTTPBodyUpdatePolicy bodyPolicy)
     }
 }
 
-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(QT) && !PLATFORM(BLACKBERRY)
+#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(QT) && !PLATFORM(BLACKBERRY)
 unsigned initializeMaximumHTTPConnectionCountPerHost()
 {
     // This is used by the loader to control the number of issued parallel load requests. 
index 1b616eb..6d19ed1 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "Hyphenation.h"
 
-#if (!PLATFORM(MAC) && !PLATFORM(CHROMIUM)) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+#if !PLATFORM(MAC) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
 
 #include "AtomicStringKeyedMRUCache.h"
 #include "TextBreakIteratorInternalICU.h"
@@ -76,4 +76,4 @@ size_t lastHyphenLocation(const UChar* characters, size_t length, size_t beforeI
 
 } // namespace WebCore
 
-#endif // (!PLATFORM(MAC) && !PLATFORM(CHROMIUM)) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+#endif // !PLATFORM(MAC) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
index ed8f890..0c945fb 100644 (file)
@@ -132,7 +132,7 @@ void PluginView::handleFocusOutEvent()
 // ports using PluginView, but until then, if new functions like this are 
 // added, please make sure they have the proper platform #ifs so that changes
 // do not break ports who compile both this file and PluginView.cpp.   
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE))
+#if PLATFORM(MAC) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE))
 #if ENABLE(NETSCAPE_PLUGIN_API)
 void PluginView::keepAlive(NPP)
 {
index 9757cc4..2254a98 100644 (file)
 #include <wtf/dtoa.h>
 #endif
 
-#if PLATFORM(CHROMIUM)
-#include "FilterOperation.h"
-#include "FilterOperations.h"
-#include "GraphicsLayer.h"
-#include "GraphicsLayerChromium.h"
-#include "RenderLayerBacking.h"
-#endif
-
 #if ENABLE(ENCRYPTED_MEDIA_V2)
 #include "CDM.h"
 #include "MockCDM.h"
index 779544f..89b535d 100644 (file)
@@ -765,7 +765,7 @@ void XMLHttpRequest::createRequest(ExceptionCode& ec)
 
     ResourceRequest request(m_url);
     request.setHTTPMethod(m_method);
-#if PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
+#if PLATFORM(BLACKBERRY)
     request.setTargetType(ResourceRequest::TargetIsXHR);
 #endif