Changeset 73330 in webkit

Timestamp:

Dec 4, 2010 6:37:45 AM (13 years ago)

Author:

xan@webkit.org

Message:

WebCore:

2010-12-04 Xan Lopez <​xlopez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Drop GdkDrawable usage, it's deprecated in GTK+3.x and we can use GdkWindow
​https://bugs.webkit.org/show_bug.cgi?id=50451

GdkDrawable has been removed in GTK+3.x. To cope with this we can
actually stop using it altogether, since GdkWindow is just a
typedef for it and that seems to be good enough for us.

• platform/graphics/GraphicsContext.h: s/GdkDrawable/GdkWindow/.
• platform/graphics/cairo/GraphicsContextCairo.cpp: (WebCore::GraphicsContext::gdkWindow): ditto.
• platform/gtk/GtkVersioning.h: declare GDK_WINDOW_XWINDOW for GTK 3.x builds.
• platform/gtk/PlatformScreenGtk.cpp: (WebCore::screenAvailableRect): s/GdkDrawable/GdkWindow/.
• platform/gtk/WidgetGtk.cpp: (WebCore::gdkWindow): ditto. (WebCore::Widget::setCursor): ditto.
• platform/gtk/WidgetRenderingContextGtk2.cpp: ditto.

JavaScriptCore:

2010-12-04 Xan Lopez <​xlopez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Drop GdkDrawable usage, it's deprecated in GTK+3.x and we can use GdkWindow
​https://bugs.webkit.org/show_bug.cgi?id=50451

• wtf/gobject/GTypedefs.h: add GdkWindow defines.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/gobject/GTypedefs.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/Widget.h (modified) (1 diff)
• WebCore/platform/graphics/GraphicsContext.h (modified) (2 diffs)
• WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (1 diff)
• WebCore/platform/gtk/GtkVersioning.h (modified) (1 diff)
• WebCore/platform/gtk/PlatformScreenGtk.cpp (modified) (1 diff)
• WebCore/platform/gtk/WidgetGtk.cpp (modified) (2 diffs)
• WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-12-04  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Drop GdkDrawable usage, it's deprecated in GTK+3.x and we can use GdkWindow
+        https://bugs.webkit.org/show_bug.cgi?id=50451
+
+        * wtf/gobject/GTypedefs.h: add GdkWindow defines.
+
 2010-12-03  Gavin Barraclough  <barraclough@apple.com>
 

trunk/JavaScriptCore/wtf/gobject/GTypedefs.h

@@ -45 +45 @@
 typedef struct _GdkCursor GdkCursor;
 typedef struct _GdkDragContext GdkDragContext;
-typedef struct _GdkDrawable GdkDrawable;
 typedef struct _GdkEventConfigure GdkEventConfigure;
 typedef struct _GdkEventExpose GdkEventExpose;
@@ -86 +85 @@
 #ifdef GTK_API_VERSION_2
 typedef struct _GdkRectangle GdkRectangle;
+typedef struct _GdkDrawable GdkWindow;
 #else
+typedef struct _GdkWindow GdkWindow;
 typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
 typedef cairo_rectangle_int_t GdkRectangle;

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-04  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Drop GdkDrawable usage, it's deprecated in GTK+3.x and we can use GdkWindow
+        https://bugs.webkit.org/show_bug.cgi?id=50451
+
+        GdkDrawable has been removed in GTK+3.x. To cope with this we can
+        actually stop using it altogether, since GdkWindow is just a
+        typedef for it and that seems to be good enough for us.
+
+        * platform/graphics/GraphicsContext.h: s/GdkDrawable/GdkWindow/.
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::gdkWindow): ditto.
+        * platform/gtk/GtkVersioning.h: declare GDK_WINDOW_XWINDOW for GTK 3.x builds.
+        * platform/gtk/PlatformScreenGtk.cpp:
+        (WebCore::screenAvailableRect): s/GdkDrawable/GdkWindow/.
+        * platform/gtk/WidgetGtk.cpp:
+        (WebCore::gdkWindow): ditto.
+        (WebCore::Widget::setCursor): ditto.
+        * platform/gtk/WidgetRenderingContextGtk2.cpp: ditto.
+
 2010-12-03  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/platform/Widget.h

@@ -61 +61 @@
 
 #if PLATFORM(GTK)
-typedef struct _GdkDrawable GdkDrawable;
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkContainer GtkContainer;

trunk/WebCore/platform/graphics/GraphicsContext.h

@@ -90 +90 @@
 #endif
 
-#if PLATFORM(GTK)
-typedef struct _GdkDrawable GdkDrawable;
-typedef struct _GdkEventExpose GdkEventExpose;
-#endif
-
 #if PLATFORM(WIN)
 typedef struct HDC__* HDC;
@@ -408 +403 @@
 #if PLATFORM(GTK)
         void setGdkExposeEvent(GdkEventExpose*);
-        GdkDrawable* gdkDrawable() const;
+        GdkWindow* gdkWindow() const;
         GdkEventExpose* gdkExposeEvent() const;
 #endif

trunk/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -1086 +1086 @@
 }
 
-GdkDrawable* GraphicsContext::gdkDrawable() const
+GdkWindow* GraphicsContext::gdkWindow() const
 {
     if (!m_data->expose)
         return 0;
 
-    return GDK_DRAWABLE(m_data->expose->window);
+    return m_data->expose->window;
 }
 #endif

trunk/WebCore/platform/gtk/GtkVersioning.h

@@ -33 +33 @@
 #ifndef GTK_API_VERSION_2
 #define GDK_DISPLAY() (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))
+#define GDK_WINDOW_XWINDOW(window) (gdk_x11_window_get_xid(window))
 #else
 GdkPixbuf* gdk_pixbuf_get_from_surface(cairo_surface_t* surface, int srcX, int srcY,

trunk/WebCore/platform/gtk/PlatformScreenGtk.cpp

@@ -122 +122 @@
         return screenRect(widget);
 
-    GdkDrawable* rootWindow = GDK_DRAWABLE(gtk_widget_get_root_window(container));
+    GdkWindow* rootWindow = gtk_widget_get_root_window(container);
     GdkDisplay* display = gdk_window_get_display(rootWindow);
     Atom xproperty = gdk_x11_get_xatom_by_name_for_display(display, "_NET_WORKAREA");

trunk/WebCore/platform/gtk/WidgetGtk.cpp

@@ -61 +61 @@
 }
 
-static GdkDrawable* gdkDrawable(PlatformWidget widget)
+static GdkWindow* gdkWindow(PlatformWidget widget)
 {
     return widget ? gtk_widget_get_window(widget) : 0;
@@ -79 +79 @@
         return;
 
-    gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : gtk_widget_get_window(GTK_WIDGET(root()->hostWindow()->platformPageClient())), platformCursor);
+    gdk_window_set_cursor(gdkWindow(platformWidget()) ? gdkWindow(platformWidget()) : gtk_widget_get_window(GTK_WIDGET(root()->hostWindow()->platformPageClient())), platformCursor);
     lastSetCursor = platformCursor;
 }

trunk/WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp

@@ -90 +90 @@
     // to a temporary surface and preserve transparency. To ensure decent widget rendering, just
     // paint directly to the target drawable. This will not render CSS rotational transforms properly.
-    if (!theme->m_themePartsHaveRGBAColormap && graphicsContext->gdkDrawable()) {
+    if (!theme->m_themePartsHaveRGBAColormap && graphicsContext->gdkWindow()) {
         m_paintRect = graphicsContext->getCTM().mapRect(targetRect);
-        m_target = graphicsContext->gdkDrawable();
+        m_target = graphicsContext->gdkWindow();
         return;
     }
@@ -132 +132 @@
     // We do not need to blit back to the target in the fallback case. See above.
     RenderThemeGtk* theme = static_cast<RenderThemeGtk*>(RenderTheme::defaultTheme().get());
-    if (!theme->m_themePartsHaveRGBAColormap && m_graphicsContext->gdkDrawable())
+    if (!theme->m_themePartsHaveRGBAColormap && m_graphicsContext->gdkWindow())
         return;