Merge 92908 - Readback composited webgl results for printing

Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp

 /*
  * Copyright (C) 2010 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 133 matching lines @@
             pixels[i + 1] = std::min(255, pixels[i + 1] * pixels[i + 3] / 255);
             pixels[i + 2] = std::min(255, pixels[i + 2] * pixels[i + 3] / 255);
         }
     }
 
     paintToCanvas(pixels.get(), m_currentWidth, m_currentHeight,
                   canvas->width(), canvas->height(), imageBuffer->context()->platformContext());
 }
 #endif
 
+bool GraphicsContext3D::paintCompositedResultsToCanvas(CanvasRenderingContext*)
+{
+    // Not needed at the moment, so return that nothing was done.
+    return false;
+}
+
 PassRefPtr<ImageData> GraphicsContext3D::paintRenderingResultsToImageData()
 {
     // Reading premultiplied alpha would involve unpremultiplying, which is
     // lossy
     if (m_attrs.premultipliedAlpha)
         return 0;
 
     RefPtr<ImageData> imageData = ImageData::create(IntSize(m_currentWidth, m_currentHeight));
     unsigned char* pixels = imageData->data()->data()->data();
     int totalBytes = 4 * m_currentWidth * m_currentHeight;
@@ skipping 1364 matching lines @@
 {
     if (!m_extensions)
         m_extensions = adoptPtr(new Extensions3DOpenGL(this));
     return m_extensions.get();
 }
 #endif
 
 }
 
 #endif // ENABLE(WEBGL)