Changeset 1391 for trunk/BAL/Graphics/WebCore/WK/BCGraphicsContext3DWK.h

Timestamp:

03/01/10 16:40:39 (6 months ago)

Author:

gbertal

Message:

merge with webkit revision 55361

Files:

• trunk/BAL/Graphics/WebCore/WK/BCGraphicsContext3DWK.h (modified) (6 diffs)

trunk/BAL/Graphics/WebCore/WK/BCGraphicsContext3DWK.h

@@ -45 +45 @@
-typedef GLuint Platform3DObject;
-const Platform3DObject NullPlatform3DObject = 0;
+#elif PLATFORM(QT)
+#include <QtOpenGL/QtOpenGL>
+
+typedef void* PlatformGraphicsContext3D;
+const  PlatformGraphicsContext3D NullPlatformGraphicsContext3D = 0;
+typedef int Platform3DObject;
+const Platform3DObject NullPlatform3DObject = 0;
-#else
-typedef void* PlatformGraphicsContext3D;
@@ -66 +73 @@
-    class WebGLTexture;
-    class Image;
+    class ImageData;
-
-    struct ActiveInfo {
@@ -74 +82 @@
-
-    // FIXME: ideally this would be used on all platforms.
-
+ || PLATFORM(QT)
-    class GraphicsContext3DInternal;
-#endif
@@ -410 +418 @@
-        PlatformGraphicsContext3D platformGraphicsContext3D() const;
-        Platform3DObject platformTexture() const;
+#elif PLATFORM(QT)
+        PlatformGraphicsContext3D platformGraphicsContext3D();
+        Platform3DObject platformTexture() const;
-#else
-        PlatformGraphicsContext3D platformGraphicsContext3D() const { return NullPlatformGraphicsContext3D; }
@@ -435 +446 @@
-                              unsigned int* format,
-                              unsigned int* internalFormat);
+
+        // Extracts the contents of the given ImageData into the passed
+        // Vector, obeying the flipY and premultiplyAlpha flags.
+        // Returns true upon success.
+        bool extractImageData(ImageData*,
+                              bool flipY,
+                              bool premultiplyAlpha,
+                              Vector<uint8_t>& data);
-
-        // Processes the given image data in preparation for uploading
@@ -705 +724 @@
-
-        // FIXME: ideally this would be used on all platforms.
-
+ || PLATFORM(QT)
-        friend class GraphicsContext3DInternal;
-        OwnPtr<GraphicsContext3DInternal> m_internal;