Changeset 85480 in webkit

Timestamp:

May 2, 2011 9:13:58 AM (13 years ago)

Author:

Philippe Normand

Message:

2011-05-02 Philippe Normand <​pnormand@igalia.com>

Reviewed by Martin Robinson.

[GTK] gdk_drawable_get_size() shouldn't be used with GTK+ >= 2.24
​https://bugs.webkit.org/show_bug.cgi?id=59932

Use gdk_window_get_width() and gdk_window_get_height() if
available, instead of the deprecated gdk_drawable_get_size().

No new tests, build fix only.

• platform/gtk/WidgetRenderingContext.cpp: (WebCore::WidgetRenderingContext::WidgetRenderingContext):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-02  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] gdk_drawable_get_size() shouldn't be used with GTK+ >= 2.24
+        https://bugs.webkit.org/show_bug.cgi?id=59932
+
+        Use gdk_window_get_width() and gdk_window_get_height() if
+        available, instead of the deprecated gdk_drawable_get_size().
+
+        No new tests, build fix only.
+
+        * platform/gtk/WidgetRenderingContext.cpp:
+        (WebCore::WidgetRenderingContext::WidgetRenderingContext):
+
 2011-05-02  Eric Carlson  <eric.carlson@apple.com>
 

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

@@ -85 +85 @@
     // 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)));