Merge 92908 - Readback composited webgl results for printing

Source/WebCore/platform/graphics/GraphicsContext3D.h

 /*
  * Copyright (C) 2009 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 77 matching lines @@
 class CanvasRenderingContext;
 class DrawingBuffer;
 class Extensions3D;
 #if PLATFORM(MAC) || PLATFORM(GTK)
 class Extensions3DOpenGL;
 #elif PLATFORM(QT)
 class Extensions3DQt;
 #endif
 class HostWindow;
 class Image;
+class ImageBuffer;
 class ImageData;
 #if USE(CAIRO)
 class PlatformContextCairo;
 #endif
 
 struct ActiveInfo {
     String name;
     GC3Denum type;
     GC3Dint size;
 };
@@ skipping 664 matching lines @@
     void vertexAttrib4f(GC3Duint index, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w);
     void vertexAttrib4fv(GC3Duint index, GC3Dfloat* values);
     void vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized,
                              GC3Dsizei stride, GC3Dintptr offset);
 
     void viewport(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);
 
     void reshape(int width, int height);
 
 #if USE(CG)
-    void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
-                       int canvasWidth, int canvasHeight, CGContextRef context);
+    static void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
+                              int canvasWidth, int canvasHeight, CGContextRef);
 #elif PLATFORM(GTK)
     void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
                        int canvasWidth, int canvasHeight, PlatformContextCairo* context);
 #endif
 
     void markContextChanged();
     void markLayerComposited();
     bool layerComposited() const;
 
-    void paintRenderingResultsToCanvas(CanvasRenderingContext* context);
+    void paintRenderingResultsToCanvas(CanvasRenderingContext*);
     PassRefPtr<ImageData> paintRenderingResultsToImageData();
+    bool paintCompositedResultsToCanvas(CanvasRenderingContext*);
 
 #if PLATFORM(QT)
     bool paintsIntoCanvasBuffer() const { return true; }
 #elif PLATFORM(CHROMIUM)
     bool paintsIntoCanvasBuffer() const;
 #elif PLATFORM(GTK)
     bool paintsIntoCanvasBuffer() const { return true; }
 #else
     bool paintsIntoCanvasBuffer() const { return false; }
 #endif
@@ skipping 147 matching lines @@
     // FIXME: ideally this would be used on all platforms.
 #if PLATFORM(CHROMIUM) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
     friend class GraphicsContext3DInternal;
     OwnPtr<GraphicsContext3DInternal> m_internal;
 #endif
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContext3D_h