Merge 92908 - Readback composited webgl results for printing

Source/WebKit/chromium/src/GraphicsContext3DInternal.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef GraphicsContext3DInternal_h
 #define GraphicsContext3DInternal_h
 
 #include "Extensions3DChromium.h"
 #include "GraphicsContext3D.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 {
@@ skipping 31 matching lines @@
     bool makeContextCurrent();
 
     void reshape(int width, int height);
     IntSize getInternalFramebufferSize() const;
 
     void markContextChanged();
     bool layerComposited() const;
     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();
 
 #if USE(ACCELERATED_COMPOSITING)
     WebGLLayerChromium* platformLayer() const;
 #endif
     bool isGLES2Compliant() const;
 
     void releaseShaderCompiler();
     bool isContextLost();
@@ skipping 218 matching lines @@
     // match those that we were given in the most recent call to
     // reshape(), then we need an intermediate bitmap to read back the
     // frame buffer into. This seems to happen when CSS styles are
     // used to resize the Canvas.
     SkBitmap m_resizingBitmap;
 
     GrContext* m_grContext;
 #endif
 
 #if USE(CG)
-    unsigned char* m_renderOutput;
+    OwnArrayPtr<unsigned char> m_renderOutput;
+    size_t m_renderOutputSize;
 #endif
 
     void initializeExtensions();
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContext3D_h