Changeset 147775 in webkit


Ignore:
Timestamp:
Apr 5, 2013 12:24:05 PM (11 years ago)
Author:
rniwa@webkit.org
Message:

Remove Chromium code from WebCore/platform
​https://bugs.webkit.org/show_bug.cgi?id=114014

Reviewed by Anders Carlsson.

Removed.

  • platform/audio/chromium: Removed.
  • platform/audio/chromium/AudioBusChromium.cpp: Removed.
  • platform/audio/chromium/AudioDestinationChromium.cpp: Removed.
  • platform/audio/chromium/AudioDestinationChromium.h: Removed.
  • platform/audio/chromium/FFTFrameOpenMAXDLAndroid.cpp: Removed.
  • platform/graphics/FontPlatformData.h:
  • platform/graphics/chromium: Removed.
  • platform/graphics/chromium/AnimationTranslationUtil.cpp: Removed.
  • platform/graphics/chromium/AnimationTranslationUtil.h: Removed.
  • platform/graphics/chromium/Canvas2DLayerBridge.cpp: Removed.
  • platform/graphics/chromium/Canvas2DLayerBridge.h: Removed.
  • platform/graphics/chromium/Canvas2DLayerManager.cpp: Removed.
  • platform/graphics/chromium/Canvas2DLayerManager.h: Removed.
  • platform/graphics/chromium/CrossProcessFontLoading.h: Removed.
  • platform/graphics/chromium/CrossProcessFontLoading.mm: Removed.
  • platform/graphics/chromium/DeferredImageDecoder.cpp: Removed.
  • platform/graphics/chromium/DeferredImageDecoder.h: Removed.
  • platform/graphics/chromium/DiscardablePixelRef.cpp: Removed.
  • platform/graphics/chromium/DiscardablePixelRef.h: Removed.
  • platform/graphics/chromium/DrawingBufferChromium.cpp: Removed.
  • platform/graphics/chromium/Extensions3DChromium.h: Removed.
  • platform/graphics/chromium/FontCacheAndroid.cpp: Removed.
  • platform/graphics/chromium/FontCacheChromiumLinux.cpp: Removed.
  • platform/graphics/chromium/FontCacheChromiumWin.cpp: Removed.
  • platform/graphics/chromium/FontChromiumWin.cpp: Removed.
  • platform/graphics/chromium/FontPlatformData.h: Removed.
  • platform/graphics/chromium/FontPlatformDataChromiumWin.cpp: Removed.
  • platform/graphics/chromium/FontPlatformDataChromiumWin.h: Removed.
  • platform/graphics/chromium/FontRenderStyle.h: Removed.
  • platform/graphics/chromium/FontUtilsChromiumWin.cpp: Removed.
  • platform/graphics/chromium/FontUtilsChromiumWin.h: Removed.
  • platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp: Removed.
  • platform/graphics/chromium/GraphicsLayerChromium.cpp: Removed.
  • platform/graphics/chromium/GraphicsLayerChromium.h: Removed.
  • platform/graphics/chromium/IconChromium.cpp: Removed.
  • platform/graphics/chromium/IconChromiumAndroid.cpp: Removed.
  • platform/graphics/chromium/ImageBufferDataSkia.h: Removed.
  • platform/graphics/chromium/ImageChromium.cpp: Removed.
  • platform/graphics/chromium/ImageDecodingStore.cpp: Removed.
  • platform/graphics/chromium/ImageDecodingStore.h: Removed.
  • platform/graphics/chromium/ImageFrameGenerator.cpp: Removed.
  • platform/graphics/chromium/ImageFrameGenerator.h: Removed.
  • platform/graphics/chromium/LayerPainterChromium.h: Removed.
  • platform/graphics/chromium/LazyDecodingPixelRef.cpp: Removed.
  • platform/graphics/chromium/LazyDecodingPixelRef.h: Removed.
  • platform/graphics/chromium/MediaPlayerPrivateChromium.cpp: Removed.
  • platform/graphics/chromium/MediaPlayerPrivateChromium.h: Removed.
  • platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp: Removed.
  • platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.h: Removed.
  • platform/graphics/chromium/PlatformIcon.h: Removed.
  • platform/graphics/chromium/ScaledImageFragment.cpp: Removed.
  • platform/graphics/chromium/ScaledImageFragment.h: Removed.
  • platform/graphics/chromium/SimpleFontDataChromiumWin.cpp: Removed.
  • platform/graphics/chromium/SkSizeHash.h: Removed.
  • platform/graphics/chromium/TextureUploader.h: Removed.
  • platform/graphics/chromium/ThreadSafeDataTransport.cpp: Removed.
  • platform/graphics/chromium/ThreadSafeDataTransport.h: Removed.
  • platform/graphics/chromium/TransformSkMatrix44Conversions.cpp: Removed.
  • platform/graphics/chromium/TransformSkMatrix44Conversions.h: Removed.
  • platform/graphics/chromium/TransparencyWin.cpp: Removed.
  • platform/graphics/chromium/TransparencyWin.h: Removed.
  • platform/graphics/chromium/UniscribeHelper.cpp: Removed.
  • platform/graphics/chromium/UniscribeHelper.h: Removed.
  • platform/graphics/chromium/UniscribeHelperTextRun.cpp: Removed.
  • platform/graphics/chromium/UniscribeHelperTextRun.h: Removed.
  • platform/graphics/chromium/VDMXParser.cpp: Removed.
  • platform/graphics/chromium/VDMXParser.h: Removed.
  • platform/graphics/gpu/DrawingBuffer.cpp:

(WebCore):

  • platform/graphics/gpu/SharedGraphicsContext3D.cpp:

(WebCore::SharedGraphicsContext3DImpl::getOrCreateContext):

  • platform/mediastream/chromium: Removed.
  • platform/mediastream/chromium/MediaStreamCenterChromium.cpp: Removed.
  • platform/mediastream/chromium/MediaStreamCenterChromium.h: Removed.
  • platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.cpp: Removed.
  • platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.h: Removed.
  • platform/mediastream/chromium/RTCDataChannelHandlerChromium.cpp: Removed.
  • platform/mediastream/chromium/RTCDataChannelHandlerChromium.h: Removed.
  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp: Removed.
  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h: Removed.
  • platform/network/chromium: Removed.
  • platform/network/chromium/AuthenticationChallenge.h: Removed.
  • platform/network/chromium/AuthenticationChallengeChromium.cpp: Removed.
  • platform/network/chromium/BlobRegistryProxy.cpp: Removed.
  • platform/network/chromium/BlobRegistryProxy.h: Removed.
  • platform/network/chromium/CookieJarChromium.cpp: Removed.
  • platform/network/chromium/DNSChromium.cpp: Removed.
  • platform/network/chromium/ResourceError.h: Removed.
  • platform/network/chromium/ResourceHandle.cpp: Removed.
  • platform/network/chromium/ResourceHandleInternal.h: Removed.
  • platform/network/chromium/ResourceRequest.cpp: Removed.
  • platform/network/chromium/ResourceRequest.h: Removed.
  • platform/network/chromium/ResourceResponse.cpp: Removed.
  • platform/network/chromium/ResourceResponse.h: Removed.
  • platform/network/chromium/SocketStreamError.h: Removed.
  • platform/network/chromium/SocketStreamHandle.cpp: Removed.
  • platform/network/chromium/SocketStreamHandle.h: Removed.
  • platform/network/chromium/SocketStreamHandleInternal.h: Removed.
  • platform/sql/chromium: Removed.
  • platform/sql/chromium/SQLiteFileSystemChromium.cpp: Removed.
  • platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp: Removed.
  • platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp: Removed.
  • platform/text/chromium: Removed.
  • platform/text/chromium/Hyphenation.cpp: Removed.
  • platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp: Removed.
Location:
trunk/Source/WebCore
Files:
6 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r147772 r147775  
     12013-04-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Remove Chromium code from WebCore/platform
     4        https://bugs.webkit.org/show_bug.cgi?id=114014
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Removed.
     9
     10        * platform/audio/chromium: Removed.
     11        * platform/audio/chromium/AudioBusChromium.cpp: Removed.
     12        * platform/audio/chromium/AudioDestinationChromium.cpp: Removed.
     13        * platform/audio/chromium/AudioDestinationChromium.h: Removed.
     14        * platform/audio/chromium/FFTFrameOpenMAXDLAndroid.cpp: Removed.
     15        * platform/graphics/FontPlatformData.h:
     16        * platform/graphics/chromium: Removed.
     17        * platform/graphics/chromium/AnimationTranslationUtil.cpp: Removed.
     18        * platform/graphics/chromium/AnimationTranslationUtil.h: Removed.
     19        * platform/graphics/chromium/Canvas2DLayerBridge.cpp: Removed.
     20        * platform/graphics/chromium/Canvas2DLayerBridge.h: Removed.
     21        * platform/graphics/chromium/Canvas2DLayerManager.cpp: Removed.
     22        * platform/graphics/chromium/Canvas2DLayerManager.h: Removed.
     23        * platform/graphics/chromium/CrossProcessFontLoading.h: Removed.
     24        * platform/graphics/chromium/CrossProcessFontLoading.mm: Removed.
     25        * platform/graphics/chromium/DeferredImageDecoder.cpp: Removed.
     26        * platform/graphics/chromium/DeferredImageDecoder.h: Removed.
     27        * platform/graphics/chromium/DiscardablePixelRef.cpp: Removed.
     28        * platform/graphics/chromium/DiscardablePixelRef.h: Removed.
     29        * platform/graphics/chromium/DrawingBufferChromium.cpp: Removed.
     30        * platform/graphics/chromium/Extensions3DChromium.h: Removed.
     31        * platform/graphics/chromium/FontCacheAndroid.cpp: Removed.
     32        * platform/graphics/chromium/FontCacheChromiumLinux.cpp: Removed.
     33        * platform/graphics/chromium/FontCacheChromiumWin.cpp: Removed.
     34        * platform/graphics/chromium/FontChromiumWin.cpp: Removed.
     35        * platform/graphics/chromium/FontPlatformData.h: Removed.
     36        * platform/graphics/chromium/FontPlatformDataChromiumWin.cpp: Removed.
     37        * platform/graphics/chromium/FontPlatformDataChromiumWin.h: Removed.
     38        * platform/graphics/chromium/FontRenderStyle.h: Removed.
     39        * platform/graphics/chromium/FontUtilsChromiumWin.cpp: Removed.
     40        * platform/graphics/chromium/FontUtilsChromiumWin.h: Removed.
     41        * platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp: Removed.
     42        * platform/graphics/chromium/GraphicsLayerChromium.cpp: Removed.
     43        * platform/graphics/chromium/GraphicsLayerChromium.h: Removed.
     44        * platform/graphics/chromium/IconChromium.cpp: Removed.
     45        * platform/graphics/chromium/IconChromiumAndroid.cpp: Removed.
     46        * platform/graphics/chromium/ImageBufferDataSkia.h: Removed.
     47        * platform/graphics/chromium/ImageChromium.cpp: Removed.
     48        * platform/graphics/chromium/ImageDecodingStore.cpp: Removed.
     49        * platform/graphics/chromium/ImageDecodingStore.h: Removed.
     50        * platform/graphics/chromium/ImageFrameGenerator.cpp: Removed.
     51        * platform/graphics/chromium/ImageFrameGenerator.h: Removed.
     52        * platform/graphics/chromium/LayerPainterChromium.h: Removed.
     53        * platform/graphics/chromium/LazyDecodingPixelRef.cpp: Removed.
     54        * platform/graphics/chromium/LazyDecodingPixelRef.h: Removed.
     55        * platform/graphics/chromium/MediaPlayerPrivateChromium.cpp: Removed.
     56        * platform/graphics/chromium/MediaPlayerPrivateChromium.h: Removed.
     57        * platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp: Removed.
     58        * platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.h: Removed.
     59        * platform/graphics/chromium/PlatformIcon.h: Removed.
     60        * platform/graphics/chromium/ScaledImageFragment.cpp: Removed.
     61        * platform/graphics/chromium/ScaledImageFragment.h: Removed.
     62        * platform/graphics/chromium/SimpleFontDataChromiumWin.cpp: Removed.
     63        * platform/graphics/chromium/SkSizeHash.h: Removed.
     64        * platform/graphics/chromium/TextureUploader.h: Removed.
     65        * platform/graphics/chromium/ThreadSafeDataTransport.cpp: Removed.
     66        * platform/graphics/chromium/ThreadSafeDataTransport.h: Removed.
     67        * platform/graphics/chromium/TransformSkMatrix44Conversions.cpp: Removed.
     68        * platform/graphics/chromium/TransformSkMatrix44Conversions.h: Removed.
     69        * platform/graphics/chromium/TransparencyWin.cpp: Removed.
     70        * platform/graphics/chromium/TransparencyWin.h: Removed.
     71        * platform/graphics/chromium/UniscribeHelper.cpp: Removed.
     72        * platform/graphics/chromium/UniscribeHelper.h: Removed.
     73        * platform/graphics/chromium/UniscribeHelperTextRun.cpp: Removed.
     74        * platform/graphics/chromium/UniscribeHelperTextRun.h: Removed.
     75        * platform/graphics/chromium/VDMXParser.cpp: Removed.
     76        * platform/graphics/chromium/VDMXParser.h: Removed.
     77        * platform/graphics/gpu/DrawingBuffer.cpp:
     78        (WebCore):
     79        * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
     80        (WebCore::SharedGraphicsContext3DImpl::getOrCreateContext):
     81        * platform/mediastream/chromium: Removed.
     82        * platform/mediastream/chromium/MediaStreamCenterChromium.cpp: Removed.
     83        * platform/mediastream/chromium/MediaStreamCenterChromium.h: Removed.
     84        * platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.cpp: Removed.
     85        * platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.h: Removed.
     86        * platform/mediastream/chromium/RTCDataChannelHandlerChromium.cpp: Removed.
     87        * platform/mediastream/chromium/RTCDataChannelHandlerChromium.h: Removed.
     88        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp: Removed.
     89        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h: Removed.
     90        * platform/network/chromium: Removed.
     91        * platform/network/chromium/AuthenticationChallenge.h: Removed.
     92        * platform/network/chromium/AuthenticationChallengeChromium.cpp: Removed.
     93        * platform/network/chromium/BlobRegistryProxy.cpp: Removed.
     94        * platform/network/chromium/BlobRegistryProxy.h: Removed.
     95        * platform/network/chromium/CookieJarChromium.cpp: Removed.
     96        * platform/network/chromium/DNSChromium.cpp: Removed.
     97        * platform/network/chromium/ResourceError.h: Removed.
     98        * platform/network/chromium/ResourceHandle.cpp: Removed.
     99        * platform/network/chromium/ResourceHandleInternal.h: Removed.
     100        * platform/network/chromium/ResourceRequest.cpp: Removed.
     101        * platform/network/chromium/ResourceRequest.h: Removed.
     102        * platform/network/chromium/ResourceResponse.cpp: Removed.
     103        * platform/network/chromium/ResourceResponse.h: Removed.
     104        * platform/network/chromium/SocketStreamError.h: Removed.
     105        * platform/network/chromium/SocketStreamHandle.cpp: Removed.
     106        * platform/network/chromium/SocketStreamHandle.h: Removed.
     107        * platform/network/chromium/SocketStreamHandleInternal.h: Removed.
     108        * platform/sql/chromium: Removed.
     109        * platform/sql/chromium/SQLiteFileSystemChromium.cpp: Removed.
     110        * platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp: Removed.
     111        * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp: Removed.
     112        * platform/text/chromium: Removed.
     113        * platform/text/chromium/Hyphenation.cpp: Removed.
     114        * platform/text/chromium/TextBreakIteratorInternalICUChromium.cpp: Removed.
     115
    11162013-04-05  Ryosuke Niwa  <rniwa@webkit.org>
    2117

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

    r147684 r147775  
    2424
    2525// FIXME: This is temporary until all ports switch to using this file.
    26 #if (PLATFORM(CHROMIUM) && !OS(DARWIN)) || PLATFORM(BLACKBERRY)
    27 #include "chromium/FontPlatformData.h"
     26#if PLATFORM(BLACKBERRY)
     27#include "harfbuzz/FontPlatformDataHarfBuzz.h"
    2828#elif PLATFORM(QT)
    2929#include "qt/FontPlatformData.h"

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

    r145856 r147775  
    4444// When this limit is set, DrawingBuffer::create() and DrawingBuffer::reset() calls that would
    4545// exceed the global cap will instead clear the buffer.
    46 #if PLATFORM(CHROMIUM) // Currently, this cap only exists for chromium.
    47 static int s_maximumResourceUsePixels = 16 * 1024 * 1024;
    48 #elif !PLATFORM(BLACKBERRY)
     46#if !PLATFORM(BLACKBERRY)
    4947static int s_maximumResourceUsePixels = 0;
    5048#endif

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

    r144072 r147775  
    4646        bool wasCreated = false;
    4747
    48 #if PLATFORM(CHROMIUM)
    49         WebKit::WebGraphicsContext3D* webContext = WebKit::Platform::current()->sharedOffscreenGraphicsContext3D();
    50         GrContext* grContext = WebKit::Platform::current()->sharedOffscreenGrContext();
     48        // If we lost the context, or can't make it current, create a new one.
     49        if (m_context && (!m_context->makeContextCurrent() || (m_context->getExtensions()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR)))
     50            m_context.clear();
    5151
    52         if (webContext && grContext) {
    53             WebKit::WebGraphicsContext3D* oldWebContext = m_context ? GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_context.get()) : 0;
    54             GrContext* oldGrContext = m_context ? m_context->grContext() : 0;
    55             if (webContext != oldWebContext || grContext != oldGrContext)
    56                 m_context.clear();
     52        if (!m_context) {
     53            createContext();
     54            wasCreated = true;
     55        }
    5756
    58             if (!m_context) {
    59                 m_context = GraphicsContext3DPrivate::createGraphicsContextFromExternalWebContextAndGrContext(webContext, grContext);
    60                 wasCreated = true;
    61             }
    62 
    63             // FIXME: Don't fallback to the legacy path when chromium supports the new offscreen methods.
    64         } else
    65 #endif
    66         {
    67             // If we lost the context, or can't make it current, create a new one.
    68             if (m_context && (!m_context->makeContextCurrent() || (m_context->getExtensions()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR)))
    69                 m_context.clear();
    70 
    71             if (!m_context) {
    72                 createContext();
    73                 wasCreated = true;
    74             }
    75 
    76             if (m_context && !m_context->makeContextCurrent())
    77                 m_context.clear();
    78         }
     57        if (m_context && !m_context->makeContextCurrent())
     58            m_context.clear();
    7959
    8060        if (m_context && wasCreated)
Note: See TracChangeset for help on using the changeset viewer.