Merge 92908 - Readback composited webgl results for printing

Source/WebKit/chromium/src/GraphicsContext3DInternal.h

Index: Source/WebKit/chromium/src/GraphicsContext3DInternal.h
===================================================================
--- Source/WebKit/chromium/src/GraphicsContext3DInternal.h	(revision 93076)
+++ Source/WebKit/chromium/src/GraphicsContext3DInternal.h	(working copy)
@@ -29,6 +29,7 @@
 #include "Extensions3DChromium.h"
 #include "GraphicsContext3D.h"
 #include <wtf/HashSet.h>
+#include <wtf/OwnArrayPtr.h>
 #include <wtf/OwnPtr.h>
 #if USE(SKIA)
 #include "SkBitmap.h"
@@ -80,8 +81,10 @@
     void markLayerComposited();
 
     void paintRenderingResultsToCanvas(CanvasRenderingContext*);
+    void paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer*);
     PassRefPtr<ImageData> paintRenderingResultsToImageData();
     bool paintsIntoCanvasBuffer() const;
+    bool paintCompositedResultsToCanvas(CanvasRenderingContext*);
 
     void prepareTexture();
 
@@ -320,7 +323,8 @@
 #endif
 
 #if USE(CG)
-    unsigned char* m_renderOutput;
+    OwnArrayPtr<unsigned char> m_renderOutput;
+    size_t m_renderOutputSize;
 #endif
 
     void initializeExtensions();