[GTK] Drop GdkDrawable usage, it's been removed in GTK+3.x and we can use GdkWindow

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Xan Lopez]

SSIA

[Xan Lopez]

Created attachment 75488 [details]
drawable.diff

[Martin Robinson]

Comment on attachment 75488 [details]
drawable.diff

View in context: https://bugs.webkit.org/attachment.cgi?id=75488&action=review

> WebCore/platform/graphics/GraphicsContext.h:95
>  #if PLATFORM(GTK)
> -typedef struct _GdkDrawable GdkDrawable;
> +typedef struct _GdkWindow GdkWindow;
>  typedef struct _GdkEventExpose GdkEventExpose;
>  #endif

This typedef will have to be typedef struct _GdkDrawable GdkWindow for GTK+ 2.x. I guess we'll need an #ifdef. You could move these to JavaScriptCore/gobject/GTypedefs.h and do it there.

[Xan Lopez]

Created attachment 75496 [details]
drawable.diff

[Martin Robinson]

Comment on attachment 75496 [details]
drawable.diff

Seems reasonable. Aren't there any callers for GraphicsContext::gdkWindow() ?

[Build Bot]

Attachment 75496 [details] did not build on win:
Build output: http://queues.webkit.org/results/6832031

[Eric Seidel (no email)]

Attachment 75496 [details] did not build on mac:
Build output: http://queues.webkit.org/results/6824028

[Xan Lopez]

Created attachment 75504 [details]
drawable.diff

[Wouter Bolsterlee]

GDK_DRAWABLE and some other deprecated macros and functions have been removed altogether from GTK+ 3 (git master), so without this patch Webkit doesn't compile with recent GTK+ 3.

[Martin Robinson]

Comment on attachment 75504 [details]
drawable.diff

View in context: https://bugs.webkit.org/attachment.cgi?id=75504&action=review

I tested this patch locally with exceptional results. But unless I'm crazy, I think that the change to the comment is incorrect.

> WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp:91
> +    // paint directly to the target window. This will not render CSS rotational transforms properly.

This comment is actually correct, because m_target may either be a GdkWindow or a GdkPixmap, both of which are drawables. I don' think a pixmap is a window though.

[Xan Lopez]

(In reply to comment #9)
> > WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp:91
> > +    // paint directly to the target window. This will not render CSS rotational transforms properly.
> 
> This comment is actually correct, because m_target may either be a GdkWindow or a GdkPixmap, both of which are drawables. I don' think a pixmap is a window though.

You are right, I was too quick with search and replace.

(In reply to comment #8)
> GDK_DRAWABLE and some other deprecated macros and functions have been removed altogether from GTK+ 3 (git master), so without this patch Webkit doesn't compile with recent GTK+ 3.

Right again! I was just sloppy with my words, I know GdkDrawable has been removed and this patch is needed to build. I can tell because of the failed local build ;)

[Xan Lopez]

Committed r73330: <http://trac.webkit.org/changeset/73330>