Changeset 147888 in webkit


Ignore:
Timestamp:
Apr 7, 2013 5:52:39 PM (11 years ago)
Author:
benjamin@webkit.org
Message:

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.

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):

Location:
trunk/Source/WebCore
Files:
1 deleted
77 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r147886 r147888  
     12013-04-07  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove remaining PLATFORM(CHROMIUM)-guarded code in WebCore
     4        https://bugs.webkit.org/show_bug.cgi?id=114081
     5
     6        Remove the remaining PLATFORM(CHROMIUM) build guards. There are still a couple of guards
     7        that most likely apply only to Chromium, like OS(ANDROID) or USE(SKIA_ON_MAC_CHROMIUM),
     8        but removal of these should go into separate patches.
     9
     10        * bindings/generic/RuntimeEnabledFeatures.cpp:
     11        (WebCore):
     12        * config.h:
     13        * history/PageCache.cpp:
     14        (WebCore):
     15        (WebCore::logCanCacheFrameDecision):
     16        (WebCore::logCanCachePageDecision):
     17        (WebCore::PageCache::canCache):
     18        * html/HTMLCanvasElement.cpp:
     19        (WebCore::HTMLCanvasElement::getContext):
     20        (WebCore::HTMLCanvasElement::shouldAccelerate):
     21        * html/HTMLCanvasElement.h:
     22        * html/HTMLMediaElement.cpp:
     23        (WebCore::createFileURLForApplicationCacheResource):
     24        (WebCore::HTMLMediaElement::loadResource):
     25        * html/HTMLSelectElement.cpp:
     26        (WebCore):
     27        (WebCore::HTMLSelectElement::listBoxDefaultEventHandler):
     28        * html/MediaDocument.cpp:
     29        (WebCore::MediaDocument::defaultEventHandler):
     30        * html/canvas/EXTDrawBuffers.cpp:
     31        (WebCore::EXTDrawBuffers::satisfiesWebGLRequirements):
     32        * html/canvas/WebGLRenderingContext.cpp:
     33        (WebCore):
     34        (WebCore::WebGLRenderingContext::create):
     35        (WebCore::WebGLRenderingContext::WebGLRenderingContext):
     36        (WebCore::WebGLRenderingContext::paintRenderingResultsToCanvas):
     37        (WebCore::WebGLRenderingContext::platformLayer):
     38        * inspector/InspectorInstrumentation.cpp:
     39        (WebCore):
     40        (WebCore::InspectorInstrumentation::willPaintImpl):
     41        * inspector/InspectorTimelineAgent.cpp:
     42        (WebCore::InspectorTimelineAgent::didBeginFrame):
     43        * loader/DocumentLoader.cpp:
     44        (WebCore::DocumentLoader::notifyFinished):
     45        * page/FeatureObserver.cpp:
     46        (WebCore::FeatureObserver::~FeatureObserver):
     47        * platform/AsyncFileSystem.cpp:
     48        (WebCore):
     49        * platform/ContextMenu.h:
     50        (ContextMenu):
     51        * platform/ContextMenuItem.h:
     52        * platform/Cursor.h:
     53        * platform/DragData.cpp:
     54        (WebCore):
     55        * platform/DragData.h:
     56        * platform/DragImage.h:
     57        * platform/LocalizedStrings.h:
     58        (WebCore):
     59        * platform/Pasteboard.h:
     60        (Pasteboard):
     61        * platform/PlatformExportMacros.h:
     62        * platform/PlatformInstrumentation.h:
     63        (WebCore::PlatformInstrumentation::willDecodeImage):
     64        (WebCore::PlatformInstrumentation::didDecodeImage):
     65        (WebCore::PlatformInstrumentation::willResizeImage):
     66        (WebCore::PlatformInstrumentation::didResizeImage):
     67        * platform/PlatformMenuDescription.h:
     68        (WebCore):
     69        * platform/PlatformSpeechSynthesizer.h:
     70        (PlatformSpeechSynthesizer):
     71        * platform/PlatformWheelEvent.h:
     72        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
     73        (PlatformWheelEvent):
     74        * platform/ScrollAnimator.cpp:
     75        (WebCore):
     76        (WebCore::ScrollAnimator::handleWheelEvent):
     77        * platform/ScrollAnimator.h:
     78        (ScrollAnimator):
     79        * platform/ScrollAnimatorNone.cpp:
     80        (WebCore::ScrollAnimatorNone::scroll):
     81        (WebCore::ScrollAnimatorNone::animationTimerFired):
     82        * platform/ScrollView.cpp:
     83        (WebCore::ScrollView::updateOverhangAreas):
     84        * platform/ScrollableArea.cpp:
     85        (WebCore::ScrollableArea::scrollPositionChanged):
     86        * platform/Scrollbar.cpp:
     87        * platform/SecureTextInput.cpp: Removed.
     88        * platform/SecureTextInput.h:
     89        (WebCore):
     90        * platform/SuddenTermination.h:
     91        (WebCore):
     92        * platform/Widget.h:
     93        (Widget):
     94        * platform/graphics/ANGLEWebKitBridge.h:
     95        * platform/graphics/BitmapImage.h:
     96        * platform/graphics/FloatPoint.h:
     97        (FloatPoint):
     98        * platform/graphics/FloatRect.h:
     99        (FloatRect):
     100        * platform/graphics/FloatSize.h:
     101        (FloatSize):
     102        * platform/graphics/Font.cpp:
     103        (WebCore):
     104        (WebCore::Font::width):
     105        * platform/graphics/Font.h:
     106        (Font):
     107        * platform/graphics/FontCache.cpp:
     108        (WebCore):
     109        * platform/graphics/FontCache.h:
     110        (FontCache):
     111        * platform/graphics/FontDescription.h:
     112        * platform/graphics/FontPlatformData.cpp:
     113        * platform/graphics/GlyphBuffer.h:
     114        (WebCore):
     115        (WebCore::GlyphBuffer::add):
     116        * platform/graphics/GraphicsContext.cpp:
     117        (WebCore::GraphicsContext::drawImage):
     118        (WebCore::GraphicsContext::drawImageBuffer):
     119        * platform/graphics/GraphicsContext3D.h:
     120        (GraphicsContext3D):
     121        * platform/graphics/GraphicsLayer.h:
     122        (WebCore::GraphicsLayer::supportsBackgroundColorContent):
     123        * platform/graphics/Icon.h:
     124        (Icon):
     125        * platform/graphics/ImageSource.cpp:
     126        * platform/graphics/ImageSource.h:
     127        (WebCore):
     128        * platform/graphics/IntRect.h:
     129        (IntRect):
     130        (WebCore):
     131        * platform/graphics/MediaPlayer.cpp:
     132        * platform/graphics/PlatformLayer.h:
     133        * platform/graphics/SimpleFontData.h:
     134        (SimpleFontData):
     135        (DerivedFontData):
     136        * platform/graphics/filters/FECustomFilter.cpp:
     137        (WebCore::FECustomFilter::resizeContext):
     138        * platform/graphics/gpu/DrawingBuffer.h:
     139        (WebCore):
     140        (DrawingBuffer):
     141        * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
     142        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
     143        (WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):
     144        * platform/image-decoders/ImageDecoder.h:
     145        * platform/leveldb/LevelDBDatabase.cpp:
     146        (WebCore::LevelDBDatabase::open):
     147        * platform/network/BlobRegistry.cpp:
     148        (WebCore::blobRegistry):
     149        * platform/network/BlobRegistryImpl.cpp:
     150        * platform/network/NetworkStateNotifier.cpp:
     151        * platform/network/NetworkStateNotifier.h:
     152        (NetworkStateNotifier):
     153        * platform/network/NetworkingContext.h:
     154        (NetworkingContext):
     155        * platform/network/ResourceHandleClient.h:
     156        * platform/network/ResourceRequestBase.cpp:
     157        (WebCore):
     158        * platform/text/cf/HyphenationCF.cpp:
     159        * plugins/PluginViewNone.cpp:
     160        (WebCore):
     161        * testing/Internals.cpp:
     162        * xml/XMLHttpRequest.cpp:
     163        (WebCore::XMLHttpRequest::createRequest):
     164
    11652013-04-07  Ed Bartosh  <bartosh@gmail.com>
    2166

  • trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp

    r146847 r147888  
    179179
    180180#if ENABLE(VIDEO_TRACK)
    181 #if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
     181#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(BLACKBERRY) || PLATFORM(WIN)
    182182    bool RuntimeEnabledFeatures::isVideoTrackEnabled = true;
    183183#else

  • trunk/Source/WebCore/config.h

    r147766 r147888  
    121121#endif // PLATFORM(MAC)
    122122
    123 #if PLATFORM(CHROMIUM)
    124 
    125 // Chromium uses this file instead of JavaScriptCore/config.h to compile
    126 // JavaScriptCore/wtf (chromium doesn't compile the rest of JSC). Therefore,
    127 // this define is required.
    128 #define WTF_CHANGES 1
    129 
    130 #endif /* PLATFORM(CHROMIUM) */
    131 
    132123#if USE(CG)
    133124#ifndef CGFLOAT_DEFINED

  • trunk/Source/WebCore/history/PageCache.cpp

    r145826 r147888  
    5858namespace WebCore {
    5959
    60 #if PLATFORM(CHROMIUM) || !defined(NDEBUG)
     60#if !defined(NDEBUG)
    6161
    6262#define PCLOG(...) LOG(PageCache, "%*s%s", indentLevel*4, "", makeString(__VA_ARGS__).utf8().data())
    … …  
    8484COMPILE_ASSERT(NumberOfReasonsFramesCannotBeInPageCache <= sizeof(unsigned)*8, ReasonFrameCannotBeInPageCacheDoesNotFitInBitmap);
    8585
    86 #if PLATFORM(CHROMIUM)
    87 static int indexOfSingleBit(int32_t v)
    88 {
    89     int index = 0;
    90     if (v & 0xFFFF0000)
    91         index = 16;
    92     if (v & 0xFF00FF00)
    93         index += 8;
    94     if (v & 0xF0F0F0F0)
    95         index += 4;
    96     if (v & 0xCCCCCCCC)
    97         index += 2;
    98     if (v & 0xAAAAAAAA)
    99         index += 1;
    100     return index;
    101 }
    102 #endif // PLATFORM(CHROMIUM)
    103 
    10486static unsigned logCanCacheFrameDecision(Frame* frame, int indentLevel)
    10587{
    106 #ifdef NDEBUG
    107     UNUSED_PARAM(indentLevel);
    108 #endif
    10988    PCLOG("+---");
    11089    if (!frame->loader()->documentLoader()) {
    … …  
    297276        }
    298277    }
    299 #if PLATFORM(CHROMIUM)
    300     // This strangely specific histogram is particular to chromium: as of 2012-03-16, the FrameClientImpl always denies caching, so
    301     // of particular interest are solitary reasons other than the frameRejectReasons. If we didn't get to the ClientDeniesCaching, we
    302     // took the early exit for the boring reason NoDocumentLoader, so we should have only one reason, and not two.
    303     // FIXME: remove this histogram after data is gathered.
    304     if (frameReasonCount == 2) {
    305         ASSERT(frameRejectReasons & (1 << ClientDeniesCaching));
    306         const unsigned singleReasonForRejectingFrameOtherThanClientDeniesCaching = frameRejectReasons & ~(1 << ClientDeniesCaching);
    307         COMPILE_ASSERT(NumberOfReasonsPagesCannotBeInPageCache <= 32, ReasonPageCannotBeInPageCacheDoesNotFitInInt32);
    308         const int index = indexOfSingleBit(static_cast<int32_t>(singleReasonForRejectingFrameOtherThanClientDeniesCaching));
    309         HistogramSupport::histogramEnumeration("PageCache.FrameRejectReasonByPageWhenSingleExcludingFrameClient", index, NumberOfReasonsPagesCannotBeInPageCache);
    310     }
    311 #endif
    312278
    313279    HistogramSupport::histogramEnumeration("PageCache.FrameRejectReasonCountByPage", frameReasonCount, 1 + NumberOfReasonsFramesCannotBeInPageCache);
    314280}
    315281
    316 #endif
     282#endif // !defined(NDEBUG)
    317283
    318284PageCache* pageCache()
    … …  
    373339        return false;
    374340   
    375 #if PLATFORM(CHROMIUM) || !defined(NDEBUG)
     341#if !defined(NDEBUG)
    376342    logCanCachePageDecision(page);
    377343#endif

  • trunk/Source/WebCore/html/HTMLCanvasElement.cpp

    r147795 r147888  
    5959#endif
    6060
    61 #if PLATFORM(CHROMIUM)
    62 #include <public/Platform.h>
    63 #endif
    64 
    6561namespace WebCore {
    6662
    … …  
    188184    Settings* settings = document()->settings();
    189185    if (settings && settings->webGLEnabled()
    190 #if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)
     186#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)
    191187        && settings->acceleratedCompositingEnabled()
    192188#endif
    … …  
    195191        // Accept the legacy "webkit-3d" name as well as the provisional "experimental-webgl" name.
    196192        bool is3dContext = (type == "webkit-3d") || (type == "experimental-webgl");
    197 
    198 #if PLATFORM(CHROMIUM) && !OS(ANDROID)
    199         // Now that WebGL is ratified, we will also accept "webgl" as the context name in Chrome.
    200         is3dContext |= (type == "webgl");
    201 #endif
    202193
    203194        if (is3dContext) {
    … …  
    513504        return false;
    514505
    515 #if PLATFORM(CHROMIUM)
    516     if (!WebKit::Platform::current()->canAccelerate2dCanvas())
    517         return false;
    518 #endif
    519 
    520506    return true;
    521507#else

  • trunk/Source/WebCore/html/HTMLCanvasElement.h

    r146351 r147888  
    3434#include <wtf/Forward.h>
    3535
    36 #if PLATFORM(CHROMIUM) || PLATFORM(QT)
     36#if PLATFORM(QT)
    3737#define DefaultInterpolationQuality InterpolationMedium
    3838#elif USE(CG)

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r147675 r147888  
    943943}
    944944
    945 #if !PLATFORM(CHROMIUM)
    946945static KURL createFileURLForApplicationCacheResource(const String& path)
    947946{
    … …  
    962961    return url;
    963962}
    964 #endif
    965963
    966964void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& contentType, const String& keySystem)
    … …  
    985983    m_networkState = NETWORK_LOADING;
    986984
    987 #if !PLATFORM(CHROMIUM)
    988985    // If the url should be loaded from the application cache, pass the url of the cached file
    989986    // to the media engine.
    … …  
    998995        }
    999996    }
    1000 #endif
    1001997
    1002998    // Set m_currentSrc *before* changing to the cache url, the fact that we are loading from the app
    … …  
    10041000    m_currentSrc = url;
    10051001
    1006 #if !PLATFORM(CHROMIUM)
    10071002    if (resource) {
    10081003        url = createFileURLForApplicationCacheResource(resource->path());
    10091004        LOG(Media, "HTMLMediaElement::loadResource - will load from app cache -> %s", urlForLoggingMedia(url).utf8().data());
    10101005    }
    1011 #endif
    10121006
    10131007    LOG(Media, "HTMLMediaElement::loadResource - m_currentSrc -> %s", urlForLoggingMedia(m_currentSrc).utf8().data());

  • trunk/Source/WebCore/html/HTMLSelectElement.cpp

    r147548 r147888  
    10631063}
    10641064
    1065 #if (!PLATFORM(WIN) && !(PLATFORM(CHROMIUM) && OS(WINDOWS))) || OS(WINCE)
     1065#if !PLATFORM(WIN) || OS(WINCE)
    10661066bool HTMLSelectElement::platformHandleKeydownEvent(KeyboardEvent* event)
    10671067{
    … …  
    13001300        if (listIndex >= 0) {
    13011301            if (!isDisabledFormControl()) {
    1302 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     1302#if PLATFORM(MAC)
    13031303                updateSelectedState(listIndex, mouseEvent->metaKey(), mouseEvent->shiftKey());
    13041304#else

  • trunk/Source/WebCore/html/MediaDocument.cpp

    r145914 r147888  
    167167        return;
    168168
    169 #if !PLATFORM(CHROMIUM)
    170169    if (HTMLVideoElement* video = ancestorVideoElement(targetNode)) {
    171170        if (event->type() == eventNames().clickEvent) {
    … …  
    181180        }
    182181    }
    183 #endif
    184182
    185183    if (event->type() == eventNames().keydownEvent && event->isKeyboardEvent()) {

  • trunk/Source/WebCore/html/canvas/EXTDrawBuffers.cpp

    r146694 r147888  
    115115    context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, fbo);
    116116
    117 #if PLATFORM(CHROMIUM)
    118     const unsigned char* buffer = 0; // Chromium doesn't allow init data for depth/stencil tetxures.
    119 #else
    120117    const unsigned char buffer[4] = { 0, 0, 0, 0 }; // textures are required to be initialized for other ports.
    121 #endif
    122118    bool supportsDepth = (context->getExtensions()->supports("GL_CHROMIUM_depth_texture")
    123119        || context->getExtensions()->supports("GL_OES_depth_texture")

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

    r147042 r147888  
    429429
    430430    attributes.noExtensions = true;
    431 #if PLATFORM(CHROMIUM)
    432     attributes.shareResources = true;
    433 #else
    434431    attributes.shareResources = false;
    435 #endif
    436432    attributes.preferDiscreteGPU = true;
    437433    attributes.topDocumentURL = document->topDocument()->url();
    … …  
    450446    OwnPtr<WebGLRenderingContext> renderingContext = adoptPtr(new WebGLRenderingContext(canvas, context, attributes));
    451447    renderingContext->suspendIfNeeded();
    452 
    453 #if PLATFORM(CHROMIUM)
    454     if (!renderingContext->m_drawingBuffer) {
    455         canvas->dispatchEvent(WebGLContextEvent::create(eventNames().webglcontextcreationerrorEvent, false, true, "Could not create a WebGL context."));
    456         return nullptr;
    457     }
    458 #endif
    459448
    460449    return renderingContext.release();
    … …  
    483472    m_maxViewportDims[0] = m_maxViewportDims[1] = 0;
    484473    m_context->getIntegerv(GraphicsContext3D::MAX_VIEWPORT_DIMS, m_maxViewportDims);
    485 
    486 #if PLATFORM(CHROMIUM)
    487     // Create the DrawingBuffer and initialize the platform layer.
    488     DrawingBuffer::PreserveDrawingBuffer preserve = m_attributes.preserveDrawingBuffer ? DrawingBuffer::Preserve : DrawingBuffer::Discard;
    489     DrawingBuffer::AlphaRequirement alpha = m_attributes.alpha ? DrawingBuffer::Alpha : DrawingBuffer::Opaque;
    490     m_drawingBuffer = DrawingBuffer::create(m_context.get(), clampedCanvasSize(), preserve, alpha);
    491 #endif
    492474
    493475    if (m_drawingBuffer)
    … …  
    764746    if (m_context->layerComposited() && !m_attributes.preserveDrawingBuffer) {
    765747        m_context->paintCompositedResultsToCanvas(canvas()->buffer());
    766 
    767 #if USE(ACCELERATED_COMPOSITING) && PLATFORM(CHROMIUM)
    768         if (m_drawingBuffer)
    769             m_drawingBuffer->paintCompositedResultsToCanvas(canvas()->buffer());
    770 #endif
    771748
    772749        canvas()->makePresentationCopy();
    … …  
    46934670PlatformLayer* WebGLRenderingContext::platformLayer() const
    46944671{
    4695 #if PLATFORM(CHROMIUM)
    4696     if (m_drawingBuffer)
    4697         return m_drawingBuffer->platformLayer();
    4698 #endif
    4699 
    47004672    return m_context->platformLayer();
    47014673}

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r147795 r147888  
    8080#include <wtf/text/CString.h>
    8181
    82 #if PLATFORM(CHROMIUM)
    83 #include "platform/chromium/TraceEvent.h"
    84 #endif
    85 
    8682namespace WebCore {
    8783
    … …  
    529525void InspectorInstrumentation::willPaintImpl(InstrumentingAgents* instrumentingAgents, RenderObject* renderer)
    530526{
    531 #if PLATFORM(CHROMIUM)
    532     TRACE_EVENT_INSTANT1("instrumentation", InstrumentationEvents::Paint, InstrumentationEventArguments::PageId, reinterpret_cast<unsigned long long>(renderer->frame()->page()));
    533 #endif
    534 
    535527    if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
    536528        timelineAgent->willPaint(renderer->frame());

  • trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

    r147422 r147888  
    226226void InspectorTimelineAgent::didBeginFrame()
    227227{
    228 #if PLATFORM(CHROMIUM)
    229     TRACE_EVENT_INSTANT0("webkit", InstrumentationEvents::BeginFrame);
    230 #endif
    231228    m_pendingFrameRecord = TimelineRecordFactory::createGenericRecord(timestamp(), 0);
    232229}

  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r147730 r147888  
    346346    }
    347347
    348     // FIXME: we should fix the design to eliminate the need for a platform ifdef here
    349 #if !PLATFORM(CHROMIUM)
    350348    if (m_request.cachePolicy() == ReturnCacheDataDontLoad && !m_mainResource->wasCanceled()) {
    351349        frameLoader()->retryAfterFailedCacheOnlyMainResourceLoad();
    352350        return;
    353351    }
    354 #endif
    355352
    356353    mainReceivedError(m_mainResource->resourceError());

  • trunk/Source/WebCore/page/FeatureObserver.cpp

    r147749 r147888  
    4040FeatureObserver::~FeatureObserver()
    4141{
    42 #if PLATFORM(CHROMUM)
    43     // We always log PageDestruction so that we have a scale for the rest of the features.
    44     HistogramSupport::histogramEnumeration("WebCore.FeatureObserver", PageDestruction, NumberOfFeatures);
    45 #endif
    46 
    4742    updateMeasurements();
    4843}

  • trunk/Source/WebCore/platform/AsyncFileSystem.cpp

    r130281 r147888  
    4040namespace WebCore {
    4141
    42 #if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(BLACKBERRY) && !PLATFORM(EFL)
     42#if !PLATFORM(GTK) && !PLATFORM(BLACKBERRY) && !PLATFORM(EFL)
    4343bool AsyncFileSystem::isAvailable()
    4444{

  • trunk/Source/WebCore/platform/ContextMenu.h

    r147545 r147888  
    9696        // Keep this in sync with the PlatformMenuDescription typedef
    9797        RetainPtr<NSMutableArray> m_platformDescription;
    98 #elif PLATFORM(CHROMIUM)
    99         Vector<ContextMenuItem> m_items;
    10098#else
    10199        PlatformMenuDescription m_platformDescription;

  • trunk/Source/WebCore/platform/ContextMenuItem.h

    r147870 r147888  
    198198        bool enabled;
    199199    };
    200 #elif PLATFORM(CHROMIUM)
    201     struct PlatformMenuItemDescription {
    202         PlatformMenuItemDescription()
    203             : type(ActionType)
    204             , action(ContextMenuItemTagNoAction)
    205             , checked(false)
    206             , enabled(true) { }
    207         ContextMenuItemType type;
    208         ContextMenuAction action;
    209         String title;
    210         Vector<ContextMenuItem> subMenuItems;
    211         bool checked;
    212         bool enabled;
    213     };
    214200#else
    215201    typedef void* PlatformMenuItemDescription;

  • trunk/Source/WebCore/platform/Cursor.h

    r136919 r147888  
    6161
    6262// Looks like it's just PLATFORM(WX) and PLATFORM(BLACKBERRY) still not using this?
    63 #if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(CHROMIUM)
     63#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
    6464#define WTF_USE_LAZY_NATIVE_CURSOR 1
    6565#endif

  • trunk/Source/WebCore/platform/DragData.cpp

    r120667 r147888  
    5454#endif
    5555
    56 #if !PLATFORM(CHROMIUM)
    5756int DragData::modifierKeyState() const
    5857{
    … …  
    7877}
    7978#endif
    80 #endif
    8179
    8280} // namespace WebCore

  • trunk/Source/WebCore/platform/DragData.h

    r120667 r147888  
    6262}
    6363typedef WebCore::DataObjectGtk* DragDataRef;
    64 #elif PLATFORM(CHROMIUM)
    65 #include "DragDataRef.h"
    6664#elif PLATFORM(EFL) || PLATFORM(BLACKBERRY)
    6765typedef void* DragDataRef;

  • trunk/Source/WebCore/platform/DragImage.h

    r130636 r147888  
    4343#elif PLATFORM(WX)
    4444class wxDragImage;
    45 #elif PLATFORM(CHROMIUM)
    46 #include "DragImageRef.h"
    4745#elif PLATFORM(GTK)
    4846typedef struct _cairo_surface cairo_surface_t;

  • trunk/Source/WebCore/platform/LocalizedStrings.h

    r147675 r147888  
    283283    String snapshottedPlugInLabelSubtitle();
    284284
    285 #if !PLATFORM(CHROMIUM)
    286285#define WEB_UI_STRING(string, description) WebCore::localizedString(string)
    287286#define WEB_UI_STRING_KEY(string, key, description) WebCore::localizedString(key)
    288287
    289288    String localizedString(const char* key);
    290 #endif
    291289
    292290} // namespace WebCore

  • trunk/Source/WebCore/platform/Pasteboard.h

    r146835 r147888  
    103103    String plainText(Frame* = 0);
    104104   
    105 #if PLATFORM(QT) || PLATFORM(CHROMIUM) || PLATFORM(GTK)
     105#if PLATFORM(QT) || PLATFORM(GTK)
    106106    bool isSelectionMode() const;
    107107    void setSelectionMode(bool);
    … …  
    126126#endif
    127127
    128 #if PLATFORM(QT) || PLATFORM(CHROMIUM)
     128#if PLATFORM(QT)
    129129    bool m_selectionMode;
    130130#endif

  • trunk/Source/WebCore/platform/PlatformExportMacros.h

    r122805 r147888  
    4949#else // !USE(EXPORT_MACROS)
    5050
    51 #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
     51#if OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
    5252
    5353#if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)

  • trunk/Source/WebCore/platform/PlatformInstrumentation.h

    r145889 r147888  
    3434#include <wtf/MainThread.h>
    3535#include <wtf/text/WTFString.h>
    36 
    37 #if PLATFORM(CHROMIUM)
    38 #include "TraceEvent.h"
    39 #endif
    4036
    4137namespace WebCore {
    … …  
    7773inline void PlatformInstrumentation::willDecodeImage(const String& imageType)
    7874{
    79 #if PLATFORM(CHROMIUM)
    80     TRACE_EVENT_BEGIN1(CategoryName, ImageDecodeEvent, ImageTypeArgument, TRACE_STR_COPY(imageType.ascii().data()));
    81 #endif
    8275    FAST_RETURN_IF_NO_CLIENT_OR_NOT_MAIN_THREAD();
    8376    m_client->willDecodeImage(imageType);
    … …  
    8679inline void PlatformInstrumentation::didDecodeImage()
    8780{
    88 #if PLATFORM(CHROMIUM)
    89     TRACE_EVENT_END0(CategoryName, ImageDecodeEvent);
    90 #endif
    9181    FAST_RETURN_IF_NO_CLIENT_OR_NOT_MAIN_THREAD();
    9282    m_client->didDecodeImage();
    … …  
    9585inline void PlatformInstrumentation::willResizeImage(bool shouldCache)
    9686{
    97 #if PLATFORM(CHROMIUM)
    98     TRACE_EVENT_BEGIN1(CategoryName, ImageResizeEvent, CachedArgument, shouldCache);
    99 #endif
    10087    FAST_RETURN_IF_NO_CLIENT_OR_NOT_MAIN_THREAD();
    10188    m_client->willResizeImage(shouldCache);
    … …  
    10491inline void PlatformInstrumentation::didResizeImage()
    10592{
    106 #if PLATFORM(CHROMIUM)
    107     TRACE_EVENT_END0(CategoryName, ImageResizeEvent);
    108 #endif
    10993    FAST_RETURN_IF_NO_CLIENT_OR_NOT_MAIN_THREAD();
    11094    m_client->didResizeImage();

  • trunk/Source/WebCore/platform/PlatformMenuDescription.h

    r147870 r147888  
    3737#elif PLATFORM(WX)
    3838class wxMenu;
    39 #elif PLATFORM(CHROMIUM)
    40 #include <wtf/Vector.h>
    4139#endif
    4240
    … …  
    5351#elif PLATFORM(WX)
    5452    typedef wxMenu* PlatformMenuDescription;
    55 #elif PLATFORM(CHROMIUM)
    56     class ContextMenuItem;
    57     typedef const Vector<ContextMenuItem>* PlatformMenuDescription;
    5853#else
    5954    typedef void* PlatformMenuDescription;

  • trunk/Source/WebCore/platform/PlatformSpeechSynthesizer.h

    r146724 r147888  
    3636#include <wtf/RetainPtr.h>
    3737OBJC_CLASS WebSpeechSynthesisWrapper;
    38 #endif
    39 
    40 #if PLATFORM(CHROMIUM)
    41 namespace WebKit {
    42 class WebSpeechSynthesizer;
    43 class WebSpeechSynthesizerClient;
    44 }
    4538#endif
    4639
    … …  
    9487    RetainPtr<WebSpeechSynthesisWrapper> m_platformSpeechWrapper;
    9588#endif
    96 #if PLATFORM(CHROMIUM)
    97     OwnPtr<WebKit::WebSpeechSynthesizer> m_webSpeechSynthesizer;
    98     OwnPtr<WebKit::WebSpeechSynthesizerClient> m_webSpeechSynthesizerClient;
    99 #endif
    10089};
    10190   

  • trunk/Source/WebCore/platform/PlatformWheelEvent.h

    r144531 r147888  
    6161    };
    6262
    63 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     63#if PLATFORM(MAC)
    6464    enum PlatformWheelEventPhase {
    6565        PlatformWheelEventPhaseNone        = 0,
    … …  
    8383            , m_granularity(ScrollByPixelWheelEvent)
    8484            , m_directionInvertedFromDevice(false)
    85 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)
     85#if PLATFORM(MAC)
    8686            , m_hasPreciseScrollingDeltas(false)
    87 #endif
    88 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
    8987            , m_phase(PlatformWheelEventPhaseNone)
    9088            , m_momentumPhase(PlatformWheelEventPhaseNone)
    … …  
    106104            , m_granularity(granularity)
    107105            , m_directionInvertedFromDevice(false)
    108 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)
     106#if PLATFORM(MAC)
    109107            , m_hasPreciseScrollingDeltas(false)
    110 #endif
    111 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
    112108            , m_phase(PlatformWheelEventPhaseNone)
    113109            , m_momentumPhase(PlatformWheelEventPhaseNone)
    … …  
    152148#endif
    153149
    154 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)
     150#if PLATFORM(MAC)
    155151        bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
    156152        void setHasPreciseScrollingDeltas(bool b) { m_hasPreciseScrollingDeltas = b; }
    157 #endif
    158 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
    159153        PlatformWheelEventPhase phase() const { return m_phase; }
    160154        PlatformWheelEventPhase momentumPhase() const { return m_momentumPhase; }
    … …  
    185179        PlatformWheelEventGranularity m_granularity;
    186180        bool m_directionInvertedFromDevice;
    187 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)
     181#if PLATFORM(MAC)
    188182        bool m_hasPreciseScrollingDeltas;
    189 #endif
    190 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
    191183        PlatformWheelEventPhase m_phase;
    192184        PlatformWheelEventPhase m_momentumPhase;

  • trunk/Source/WebCore/platform/ScrollAnimator.cpp

    r141610 r147888  
    4242namespace WebCore {
    4343
    44 #if !ENABLE(SMOOTH_SCROLLING) && !(PLATFORM(CHROMIUM) && OS(DARWIN))
     44#if !ENABLE(SMOOTH_SCROLLING)
    4545PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea)
    4646{
    … …  
    9494    bool handled = false;
    9595
    96 #if PLATFORM(CHROMIUM) && !OS(DARWIN)
    97     ScrollGranularity granularity = e.hasPreciseScrollingDeltas() ? ScrollByPrecisePixel : ScrollByPixel;
    98 #else
    9996    ScrollGranularity granularity = ScrollByPixel;
    100 #endif
    101 
    10297    IntSize maxForwardScrollDelta = m_scrollableArea->maximumScrollPosition() - m_scrollableArea->scrollPosition();
    10398    IntSize maxBackwardScrollDelta = m_scrollableArea->scrollPosition() - m_scrollableArea->minimumScrollPosition();

  • trunk/Source/WebCore/platform/ScrollAnimator.h

    r141625 r147888  
    6666    virtual bool handleWheelEvent(const PlatformWheelEvent&);
    6767
    68 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     68#if PLATFORM(MAC)
    6969    virtual void handleWheelEventPhase(PlatformWheelEventPhase) { }
    7070#endif

  • trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp

    r141610 r147888  
    4343#include <wtf/CurrentTime.h>
    4444#include <wtf/PassOwnPtr.h>
    45 
    46 #if PLATFORM(CHROMIUM)
    47 #include "TraceEvent.h"
    48 #endif
    4945
    5046#if ENABLE(GESTURE_EVENTS)
    … …  
    437433        return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
    438434
    439 #if PLATFORM(CHROMIUM)
    440     TRACE_EVENT0("webkit", "ScrollAnimatorNone::scroll");
    441 #endif
    442 
    443435    // FIXME: get the type passed in. MouseWheel could also be by line, but should still have different
    444436    // animation parameters than the keyboard.
    … …  
    532524void ScrollAnimatorNone::animationTimerFired()
    533525{
    534 #if PLATFORM(CHROMIUM)
    535     TRACE_EVENT0("webkit", "ScrollAnimatorNone::animationTimerFired");
    536 #endif
    537 
    538526    double currentTime = WTF::monotonicallyIncreasingTime();
    539527    double deltaToNextFrame = ceil((currentTime - m_startTime) * kFrameRate) / kFrameRate - (currentTime - m_startTime);
    … …  
    555543#endif
    556544
    557 #if PLATFORM(CHROMIUM)
    558     TRACE_EVENT0("webkit", "ScrollAnimatorNone::notifyPositionChanged");
    559 #endif
    560545    notifyPositionChanged(FloatSize());
    561546

  • trunk/Source/WebCore/platform/ScrollView.cpp

    r147436 r147888  
    11571157    IntRect verticalOverhangRect;
    11581158    calculateOverhangAreasForPainting(horizontalOverhangRect, verticalOverhangRect);
    1159 #if USE(ACCELERATED_COMPOSITING) && PLATFORM(CHROMIUM) && ENABLE(RUBBER_BANDING)
    1160     if (GraphicsLayer* overhangLayer = layerForOverhangAreas()) {
    1161         bool hasOverhangArea = !horizontalOverhangRect.isEmpty() || !verticalOverhangRect.isEmpty();
    1162         overhangLayer->setDrawsContent(hasOverhangArea);
    1163         if (hasOverhangArea)
    1164             overhangLayer->setNeedsDisplay();
    1165     }
    1166 #endif
    11671159    if (!horizontalOverhangRect.isEmpty())
    11681160        hostWindow()->invalidateContentsAndRootView(horizontalOverhangRect, false /*immediate*/);

  • trunk/Source/WebCore/platform/ScrollableArea.cpp

    r147471 r147888  
    4242#include <wtf/PassOwnPtr.h>
    4343
    44 #if PLATFORM(CHROMIUM)
    45 #include "TraceEvent.h"
    46 #endif
    47 
    4844namespace WebCore {
    4945
    … …  
    146142void ScrollableArea::scrollPositionChanged(const IntPoint& position)
    147143{
    148 #if PLATFORM(CHROMIUM)
    149     TRACE_EVENT0("webkit", "ScrollableArea::scrollPositionChanged");
    150 #endif
    151 
    152144    IntPoint oldPosition = scrollPosition();
    153145    // Tell the derived class to scroll its contents.

  • trunk/Source/WebCore/platform/Scrollbar.cpp

    r146726 r147888  
    4848using namespace std;
    4949
    50 #if (PLATFORM(CHROMIUM) && (OS(UNIX) && !OS(DARWIN))) || PLATFORM(GTK)
     50#if PLATFORM(GTK)
    5151// The position of the scrollbar thumb affects the appearance of the steppers, so
    5252// when the thumb moves, we have to invalidate them for painting.

  • trunk/Source/WebCore/platform/SecureTextInput.h

    r143499 r147888  
    3434namespace WebCore {
    3535
    36 // Once enableSecureTextInput is called, secure text input mode is set until
    37 // disableSecureTextInput has been called.
    38 void enableSecureTextInput();
    39 void disableSecureTextInput();
    40 
    41 #if !(PLATFORM(CHROMIUM) && OS(DARWIN))
     36// FIXME: Remove these methods. (http://wkb.ug/114126)
    4237inline void enableSecureTextInput() { }
    4338inline void disableSecureTextInput() { }
    44 #endif
    4539
    4640} // namespace WebCore

  • trunk/Source/WebCore/platform/SuddenTermination.h

    r121524 r147888  
    3535    void enableSuddenTermination();
    3636
    37 #if !PLATFORM(MAC) && !PLATFORM(CHROMIUM)
     37#if !PLATFORM(MAC)
    3838    inline void disableSuddenTermination() { }
    3939    inline void enableSuddenTermination() { }

  • trunk/Source/WebCore/platform/Widget.h

    r145913 r147888  
    3232#include <wtf/RefCounted.h>
    3333
    34 #if PLATFORM(CHROMIUM)
    35 #include "PageClientChromium.h"
    36 #include "PlatformWidget.h"
    37 #endif
    38 
    3934#if PLATFORM(MAC)
    4035#include <wtf/RetainPtr.h>
    … …  
    9792class PageClientEfl;
    9893typedef PageClientEfl* PlatformPageClient;
    99 #elif PLATFORM(CHROMIUM)
    100 typedef WebCore::PageClientChromium* PlatformPageClient;
    10194#else
    10295typedef PlatformWidget PlatformPageClient;
    … …  
    228221#endif
    229222
    230 #if PLATFORM(CHROMIUM)
    231     virtual bool isPluginContainer() const { return false; }
    232 #endif
    233 
    234223#if PLATFORM(QT)
    235224    QObject* bindingObject() const;

  • trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h

    r131952 r147888  
    3030#include <wtf/text/WTFString.h>
    3131
    32 #if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(BLACKBERRY) && !PLATFORM(CHROMIUM) && !PLATFORM(QT)
     32#if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(BLACKBERRY) && !PLATFORM(QT)
    3333#include "ANGLE/ShaderLang.h"
    3434#else

  • trunk/Source/WebCore/platform/graphics/BitmapImage.h

    r147643 r147888  
    206206#endif
    207207    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode);
    208 #if USE(CG) || PLATFORM(CHROMIUM) || USE(CAIRO) || PLATFORM(BLACKBERRY)
     208#if USE(CG) || USE(CAIRO) || PLATFORM(BLACKBERRY)
    209209    virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, RespectImageOrientationEnum) OVERRIDE;
    210210#endif

  • trunk/Source/WebCore/platform/graphics/FloatPoint.h

    r147855 r147888  
    4444#endif
    4545
    46 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     46#if PLATFORM(MAC)
    4747#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    4848typedef struct CGPoint NSPoint;
    … …  
    156156#endif
    157157
    158 #if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
    159         && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     158#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    160159    FloatPoint(const NSPoint&);
    161160    operator NSPoint() const;

  • trunk/Source/WebCore/platform/graphics/FloatRect.h

    r147855 r147888  
    3535#endif
    3636
    37 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     37#if PLATFORM(MAC)
    3838#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    3939typedef struct CGRect NSRect;
    … …  
    201201#endif
    202202
    203 #if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
    204         && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     203#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    205204    FloatRect(const NSRect&);
    206205    operator NSRect() const;

  • trunk/Source/WebCore/platform/graphics/FloatSize.h

    r147855 r147888  
    5050#endif
    5151
    52 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(QT) && USE(QTKIT))
     52#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
    5353#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    5454typedef struct CGSize NSSize;
    … …  
    136136#endif
    137137
    138 #if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
    139         && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) \
    140         || (PLATFORM(QT) && USE(QTKIT))
     138#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) || (PLATFORM(QT) && USE(QTKIT))
    141139    explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
    142140    operator NSSize() const;

  • trunk/Source/WebCore/platform/graphics/Font.cpp

    r142810 r147888  
    238238}
    239239
    240 #if !(PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)))
    241 
     240#if !PLATFORM(MAC)
    242241PassOwnPtr<TextLayout> Font::createLayout(RenderText*, float, bool) const
    243242{
    … …  
    254253    return 0;
    255254}
    256 
    257255#endif
    258256

  • trunk/Source/WebCore/platform/graphics/Font.h

    r146630 r147888  
    156156        return glyphDataAndPageForCharacter(c, mirror, variant).first;
    157157    }
    158 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     158#if PLATFORM(MAC)
    159159    const SimpleFontData* fontDataForCombiningCharacterSequence(const UChar*, size_t length, FontDataVariant) const;
    160160#endif

  • trunk/Source/WebCore/platform/graphics/FontCache.cpp

    r147702 r147888  
    289289static FontDataCache* gFontDataCache = 0;
    290290
    291 #if PLATFORM(CHROMIUM) && !OS(ANDROID)
    292 const int cMaxInactiveFontData = 250;
    293 const int cTargetInactiveFontData = 200;
    294 #else
    295291const int cMaxInactiveFontData = 225;
    296292const int cTargetInactiveFontData = 200;
    297 #endif
    298293static ListHashSet<RefPtr<SimpleFontData> >* gInactiveFontData = 0;
    299294

  • trunk/Source/WebCore/platform/graphics/FontCache.h

    r147639 r147888  
    108108#if PLATFORM(WIN)
    109109    PassRefPtr<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT&, AtomicString& outFontFamilyName);
    110 #elif PLATFORM(CHROMIUM) && OS(WINDOWS)
    111     PassRefPtr<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT&, wchar_t* outFontFamilyName);
    112110#endif
    113111
    … …  
    158156    int m_purgePreventCount;
    159157
    160 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || OS(ANDROID)
     158#if PLATFORM(MAC) || OS(ANDROID)
    161159    friend class ComplexTextController;
    162160#endif

  • trunk/Source/WebCore/platform/graphics/FontDescription.h

    r136640 r147888  
    148148    void setWeight(FontWeight w) { m_weight = w; }
    149149    void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = genericFamily; }
    150 #if PLATFORM(CHROMIUM) && OS(DARWIN)
    151     void setUsePrinterFont(bool) { }
    152 #else
    153150    void setUsePrinterFont(bool p) { m_usePrinterFont = p; }
    154 #endif
    155151    void setRenderingMode(FontRenderingMode mode) { m_renderingMode = mode; }
    156152    void setKerning(Kerning kerning) { m_kerning = kerning; }

  • trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp

    r147855 r147888  
    2727#include <wtf/text/StringHash.h>
    2828#include <wtf/text/WTFString.h>
    29 
    30 #if PLATFORM(CHROMIUM) && OS(DARWIN)
    31 #include "HarfBuzzFace.h"
    32 #endif
    3329
    3430using namespace std;

  • trunk/Source/WebCore/platform/graphics/GlyphBuffer.h

    r146209 r147888  
    4040#endif
    4141
    42 #if OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM))
     42#if OS(DARWIN) && PLATFORM(WX)
    4343#include <ApplicationServices/ApplicationServices.h>
    4444#endif
    … …  
    6565// CG uses CGSize instead of FloatSize so that the result of advances()
    6666// can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
    67 #if USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
     67#if USE(CG) || (OS(DARWIN) && PLATFORM(WX))
    6868struct GlyphBufferAdvance : CGSize {
    6969public:
    … …  
    166166#endif
    167167
    168 #if USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
     168#if USE(CG) || (OS(DARWIN) && PLATFORM(WX))
    169169        CGSize advance = { width, 0 };
    170170        m_advances.append(advance);

  • trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

    r147750 r147888  
    509509    if (useLowQualityScale) {
    510510        previousInterpolationQuality = imageInterpolationQuality();
    511 #if PLATFORM(CHROMIUM)
    512         setImageInterpolationQuality(InterpolationLow);
    513 #else
    514511        // FIXME (49002): Should be InterpolationLow
    515512        setImageInterpolationQuality(InterpolationNone);
    516 #endif
    517513    }
    518514
    … …  
    596592    if (useLowQualityScale) {
    597593        InterpolationQuality previousInterpolationQuality = imageInterpolationQuality();
    598 #if PLATFORM(CHROMIUM)
    599         setImageInterpolationQuality(InterpolationLow);
    600 #else
    601594        // FIXME (49002): Should be InterpolationLow
    602595        setImageInterpolationQuality(InterpolationNone);
    603 #endif
    604596        image->draw(this, styleColorSpace, dest, src, op, blendMode, useLowQualityScale);
    605597        setImageInterpolationQuality(previousInterpolationQuality);

  • trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

    r147684 r147888  
    4141
    4242// FIXME: Find a better way to avoid the name confliction for NO_ERROR.
    43 #if ((PLATFORM(CHROMIUM) && OS(WINDOWS)) || PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS)))
     43#if PLATFORM(WIN) || (PLATFORM(QT) && OS(WINDOWS))
    4444#undef NO_ERROR
    4545#elif PLATFORM(GTK)
    … …  
    8181#endif
    8282
    83 #if (PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)) && USE(SKIA)
     83#if PLATFORM(BLACKBERRY) && USE(SKIA)
    8484class GrContext;
    8585#endif
    … …  
    493493    Platform3DObject platformTexture() const { return m_compositorTexture; }
    494494    CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_webGLLayer.get()); }
    495 #elif PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
     495#elif PLATFORM(BLACKBERRY)
    496496    PlatformGraphicsContext3D platformGraphicsContext3D() const;
    497497    Platform3DObject platformTexture() const;
    … …  
    529529    bool makeContextCurrent();
    530530
    531 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
     531#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(BLACKBERRY)
    532532    // With multisampling on, blit from multisampleFBO to regular FBO.
    533533    void prepareTexture();
    … …  
    10571057    friend class Extensions3DOpenGLES;
    10581058    OwnPtr<Extensions3DOpenGLES> m_extensions;
    1059 #elif !PLATFORM(CHROMIUM)
     1059#else
    10601060    friend class Extensions3DOpenGL;
    10611061    OwnPtr<Extensions3DOpenGL> m_extensions;

  • trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

    r147797 r147888  
    429429    static bool supportsBackgroundColorContent()
    430430    {
    431 #if USE(CA) || USE(TEXTURE_MAPPER) || PLATFORM(CHROMIUM)
     431#if USE(CA) || USE(TEXTURE_MAPPER)
    432432        return true;
    433433#else

  • trunk/Source/WebCore/platform/graphics/Icon.h

    r138326 r147888  
    3636#elif PLATFORM(GTK)
    3737typedef struct _GdkPixbuf GdkPixbuf;
    38 #elif PLATFORM(CHROMIUM)
    39 #include "Image.h"
    40 #include "PlatformIcon.h"
    4138#endif
    4239
    … …  
    5653#if PLATFORM(WIN)
    5754    static PassRefPtr<Icon> create(HICON hIcon) { return adoptRef(new Icon(hIcon)); }
    58 #elif PLATFORM(CHROMIUM)
    59     static PassRefPtr<Icon> create(PassRefPtr<PlatformIcon> icon) { return adoptRef(new Icon(icon)); }
    6055#endif
    6156
    … …  
    7671    Icon();
    7772    Evas_Object* m_icon;
    78 #elif PLATFORM(CHROMIUM)
    79     Icon(PassRefPtr<PlatformIcon>);
    80     RefPtr<PlatformIcon> m_icon;
    8173#endif
    8274};

  • trunk/Source/WebCore/platform/graphics/ImageSource.cpp

    r147622 r147888  
    3636#include "PlatformMemoryInstrumentation.h"
    3737
    38 #if PLATFORM(CHROMIUM)
    39 #include "DeferredImageDecoder.h"
    40 #endif
    41 
    4238namespace WebCore {
    4339

  • trunk/Source/WebCore/platform/graphics/ImageSource.h

    r147622 r147888  
    4949#if USE(CG)
    5050typedef CGImageSourceRef NativeImageDecoderPtr;
    51 #elif !PLATFORM(CHROMIUM)
     51#else
    5252class ImageDecoder;
    5353typedef ImageDecoder* NativeImageDecoderPtr;
    5454#endif
    5555
    56 #if PLATFORM(CHROMIUM)
    57 class DeferredImageDecoder;
    58 typedef DeferredImageDecoder NativeImageDecoder;
    59 typedef DeferredImageDecoder* NativeImageDecoderPtr;
    60 #elif USE(CG)
     56#if USE(CG)
    6157#define NativeImageDecoder ImageDecoder
    6258#else

  • trunk/Source/WebCore/platform/graphics/IntRect.h

    r147855 r147888  
    3434#endif
    3535
    36 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(QT) && USE(QTKIT))
     36#if PLATFORM(MAC) || (PLATFORM(QT) && USE(QTKIT))
    3737#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    3838typedef struct CGRect NSRect;
    … …  
    231231#endif
    232232
    233 #if (PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))) \
    234         && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) \
    235         || (PLATFORM(QT) && USE(QTKIT))
     233#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) || (PLATFORM(QT) && USE(QTKIT))
    236234    operator NSRect() const;
    237235#endif
    … …  
    284282#endif
    285283
    286 #if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) \
    287         || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(QT) && USE(QTKIT))
     284#if (PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)) || (PLATFORM(QT) && USE(QTKIT))
    288285IntRect enclosingIntRect(const NSRect&);
    289286#endif

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

    r147675 r147888  
    7777#define PlatformMediaEngineClassName MediaPlayerPrivateQt
    7878#endif
    79 #elif PLATFORM(CHROMIUM)
    80 #include "MediaPlayerPrivateChromium.h"
    81 #define PlatformMediaEngineClassName MediaPlayerPrivate
    8279#elif PLATFORM(BLACKBERRY)
    8380#include "MediaPlayerPrivateBlackBerry.h"

  • trunk/Source/WebCore/platform/graphics/PlatformLayer.h

    r146478 r147888  
    3939typedef TextureMapperPlatformLayer PlatformLayer;
    4040};
    41 #elif PLATFORM(CHROMIUM)
    42 namespace WebKit {
    43 class WebLayer;
    44 }
    45 namespace WebCore {
    46 typedef WebKit::WebLayer PlatformLayer;
    47 }
    4841#elif PLATFORM(GTK)
    4942#if USE(TEXTURE_MAPPER_CAIRO) || USE(TEXTURE_MAPPER_GL)

  • trunk/Source/WebCore/platform/graphics/SimpleFontData.h

    r147855 r147888  
    4646#endif
    4747
    48 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN))
     48#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN))
    4949#include <wtf/RetainPtr.h>
    5050#endif
    … …  
    186186#endif
    187187
    188 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     188#if PLATFORM(MAC)
    189189    const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
    190190    NSFont* getNSFont() const { return m_platformData.font(); }
    … …  
    194194#endif
    195195
    196 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN))
     196#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN))
    197197    CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
    198198#endif
    199199
    200 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
     200#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
    201201    bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
    202202#endif
    … …  
    301301        RefPtr<SimpleFontData> verticalRightOrientation;
    302302        RefPtr<SimpleFontData> uprightOrientation;
    303 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
     303#if PLATFORM(MAC)
    304304        mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
    305305#endif
    … …  
    318318#endif
    319319
    320 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN))
     320#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN))
    321321    mutable HashMap<unsigned, RetainPtr<CFDictionaryRef> > m_CFStringAttributes;
    322322#endif
    323323
    324 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
     324#if PLATFORM(MAC) || (PLATFORM(WX) && OS(DARWIN)) || USE(HARFBUZZ)
    325325    mutable OwnPtr<HashMap<String, bool> > m_combiningCharacterSequenceSupport;
    326326#endif

  • trunk/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp

    r137754 r147888  
    332332    m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_destTexture);
    333333    // We are going to clear the output buffer anyway, so we can safely initialize the destination texture with garbage data.
    334 #if PLATFORM(CHROMIUM)
    335     // FIXME: GraphicsContext3D::texImage2DDirect is not implemented on Chromium.
    336     m_context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, newContextSize.width(), newContextSize.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, 0);
    337 #else
    338334    m_context->texImage2DDirect(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, newContextSize.width(), newContextSize.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, 0);
    339 #endif
    340335    m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, m_destTexture, 0);
    341336

  • trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h

    r145856 r147888  
    4747class GraphicsContext3D;
    4848class ImageData;
    49 #if PLATFORM(CHROMIUM)
    50 class DrawingBufferPrivate;
    51 #endif
    5249
    5350// Manages a rendering target (framebuffer + attachment) for a canvas.  Can publish its rendering
    … …  
    173170    bool m_contentsChanged;
    174171
    175 #if PLATFORM(CHROMIUM)
    176     OwnPtr<DrawingBufferPrivate> m_private;
    177 #endif
    178 
    179172#if PLATFORM(MAC)
    180173    RetainPtr<WebGLLayer> m_platformLayer;

  • trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp

    r147775 r147888  
    3030
    3131#include "Extensions3D.h"
    32 #if PLATFORM(CHROMIUM)
    33 #include "GraphicsContext3DPrivate.h"
    34 #include <public/Platform.h>
    35 #include <public/WebGraphicsContext3D.h>
    36 #endif
    3732#include <wtf/MainThread.h>
    3833

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp

    r144358 r147888  
    171171    String translatedShaderSource;
    172172    String shaderInfoLog;
    173     int extraCompileOptions = SH_MAP_LONG_VARIABLE_NAMES;
     173    int extraCompileOptions = SH_MAP_LONG_VARIABLE_NAMES | SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
    174174
    175175    if (m_requiresBuiltInFunctionEmulation)
    176176        extraCompileOptions |= SH_EMULATE_BUILT_IN_FUNCTIONS;
    177 
    178 #if !PLATFORM(CHROMIUM)
    179     // Chromium does not use the ANGLE bundled in WebKit source, and thus
    180     // does not yet have the symbol SH_CLAMP_INDIRECT_ARRAY_BOUNDS.
    181     extraCompileOptions |= SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
    182 #endif
    183177
    184178    Vector<ANGLEShaderSymbol> symbols;

  • trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h

    r147622 r147888  
    148148        }
    149149
    150 #if PLATFORM(CHROMIUM)
    151         void setSkBitmap(const SkBitmap& bitmap)
    152         {
    153             m_bitmap = NativeImageSkia::create(bitmap);
    154         }
    155 
    156         const SkBitmap& getSkBitmap() const
    157         {
    158             return m_bitmap->bitmap();
    159         }
    160 
    161         void setMemoryAllocator(SkBitmap::Allocator* allocator)
    162         {
    163             m_allocator = allocator;
    164         }
    165 
    166         SkBitmap::Allocator* allocator() const { return m_allocator; }
    167 #endif
    168 
    169150        // Use fix point multiplier instead of integer division or floating point math.
    170151        // This multipler produces exactly the same result for all values in range 0 - 255.

  • trunk/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp

    r146950 r147888  
    3535#include "LevelDBWriteBatch.h"
    3636#include "Logging.h"
     37#include "NotImplemented.h"
    3738#include <helpers/memenv/memenv.h>
    3839#include <leveldb/comparator.h>
    … …  
    4546#include <wtf/text/WTFString.h>
    4647
    47 #if PLATFORM(CHROMIUM)
    48 #include <env_idb.h>
    49 #include <public/Platform.h>
    50 #endif
    51 
    52 #if !PLATFORM(CHROMIUM)
    5348namespace leveldb {
    5449
    … …  
    5954
    6055}
    61 #endif
    6256
    6357namespace WebCore {
    … …  
    142136    const leveldb::Status s = leveldb::DestroyDB(fileName.utf8().data(), options);
    143137    return s.ok();
    144 }
    145 
    146 static void histogramFreeSpace(const char* type, String fileName)
    147 {
    148 #if PLATFORM(CHROMIUM)
    149     String name = "WebCore.IndexedDB.LevelDB.Open" + String(type) + "FreeDiskSpace";
    150     long long freeDiskSpaceInKBytes = WebKit::Platform::current()->availableDiskSpaceInBytes(fileName) / 1024;
    151     if (freeDiskSpaceInKBytes < 0) {
    152         HistogramSupport::histogramEnumeration("WebCore.IndexedDB.LevelDB.FreeDiskSpaceFailure", 1/*sample*/, 2/*boundary*/);
    153         return;
    154     }
    155     int clampedDiskSpaceKBytes = freeDiskSpaceInKBytes > INT_MAX ? INT_MAX : freeDiskSpaceInKBytes;
    156     const uint64_t histogramMax = static_cast<uint64_t>(1e9);
    157     COMPILE_ASSERT(histogramMax <= INT_MAX, histogramMaxTooBig);
    158     HistogramSupport::histogramCustomCounts(name.utf8().data(), clampedDiskSpaceKBytes, 1, histogramMax, 11/*buckets*/);
    159 #endif
    160138}
    161139
    … …  
    189167    if (!s.ok()) {
    190168        histogramLevelDBError("WebCore.IndexedDB.LevelDBOpenErrors", s);
    191         histogramFreeSpace("Failure", fileName);
    192169
    193170        LOG_ERROR("Failed to open LevelDB database from %s: %s", fileName.ascii().data(), s.ToString().c_str());
    194171        return nullptr;
    195172    }
    196 
    197     histogramFreeSpace("Success", fileName);
    198173
    199174    OwnPtr<LevelDBDatabase> result = adoptPtr(new LevelDBDatabase);

  • trunk/Source/WebCore/platform/network/BlobRegistry.cpp

    r144354 r147888  
    3636namespace WebCore {
    3737
    38 #if !PLATFORM(CHROMIUM)
    3938BlobRegistry& blobRegistry()
    4039{
    … …  
    4847    return instance;
    4948}
    50 #endif
    5149
    5250BlobRegistry::~BlobRegistry()

  • trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp

    r144671 r147888  
    5050}
    5151
    52 #if !PLATFORM(CHROMIUM)
    5352static PassRefPtr<ResourceHandle> createResourceHandle(const ResourceRequest& request, ResourceHandleClient* client)
    5453{
    … …  
    7170    }
    7271}
    73 
    74 #else
    75 
    76 static void registerBlobResourceHandleConstructor()
    77 {
    78 }
    79 #endif
    8072
    8173PassRefPtr<ResourceHandle> BlobRegistryImpl::createResourceHandle(const ResourceRequest& request, ResourceHandleClient* client)

  • trunk/Source/WebCore/platform/network/NetworkStateNotifier.cpp

    r127258 r147888  
    4747}
    4848
    49 #if PLATFORM(CHROMIUM)
    50 void NetworkStateNotifier::setOnLine(bool onLine)
    51 {
    52     if (m_isOnLine == onLine)
    53         return;
    54 
    55     m_isOnLine = onLine;
    56 
    57     if (m_networkStateChangedFunction)
    58         m_networkStateChangedFunction();
    5949}
    60 #endif // PLATFORM(CHROMIUM) || PLATFORM(EFL)
    61 
    62 }

  • trunk/Source/WebCore/platform/network/NetworkStateNotifier.h

    r145741 r147888  
    7272#if (PLATFORM(QT) && !defined(QT_NO_BEARERMANAGEMENT))
    7373    void setNetworkAccessAllowed(bool);
    74 #elif PLATFORM(CHROMIUM)
    75     void setOnLine(bool);
    7674#endif
    7775

  • trunk/Source/WebCore/platform/network/NetworkingContext.h

    r146536 r147888  
    2727#if PLATFORM(MAC)
    2828#include <wtf/SchedulePair.h>
    29 #endif
    30 
    31 #if PLATFORM(CHROMIUM)
    32 namespace WebKit {
    33 class WebCookieJar;
    34 }
    3529#endif
    3630
    … …  
    6761
    6862    virtual bool shouldClearReferrerOnHTTPSToHTTPRedirect() const = 0;
    69 
    70 #if PLATFORM(CHROMIUM)
    71     // FIXME: Wrap WebCookieJar into a NetworkStorageSession to make the code cross-platform.
    72     virtual WebKit::WebCookieJar* cookieJar() const = 0;
    73 #endif
    7463
    7564#if PLATFORM(MAC)

  • trunk/Source/WebCore/platform/network/ResourceHandleClient.h

    r147839 r147888  
    117117        virtual bool shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef) { return true; }
    118118#endif
    119 #if PLATFORM(CHROMIUM)
    120         virtual void didDownloadData(ResourceHandle*, int /*dataLength*/) { }
    121 #endif
    122119
    123120#if USE(SOUP)

  • trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

    r144216 r147888  
    527527}
    528528
    529 #if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(QT) && !PLATFORM(BLACKBERRY)
     529#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(QT) && !PLATFORM(BLACKBERRY)
    530530unsigned initializeMaximumHTTPConnectionCountPerHost()
    531531{

  • trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp

    r132916 r147888  
    2727#include "Hyphenation.h"
    2828
    29 #if (!PLATFORM(MAC) && !PLATFORM(CHROMIUM)) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
     29#if !PLATFORM(MAC) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
    3030
    3131#include "AtomicStringKeyedMRUCache.h"
    … …  
    7777} // namespace WebCore
    7878
    79 #endif // (!PLATFORM(MAC) && !PLATFORM(CHROMIUM)) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
     79#endif // !PLATFORM(MAC) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070

  • trunk/Source/WebCore/plugins/PluginViewNone.cpp

    r147795 r147888  
    133133// added, please make sure they have the proper platform #ifs so that changes
    134134// do not break ports who compile both this file and PluginView.cpp.   
    135 #if PLATFORM(MAC) || PLATFORM(CHROMIUM) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE))
     135#if PLATFORM(MAC) || PLATFORM(EFL) || (OS(WINCE) && !PLATFORM(QT)) || (PLATFORM(QT) && !OS(WINCE))
    136136#if ENABLE(NETSCAPE_PLUGIN_API)
    137137void PluginView::keepAlive(NPP)

  • trunk/Source/WebCore/testing/Internals.cpp

    r147857 r147888  
    125125#if ENABLE(MOUSE_CURSOR_SCALE)
    126126#include <wtf/dtoa.h>
    127 #endif
    128 
    129 #if PLATFORM(CHROMIUM)
    130 #include "FilterOperation.h"
    131 #include "FilterOperations.h"
    132 #include "GraphicsLayer.h"
    133 #include "GraphicsLayerChromium.h"
    134 #include "RenderLayerBacking.h"
    135127#endif
    136128

  • trunk/Source/WebCore/xml/XMLHttpRequest.cpp

    r147795 r147888  
    766766    ResourceRequest request(m_url);
    767767    request.setHTTPMethod(m_method);
    768 #if PLATFORM(CHROMIUM) || PLATFORM(BLACKBERRY)
     768#if PLATFORM(BLACKBERRY)
    769769    request.setTargetType(ResourceRequest::TargetIsXHR);
    770770#endif
Note: See TracChangeset for help on using the changeset viewer.