Changeset 83319 in webkit

Timestamp:

Apr 8, 2011 11:47:55 AM (13 years ago)

Author:

Martin Robinson

Message:

2011-04-08 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Fix the WebKit2 build for older versions of GTK+
​https://bugs.webkit.org/show_bug.cgi?id=58095

No new tests. This is just a build fix.

• platform/gtk/GtkVersioning.c: (gdk_window_create_similar_surface): Reimplement this method for older versions of GDK.
• platform/gtk/GtkVersioning.h: Add the new method to the header.

2011-04-08 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Fix the WebKit2 build for older versions of GTK+
​https://bugs.webkit.org/show_bug.cgi?id=58095

• UIProcess/gtk/ChunkedUpdateDrawingAreaProxyGtk.cpp: Include the GtkVersioning.h header.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/GtkVersioning.c (modified) (1 diff)
• WebCore/platform/gtk/GtkVersioning.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/gtk/ChunkedUpdateDrawingAreaProxyGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-08  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Fix the WebKit2 build for older versions of GTK+
+        https://bugs.webkit.org/show_bug.cgi?id=58095
+
+        No new tests. This is just a build fix.
+
+        * platform/gtk/GtkVersioning.c:
+        (gdk_window_create_similar_surface): Reimplement this method for older versions of GDK.
+        * platform/gtk/GtkVersioning.h: Add the new method to the header.
+
 2011-04-08  Misha Tyutyunik  <michael.tyutyunik@nokia.com>
 

trunk/Source/WebCore/platform/gtk/GtkVersioning.c

@@ -272 +272 @@
 #endif
 
+#if !GTK_CHECK_VERSION(2, 22, 0)
+cairo_surface_t *gdk_window_create_similar_surface(GdkWindow *window, cairo_content_t content, int width, int height)
+{
+    cairo_t *cairoContext = gdk_cairo_create(window);
+    cairo_surface_t *cairoSurface = cairo_get_target(cairoContext);
+    cairo_surface_t *newSurface = cairo_surface_create_similar(cairoSurface, content, width, height);
+    cairo_destroy(cairoContext);
+    return newSurface;
+}
+#endif // GTK_CHECK_VERSION(2, 22, 0)

trunk/Source/WebCore/platform/gtk/GtkVersioning.h

@@ -46 +46 @@
 #define gdk_window_get_visual gdk_drawable_get_visual
 #endif // GTK_CHECK_VERSION(2, 23, 0)
+
+#if !GTK_CHECK_VERSION(2, 22, 0)
+cairo_surface_t* gdk_window_create_similar_surface(GdkWindow* window, cairo_content_t content, int width, int height);
+#endif // GTK_CHECK_VERSION(2, 22, 0)
 
 #if !GTK_CHECK_VERSION(2, 21, 2)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-08  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Fix the WebKit2 build for older versions of GTK+
+        https://bugs.webkit.org/show_bug.cgi?id=58095
+
+        * UIProcess/gtk/ChunkedUpdateDrawingAreaProxyGtk.cpp: Include the GtkVersioning.h header.
+
 2011-04-07  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/Source/WebKit2/UIProcess/gtk/ChunkedUpdateDrawingAreaProxyGtk.cpp

@@ -33 +33 @@
 #include "WebProcessProxy.h"
 #include "WebView.h"
-
+#include <WebCore/GtkVersioning.h>
 #include <gdk/gdk.h>