Title: [147775] trunk/Source/WebCore
- Revision
- 147775
- Author
- [email protected]
- Date
- 2013-04-05 12:24:05 -0700 (Fri, 05 Apr 2013)
Log 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.
Modified Paths
Removed Paths
- trunk/Source/WebCore/platform/audio/chromium/
- trunk/Source/WebCore/platform/graphics/chromium/
- trunk/Source/WebCore/platform/mediastream/chromium/
- trunk/Source/WebCore/platform/network/chromium/
- trunk/Source/WebCore/platform/sql/chromium/
- trunk/Source/WebCore/platform/text/chromium/
Diff
Modified: trunk/Source/WebCore/ChangeLog (147774 => 147775)
--- trunk/Source/WebCore/ChangeLog 2013-04-05 19:17:36 UTC (rev 147774)
+++ trunk/Source/WebCore/ChangeLog 2013-04-05 19:24:05 UTC (rev 147775)
@@ -1,5 +1,120 @@
2013-04-05 Ryosuke Niwa <[email protected]>
+ 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.
+
+2013-04-05 Ryosuke Niwa <[email protected]>
+
Remove Chromium code from WebCore/workers
https://bugs.webkit.org/show_bug.cgi?id=114050
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (147774 => 147775)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2013-04-05 19:17:36 UTC (rev 147774)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2013-04-05 19:24:05 UTC (rev 147775)
@@ -23,8 +23,8 @@
*/
// FIXME: This is temporary until all ports switch to using this file.
-#if (PLATFORM(CHROMIUM) && !OS(DARWIN)) || PLATFORM(BLACKBERRY)
-#include "chromium/FontPlatformData.h"
+#if PLATFORM(BLACKBERRY)
+#include "harfbuzz/FontPlatformDataHarfBuzz.h"
#elif PLATFORM(QT)
#include "qt/FontPlatformData.h"
#elif PLATFORM(WIN) && OS(WINCE)
Modified: trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp (147774 => 147775)
--- trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp 2013-04-05 19:17:36 UTC (rev 147774)
+++ trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp 2013-04-05 19:24:05 UTC (rev 147775)
@@ -43,9 +43,7 @@
// Global resource ceiling (expressed in terms of pixels) for DrawingBuffer creation and resize.
// When this limit is set, DrawingBuffer::create() and DrawingBuffer::reset() calls that would
// exceed the global cap will instead clear the buffer.
-#if PLATFORM(CHROMIUM) // Currently, this cap only exists for chromium.
-static int s_maximumResourceUsePixels = 16 * 1024 * 1024;
-#elif !PLATFORM(BLACKBERRY)
+#if !PLATFORM(BLACKBERRY)
static int s_maximumResourceUsePixels = 0;
#endif
static int s_currentResourceUsePixels = 0;
Modified: trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp (147774 => 147775)
--- trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp 2013-04-05 19:17:36 UTC (rev 147774)
+++ trunk/Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp 2013-04-05 19:24:05 UTC (rev 147775)
@@ -45,38 +45,18 @@
{
bool wasCreated = false;
-#if PLATFORM(CHROMIUM)
- WebKit::WebGraphicsContext3D* webContext = WebKit::Platform::current()->sharedOffscreenGraphicsContext3D();
- GrContext* grContext = WebKit::Platform::current()->sharedOffscreenGrContext();
+ // If we lost the context, or can't make it current, create a new one.
+ if (m_context && (!m_context->makeContextCurrent() || (m_context->getExtensions()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR)))
+ m_context.clear();
- if (webContext && grContext) {
- WebKit::WebGraphicsContext3D* oldWebContext = m_context ? GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_context.get()) : 0;
- GrContext* oldGrContext = m_context ? m_context->grContext() : 0;
- if (webContext != oldWebContext || grContext != oldGrContext)
- m_context.clear();
-
- if (!m_context) {
- m_context = GraphicsContext3DPrivate::createGraphicsContextFromExternalWebContextAndGrContext(webContext, grContext);
- wasCreated = true;
- }
-
- // FIXME: Don't fallback to the legacy path when chromium supports the new offscreen methods.
- } else
-#endif
- {
- // If we lost the context, or can't make it current, create a new one.
- if (m_context && (!m_context->makeContextCurrent() || (m_context->getExtensions()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR)))
- m_context.clear();
-
- if (!m_context) {
- createContext();
- wasCreated = true;
- }
-
- if (m_context && !m_context->makeContextCurrent())
- m_context.clear();
+ if (!m_context) {
+ createContext();
+ wasCreated = true;
}
+ if (m_context && !m_context->makeContextCurrent())
+ m_context.clear();
+
if (m_context && wasCreated)
m_context->getExtensions()->pushGroupMarkerEXT("SharedGraphicsContext");
return m_context;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
