Diff
Modified: trunk/Source/Platform/ChangeLog (116665 => 116666)
--- trunk/Source/Platform/ChangeLog 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/Platform/ChangeLog 2012-05-10 18:25:52 UTC (rev 116666)
@@ -1,3 +1,18 @@
+2012-05-10 Mark Pilgrim <pilg...@chromium.org>
+
+ [Chromium] Remove dead code behind unused WEBKIT_USING_CG
+ https://bugs.webkit.org/show_bug.cgi?id=86018
+
+ Reviewed by Adam Barth.
+
+ We never use CoreGraphics as the backend for GraphicsContext in
+ Chromium, so this is all dead code.
+
+ * chromium/public/WebCanvas.h:
+ (WebKit):
+ * chromium/public/WebImage.h:
+ (WebImage):
+
2012-05-09 Mark Pilgrim <pilg...@chromium.org>
[Chromium] Move clipboard to Platform.h
Modified: trunk/Source/Platform/chromium/public/WebCanvas.h (116665 => 116666)
--- trunk/Source/Platform/chromium/public/WebCanvas.h 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/Platform/chromium/public/WebCanvas.h 2012-05-10 18:25:52 UTC (rev 116666)
@@ -35,16 +35,12 @@
#if WEBKIT_USING_SKIA
class SkCanvas;
-#elif WEBKIT_USING_CG
-struct CGContext;
#endif
namespace WebKit {
#if WEBKIT_USING_SKIA
typedef SkCanvas WebCanvas;
-#elif WEBKIT_USING_CG
-typedef struct CGContext WebCanvas;
#else
#error "Need to define WebCanvas"
#endif
Modified: trunk/Source/Platform/chromium/public/WebImage.h (116665 => 116666)
--- trunk/Source/Platform/chromium/public/WebImage.h 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/Platform/chromium/public/WebImage.h 2012-05-10 18:25:52 UTC (rev 116666)
@@ -35,8 +35,6 @@
#if WEBKIT_USING_SKIA
#include <SkBitmap.h>
-#elif WEBKIT_USING_CG
-typedef struct CGImage* CGImageRef;
#endif
#if WEBKIT_IMPLEMENTATION
@@ -99,25 +97,6 @@
void init() { }
SkBitmap m_bitmap;
-#elif WEBKIT_USING_CG
- WebImage(CGImageRef imageRef)
- {
- init();
- assign(imageRef);
- }
-
- WebImage& operator=(CGImageRef imageRef)
- {
- assign(imageRef);
- return *this;
- }
-
- CGImageRef getCGImageRef() const { return m_imageRef; }
-
-private:
- void init() { m_imageRef = 0; }
- WEBKIT_EXPORT void assign(CGImageRef);
- CGImageRef m_imageRef;
#endif
};
Modified: trunk/Source/WebKit/chromium/ChangeLog (116665 => 116666)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-10 18:25:52 UTC (rev 116666)
@@ -1,3 +1,27 @@
+2012-05-10 Mark Pilgrim <pilg...@chromium.org>
+
+ [Chromium] Remove dead code behind unused WEBKIT_USING_CG
+ https://bugs.webkit.org/show_bug.cgi?id=86018
+
+ Reviewed by Adam Barth.
+
+ We never use CoreGraphics as the backend for GraphicsContext in
+ Chromium, so this is all dead code.
+
+ * README:
+ * src/PageOverlay.cpp:
+ * src/WebContentLayerImpl.cpp:
+ (WebKit::WebContentLayerImpl::paintContents):
+ * src/WebFontImpl.cpp:
+ (WebKit::WebFontImpl::drawText):
+ * src/WebImageDecoder.cpp:
+ (WebKit::WebImageDecoder::getFrameAtIndex):
+ * src/WebPluginContainerImpl.cpp:
+ (WebKit::WebPluginContainerImpl::paint):
+ (WebKit::WebPluginContainerImpl::printPage):
+ * src/painting/GraphicsContextBuilder.h:
+ (WebKit):
+
2012-05-10 Sam D <dsam2...@gmail.com>
Web Inspector: rename InspectorBackendStub.js to InspectorBackendCommands.js
Modified: trunk/Source/WebKit/chromium/README (116665 => 116666)
--- trunk/Source/WebKit/chromium/README 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/WebKit/chromium/README 2012-05-10 18:25:52 UTC (rev 116666)
@@ -37,8 +37,6 @@
WEBKIT_USING_SKIA is defined when using Skia as the graphics library.
- WEBKIT_USING_CG is defined when using CG as the graphics library.
-
WEBKIT_USING_V8 is defined when using V8 as the _javascript_ library.
WEBKIT_USING_JSC is defined when using JSC as the _javascript_ library.
Modified: trunk/Source/WebKit/chromium/src/PageOverlay.cpp (116665 => 116666)
--- trunk/Source/WebKit/chromium/src/PageOverlay.cpp 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/WebKit/chromium/src/PageOverlay.cpp 2012-05-10 18:25:52 UTC (rev 116666)
@@ -48,8 +48,6 @@
{
#if WEBKIT_USING_SKIA
return gc->platformContext()->canvas();
-#elif WEBKIT_USING_CG
- return gc->platformContext();
#endif
}
Modified: trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp (116665 => 116666)
--- trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp 2012-05-10 18:25:52 UTC (rev 116666)
@@ -66,8 +66,6 @@
return;
#if WEBKIT_USING_SKIA
WebCanvas* canvas = gc.platformContext()->canvas();
-#elif WEBKIT_USING_CG
- WebCanvas* canvas = gc.platformContext();
#endif
m_contentClient->paintContents(canvas, WebRect(clip));
}
Modified: trunk/Source/WebKit/chromium/src/WebFontImpl.cpp (116665 => 116666)
--- trunk/Source/WebKit/chromium/src/WebFontImpl.cpp 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/WebKit/chromium/src/WebFontImpl.cpp 2012-05-10 18:25:52 UTC (rev 116666)
@@ -101,9 +101,6 @@
#if WEBKIT_USING_SKIA
gc.platformContext()->setDrawingToImageBuffer(!canvasIsOpaque);
-#elif WEBKIT_USING_CG
- // FIXME hook canvasIsOpaque up to the platform-specific indicators for
- // whether subpixel AA can be used for this draw.
#endif
gc.save();
Modified: trunk/Source/WebKit/chromium/src/WebImageDecoder.cpp (116665 => 116666)
--- trunk/Source/WebKit/chromium/src/WebImageDecoder.cpp 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/WebKit/chromium/src/WebImageDecoder.cpp 2012-05-10 18:25:52 UTC (rev 116666)
@@ -115,9 +115,6 @@
#if WEBKIT_USING_SKIA
OwnPtr<NativeImageSkia> image = adoptPtr(frameBuffer->asNewNativeImage());
return WebImage(image->bitmap());
-#elif WEBKIT_USING_CG
- // FIXME: Implement CG side of this.
- return WebImage(frameBuffer->asNewNativeImage());
#endif
}
Modified: trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (116665 => 116666)
--- trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-05-10 18:25:52 UTC (rev 116666)
@@ -128,8 +128,6 @@
#if WEBKIT_USING_SKIA
WebCanvas* canvas = gc->platformContext()->canvas();
-#elif WEBKIT_USING_CG
- WebCanvas* canvas = gc->platformContext();
#endif
IntRect windowRect =
@@ -261,8 +259,6 @@
gc->save();
#if WEBKIT_USING_SKIA
WebCanvas* canvas = gc->platformContext()->canvas();
-#elif WEBKIT_USING_CG
- WebCanvas* canvas = gc->platformContext();
#endif
bool ret = m_webPlugin->printPage(pageNumber, canvas);
gc->restore();
Modified: trunk/Source/WebKit/chromium/src/painting/GraphicsContextBuilder.h (116665 => 116666)
--- trunk/Source/WebKit/chromium/src/painting/GraphicsContextBuilder.h 2012-05-10 18:23:06 UTC (rev 116665)
+++ trunk/Source/WebKit/chromium/src/painting/GraphicsContextBuilder.h 2012-05-10 18:25:52 UTC (rev 116666)
@@ -33,36 +33,17 @@
#include "GraphicsContext.h"
-#if WEBKIT_USING_CG
-#include "LocalCurrentGraphicsContext.h"
-#elif WEBKIT_USING_SKIA
+#if WEBKIT_USING_SKIA
#include "PlatformContextSkia.h"
#endif
namespace WebKit {
-#if WEBKIT_USING_CG
+#if WEBKIT_USING_SKIA
class GraphicsContextBuilder {
public:
GraphicsContextBuilder(WebCanvas* canvas)
- : m_graphicsContext(canvas)
- , m_localContext(&m_graphicsContext)
- {
- }
-
- WebCore::GraphicsContext& context() { return m_graphicsContext; }
-
-private:
- WebCore::GraphicsContext m_graphicsContext;
- WebCore::LocalCurrentGraphicsContext m_localContext;
-};
-
-#elif WEBKIT_USING_SKIA
-
-class GraphicsContextBuilder {
-public:
- GraphicsContextBuilder(WebCanvas* canvas)
: m_platformContext(canvas)
, m_graphicsContext(&m_platformContext)
{
