Changeset 57745 in webkit

Timestamp:

Apr 16, 2010 2:27:03 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-16 Jarkko Sakkinen <​jarkko.j.sakkinen@gmail.com>

Reviewed by Simon Hausmann.

[Qt] WebKit compilation fails with --3d-canvas
​https://bugs.webkit.org/show_bug.cgi?id=37699

API for readPixels() has been changed.

• platform/graphics/qt/GraphicsContext3DQt.cpp: (WebCore::GraphicsContext3D::readPixels):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-16  Jarkko Sakkinen  <jarkko.j.sakkinen@gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] WebKit compilation fails with --3d-canvas
+        https://bugs.webkit.org/show_bug.cgi?id=37699 
+        
+        API for readPixels() has been changed. 
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::readPixels):
+
 2010-04-16  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -995 +995 @@
 }
 
-PassRefPtr<WebGLArray> GraphicsContext3D::readPixels(long x, long y, unsigned long width, unsigned long height, unsigned long format, unsigned long type)
+void GraphicsContext3D::readPixels(long x, long y, unsigned long width, unsigned long height, unsigned long format, unsigned long type, void* data)
 {
     m_internal->m_glWidget->makeCurrent();
     
     if (type != GraphicsContext3D::UNSIGNED_BYTE || format != GraphicsContext3D::RGBA)
-        return 0;
+        return;
         
-    RefPtr<WebGLUnsignedByteArray> array = WebGLUnsignedByteArray::create(width * height * 4);
-    glReadPixels(x, y, width, height, format, type, (GLvoid*) array->data());
-    return array;    
+    glReadPixels(x, y, width, height, format, type, (GLvoid*) data);
 }