diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/platform/gtk/PlatformScreenGtk.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/platform/gtk/PlatformScreenGtk.cpp')
| -rw-r--r-- | WebCore/platform/gtk/PlatformScreenGtk.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/platform/gtk/PlatformScreenGtk.cpp b/WebCore/platform/gtk/PlatformScreenGtk.cpp index 6ace728..9c70d0e 100644 --- a/WebCore/platform/gtk/PlatformScreenGtk.cpp +++ b/WebCore/platform/gtk/PlatformScreenGtk.cpp @@ -63,8 +63,7 @@ static GdkVisual* getVisual(Widget* widget) return 0; } - - return gdk_drawable_get_visual(GDK_DRAWABLE(gtk_widget_get_window(container))); + return gdk_window_get_visual(gtk_widget_get_window(container)); } int screenDepth(Widget* widget) @@ -123,7 +122,7 @@ FloatRect screenAvailableRect(Widget* widget) return screenRect(widget); GdkDrawable* rootWindow = GDK_DRAWABLE(gtk_widget_get_root_window(container)); - GdkDisplay* display = gdk_drawable_get_display(rootWindow); + GdkDisplay* display = gdk_window_get_display(rootWindow); Atom xproperty = gdk_x11_get_xatom_by_name_for_display(display, "_NET_WORKAREA"); Atom retType; |