Changeset 83745 in webkit

Timestamp:

Apr 13, 2011 9:17:37 AM (13 years ago)

Author:

Martin Robinson

Message:

2011-04-13 Thierry Reding <​thierry.reding@avionic-design.de>

Gtk+ port fails to build when enabling WebGL
​https://bugs.webkit.org/show_bug.cgi?id=58434

Fix the GTK+ WebGL build after the introduction of PlatformContextCairo.

• platform/graphics/GraphicsContext3D.h:
• platform/graphics/cairo/GraphicsContext3DCairo.cpp: (WebCore::GraphicsContext3D::paintToCanvas):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext3D.h (modified) (3 diffs)
• platform/graphics/cairo/GraphicsContext3DCairo.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Thierry Reding  <thierry.reding@avionic-design.de>
+
+        Gtk+ port fails to build when enabling WebGL
+        https://bugs.webkit.org/show_bug.cgi?id=58434
+
+        Fix the GTK+ WebGL build after the introduction of PlatformContextCairo.
+
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+        (WebCore::GraphicsContext3D::paintToCanvas):
+
 2011-04-12  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -64 +64 @@
 QT_END_NAMESPACE
 #elif PLATFORM(GTK)
-typedef struct _cairo cairo_t;
 typedef unsigned int GLuint;
 #endif
@@ -92 +91 @@
 class Image;
 class ImageData;
+#if PLATFORM(CAIRO)
+class PlatformContextCairo;
+#endif
 
 struct ActiveInfo {
@@ -766 +768 @@
 #elif PLATFORM(GTK)
     void paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight,
-                       int canvasWidth, int canvasHeight, cairo_t* context);
+                       int canvasWidth, int canvasHeight, PlatformContextCairo* context);
 #endif
 

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp

@@ -28 +28 @@
 #include "config.h"
 #include "GraphicsContext3D.h"
+#include "PlatformContextCairo.h"
 
 #if ENABLE(WEBGL)
@@ -84 +85 @@
 }
 
-void GraphicsContext3D::paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight, int canvasWidth, int canvasHeight, cairo_t* context)
+void GraphicsContext3D::paintToCanvas(const unsigned char* imagePixels, int imageWidth, int imageHeight, int canvasWidth, int canvasHeight, PlatformContextCairo* context)
 {
     if (!imagePixels || imageWidth <= 0 || imageHeight <= 0 || canvasWidth <= 0 || canvasHeight <= 0 || !context)
         return;
 
-    cairo_save(context);
+    cairo_t *cr = context->cr();
+    context->save();
 
-    cairo_rectangle(context, 0, 0, canvasWidth, canvasHeight);
-    cairo_set_operator(context, CAIRO_OPERATOR_CLEAR);
-    cairo_paint(context);
+    cairo_rectangle(cr, 0, 0, canvasWidth, canvasHeight);
+    cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
+    cairo_paint(cr);
 
     RefPtr<cairo_surface_t> imageSurface = adoptRef(cairo_image_surface_create_for_data(
@@ -99 +101 @@
 
     // OpenGL keeps the pixels stored bottom up, so we need to flip the image here.
-    cairo_translate(context, 0, imageHeight);
-    cairo_scale(context, 1, -1);
+    cairo_translate(cr, 0, imageHeight);
+    cairo_scale(cr, 1, -1);
 
-    cairo_set_operator(context, CAIRO_OPERATOR_OVER);
-    cairo_set_source_surface(context, imageSurface.get(), 0, 0);
-    cairo_rectangle(context, 0, 0, canvasWidth, -canvasHeight);
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_set_source_surface(cr, imageSurface.get(), 0, 0);
+    cairo_rectangle(cr, 0, 0, canvasWidth, -canvasHeight);
 
-    cairo_fill(context);
-    cairo_restore(context);
+    cairo_fill(cr);
+    context->restore();
 }