Changeset 116666 in webkit
- Timestamp:
- May 10, 2012 11:25:52 AM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/Platform/ChangeLog
r116566 r116666 1 2012-05-10 Mark Pilgrim <pilgrim@chromium.org> 2 3 [Chromium] Remove dead code behind unused WEBKIT_USING_CG 4 https://bugs.webkit.org/show_bug.cgi?id=86018 5 6 Reviewed by Adam Barth. 7 8 We never use CoreGraphics as the backend for GraphicsContext in 9 Chromium, so this is all dead code. 10 11 * chromium/public/WebCanvas.h: 12 (WebKit): 13 * chromium/public/WebImage.h: 14 (WebImage): 15 1 16 2012-05-09 Mark Pilgrim <pilgrim@chromium.org> 2 17 -
trunk/Source/Platform/chromium/public/WebCanvas.h
r108829 r116666 36 36 #if WEBKIT_USING_SKIA 37 37 class SkCanvas; 38 #elif WEBKIT_USING_CG39 struct CGContext;40 38 #endif 41 39 … … 44 42 #if WEBKIT_USING_SKIA 45 43 typedef SkCanvas WebCanvas; 46 #elif WEBKIT_USING_CG47 typedef struct CGContext WebCanvas;48 44 #else 49 45 #error "Need to define WebCanvas" -
trunk/Source/Platform/chromium/public/WebImage.h
r116566 r116666 36 36 #if WEBKIT_USING_SKIA 37 37 #include <SkBitmap.h> 38 #elif WEBKIT_USING_CG39 typedef struct CGImage* CGImageRef;40 38 #endif 41 39 … … 100 98 SkBitmap m_bitmap; 101 99 102 #elif WEBKIT_USING_CG103 WebImage(CGImageRef imageRef)104 {105 init();106 assign(imageRef);107 }108 109 WebImage& operator=(CGImageRef imageRef)110 {111 assign(imageRef);112 return *this;113 }114 115 CGImageRef getCGImageRef() const { return m_imageRef; }116 117 private:118 void init() { m_imageRef = 0; }119 WEBKIT_EXPORT void assign(CGImageRef);120 CGImageRef m_imageRef;121 100 #endif 122 101 }; -
trunk/Source/WebKit/chromium/ChangeLog
r116641 r116666 1 2012-05-10 Mark Pilgrim <pilgrim@chromium.org> 2 3 [Chromium] Remove dead code behind unused WEBKIT_USING_CG 4 https://bugs.webkit.org/show_bug.cgi?id=86018 5 6 Reviewed by Adam Barth. 7 8 We never use CoreGraphics as the backend for GraphicsContext in 9 Chromium, so this is all dead code. 10 11 * README: 12 * src/PageOverlay.cpp: 13 * src/WebContentLayerImpl.cpp: 14 (WebKit::WebContentLayerImpl::paintContents): 15 * src/WebFontImpl.cpp: 16 (WebKit::WebFontImpl::drawText): 17 * src/WebImageDecoder.cpp: 18 (WebKit::WebImageDecoder::getFrameAtIndex): 19 * src/WebPluginContainerImpl.cpp: 20 (WebKit::WebPluginContainerImpl::paint): 21 (WebKit::WebPluginContainerImpl::printPage): 22 * src/painting/GraphicsContextBuilder.h: 23 (WebKit): 24 1 25 2012-05-10 Sam D <dsam2912@gmail.com> 2 26 -
trunk/Source/WebKit/chromium/README
r92322 r116666 38 38 WEBKIT_USING_SKIA is defined when using Skia as the graphics library. 39 39 40 WEBKIT_USING_CG is defined when using CG as the graphics library.41 42 40 WEBKIT_USING_V8 is defined when using V8 as the JavaScript library. 43 41 -
trunk/Source/WebKit/chromium/src/PageOverlay.cpp
r105757 r116666 49 49 #if WEBKIT_USING_SKIA 50 50 return gc->platformContext()->canvas(); 51 #elif WEBKIT_USING_CG52 return gc->platformContext();53 51 #endif 54 52 } -
trunk/Source/WebKit/chromium/src/WebContentLayerImpl.cpp
r116142 r116666 67 67 #if WEBKIT_USING_SKIA 68 68 WebCanvas* canvas = gc.platformContext()->canvas(); 69 #elif WEBKIT_USING_CG70 WebCanvas* canvas = gc.platformContext();71 69 #endif 72 70 m_contentClient->paintContents(canvas, WebRect(clip)); -
trunk/Source/WebKit/chromium/src/WebFontImpl.cpp
r113345 r116666 102 102 #if WEBKIT_USING_SKIA 103 103 gc.platformContext()->setDrawingToImageBuffer(!canvasIsOpaque); 104 #elif WEBKIT_USING_CG105 // FIXME hook canvasIsOpaque up to the platform-specific indicators for106 // whether subpixel AA can be used for this draw.107 104 #endif 108 105 -
trunk/Source/WebKit/chromium/src/WebImageDecoder.cpp
r116566 r116666 116 116 OwnPtr<NativeImageSkia> image = adoptPtr(frameBuffer->asNewNativeImage()); 117 117 return WebImage(image->bitmap()); 118 #elif WEBKIT_USING_CG119 // FIXME: Implement CG side of this.120 return WebImage(frameBuffer->asNewNativeImage());121 118 #endif 122 119 } -
trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
r116566 r116666 129 129 #if WEBKIT_USING_SKIA 130 130 WebCanvas* canvas = gc->platformContext()->canvas(); 131 #elif WEBKIT_USING_CG132 WebCanvas* canvas = gc->platformContext();133 131 #endif 134 132 … … 262 260 #if WEBKIT_USING_SKIA 263 261 WebCanvas* canvas = gc->platformContext()->canvas(); 264 #elif WEBKIT_USING_CG265 WebCanvas* canvas = gc->platformContext();266 262 #endif 267 263 bool ret = m_webPlugin->printPage(pageNumber, canvas); -
trunk/Source/WebKit/chromium/src/painting/GraphicsContextBuilder.h
r95901 r116666 34 34 #include "GraphicsContext.h" 35 35 36 #if WEBKIT_USING_CG 37 #include "LocalCurrentGraphicsContext.h" 38 #elif WEBKIT_USING_SKIA 36 #if WEBKIT_USING_SKIA 39 37 #include "PlatformContextSkia.h" 40 38 #endif … … 42 40 namespace WebKit { 43 41 44 #if WEBKIT_USING_CG 45 46 class GraphicsContextBuilder { 47 public: 48 GraphicsContextBuilder(WebCanvas* canvas) 49 : m_graphicsContext(canvas) 50 , m_localContext(&m_graphicsContext) 51 { 52 } 53 54 WebCore::GraphicsContext& context() { return m_graphicsContext; } 55 56 private: 57 WebCore::GraphicsContext m_graphicsContext; 58 WebCore::LocalCurrentGraphicsContext m_localContext; 59 }; 60 61 #elif WEBKIT_USING_SKIA 42 #if WEBKIT_USING_SKIA 62 43 63 44 class GraphicsContextBuilder {
Note: See TracChangeset
for help on using the changeset viewer.