Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)

Weekly snapshot

1 files changed, 5 insertions, 18 deletions

diff --git a/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h b/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h
index b79898971..a269192a4 100644
--- a/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h
+++ b/Source/WebKit/chromium/src/GraphicsContext3DPrivate.h
@@ -28,16 +28,12 @@
 
 #include "Extensions3DChromium.h"
 #include "GraphicsContext3D.h"
+#include "SkBitmap.h"
 #include <wtf/HashSet.h>
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/OwnPtr.h>
-#if USE(SKIA)
-#include "SkBitmap.h"
-#endif
 
-#if USE(SKIA)
 class GrContext;
-#endif
 
 namespace WebKit {
 class WebGraphicsContext3D;
@@ -68,9 +64,7 @@ public:
 
     PlatformGraphicsContext3D platformGraphicsContext3D() const;
     Platform3DObject platformTexture() const;
-#if USE(SKIA)
     GrContext* grContext();
-#endif
 
     bool makeContextCurrent();
 
@@ -82,10 +76,10 @@ public:
     bool layerComposited() const;
     void markLayerComposited();
 
-    void paintRenderingResultsToCanvas(CanvasRenderingContext*, DrawingBuffer*);
+    void paintRenderingResultsToCanvas(ImageBuffer*, DrawingBuffer*);
     void paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer*);
     PassRefPtr<ImageData> paintRenderingResultsToImageData(DrawingBuffer*);
-    bool paintCompositedResultsToCanvas(CanvasRenderingContext*);
+    bool paintCompositedResultsToCanvas(ImageBuffer*);
 
     void prepareTexture();
 
@@ -324,6 +318,8 @@ public:
 private:
     GraphicsContext3DPrivate(PassOwnPtr<WebKit::WebGraphicsContext3D>, bool preserveDrawingBuffer);
 
+    void initializeExtensions();
+
     OwnPtr<WebKit::WebGraphicsContext3D> m_impl;
     OwnPtr<Extensions3DChromium> m_extensions;
     OwnPtr<GraphicsContextLostCallbackAdapter> m_contextLostCallbackAdapter;
@@ -343,7 +339,6 @@ private:
     };
     ResourceSafety m_resourceSafety;
 
-#if USE(SKIA)
     // If the width and height of the Canvas's backing store don't
     // match those that we were given in the most recent call to
     // reshape(), then we need an intermediate bitmap to read back the
@@ -352,14 +347,6 @@ private:
     SkBitmap m_resizingBitmap;
 
     GrContext* m_grContext;
-#endif
-
-#if USE(CG)
-    OwnArrayPtr<unsigned char> m_renderOutput;
-    size_t m_renderOutputSize;
-#endif
-
-    void initializeExtensions();
 };
 
 } // namespace WebCore