Changeset 86178 in webkit

Timestamp:

May 10, 2011 12:37:32 PM (13 years ago)

Author:

Martin Robinson

Message:

2011-05-10 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK][WebKit2] GTK+ 2.x widget rendering fails after r85480
​https://bugs.webkit.org/show_bug.cgi?id=59990

No new tests. This is covered by existing pixel tests.

• platform/gtk/GtkVersioning.c: (getGdkDrawableSize): Added this helper method.
• platform/gtk/GtkVersioning.h: Added helper method declaration.
• platform/gtk/WidgetRenderingContext.cpp: (WebCore::WidgetRenderingContext::WidgetRenderingContext): Call into the helper if there is actually a GdkDrawable. If not, disable the sanity check.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/GtkVersioning.c (modified) (1 diff)
• platform/gtk/GtkVersioning.h (modified) (1 diff)
• platform/gtk/WidgetRenderingContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-10  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK][WebKit2] GTK+ 2.x widget rendering fails after r85480
+        https://bugs.webkit.org/show_bug.cgi?id=59990
+
+        No new tests. This is covered by existing pixel tests.
+
+        * platform/gtk/GtkVersioning.c:
+        (getGdkDrawableSize): Added this helper method.
+        * platform/gtk/GtkVersioning.h: Added helper method declaration.
+        * platform/gtk/WidgetRenderingContext.cpp:
+        (WebCore::WidgetRenderingContext::WidgetRenderingContext): Call into the helper if
+        there is actually a GdkDrawable. If not, disable the sanity check.
+
 2011-05-10  Martin Robinson  <mrobinson@igalia.com>
 

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

@@ -262 +262 @@
 }
 
+#if GTK_CHECK_VERSION(2, 24, 0)
+void getGdkDrawableSize(GdkDrawable *drawable, int *width, int *height)
+{
+    g_return_if_fail(GDK_IS_PIXMAP(drawable) || GDK_IS_WINDOW(drawable));
+
+    if (GDK_IS_PIXMAP(drawable)) {
+        gdk_pixmap_get_size(GDK_PIXMAP(drawable), width, height);
+        return;
+    }
+
+    GdkWindow *window = GDK_WINDOW(drawable);
+    *width = gdk_window_get_width(window);
+    *height = gdk_window_get_height(window);
+}
+#else
+void getGdkDrawableSize(GdkDrawable *drawable, int *width, int *height)
+{
+    gdk_drawable_get_size(drawable, &width, &height);
+}
+#endif // GTK_CHECK_VERSION(2, 24, 0)
+
 #endif // GTK_API_VERSION_2
 

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

@@ -36 +36 @@
 GdkPixbuf* gdk_pixbuf_get_from_surface(cairo_surface_t* surface, int srcX, int srcY,
                                        int width, int height);
+void getGdkDrawableSize(GdkDrawable* drawable, int* width, int* height);
 #endif
 

trunk/Source/WebCore/platform/gtk/WidgetRenderingContext.cpp

@@ -84 +84 @@
     // We never want to create a scratch buffer larger than the size of our target GdkDrawable.
     // This prevents giant pixmap allocations for very large widgets in smaller views.
-    int maxWidth = 0, maxHeight = 0;
-#if GTK_CHECK_VERSION(2, 24, 0)
-    maxWidth = gdk_window_get_width(graphicsContext->gdkWindow());
-    maxHeight = gdk_window_get_height(graphicsContext->gdkWindow());
-#else
-    gdk_drawable_get_size(graphicsContext->gdkWindow(), &maxWidth, &maxHeight);
-#endif
-    m_targetRect.setSize(m_targetRect.size().shrunkTo(IntSize(maxWidth, maxHeight)));
+    // FIXME: We need to implement this check for WebKit2 as well.
+    if (graphicsContext->gdkWindow()) {
+        int maxWidth = 0, maxHeight = 0;
+        getGdkDrawableSize(graphicsContext->gdkWindow(), &maxWidth, &maxHeight);
+        m_targetRect.setSize(m_targetRect.size().shrunkTo(IntSize(maxWidth, maxHeight)));
+    }
 
     // Widgets sometimes need to draw outside their boundaries for things such as