commit 047c340b30fdd01fab9c5b534894d702ee80554a
author jmalonzo@webkit.org <jmalonzo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Oct 04 04:02:30 2008 +0000
committer jmalonzo@webkit.org <jmalonzo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Oct 04 04:02:30 2008 +0000
tree 233887f618789661516f8e00d1aef627277da9a2
parent fcc2f47d805c464869717eaf1ab827a81575a80f

2008-10-03  Jan Michael Alonzo  <jmalonzo@webkit.org>

        Reviewed by David Hyatt.

        Gtk build fixes.

        * platform/gtk/FileChooserGtk.cpp:
        (WebCore::FileChooser::openFileChooser):
        * platform/gtk/PlatformScreenGtk.cpp:
        (WebCore::screenDepth):
        (WebCore::screenDepthPerComponent):
        (WebCore::screenAvailableRect):
        * platform/gtk/PopupMenuGtk.cpp:
        (WebCore::PopupMenu::show):
        * platform/gtk/ScrollViewGtk.cpp:
        (WebCore::ScrollView::platformAddChild):
        (WebCore::ScrollView::platformRemoveChild):
        * platform/gtk/WidgetGtk.cpp:
        (WebCore::Widget::setCursor):
        * plugins/gtk/PluginViewGtk.cpp:
        (WebCore::PluginView::getValue):
        (WebCore::PluginView::forceRedraw):
        (WebCore::PluginView::init):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@37280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/platform/gtk/PlatformScreenGtk.cpp

diff --git a/WebCore/platform/gtk/PlatformScreenGtk.cpp b/WebCore/platform/gtk/PlatformScreenGtk.cpp
index 42adfef..f863c7f 100644
--- a/WebCore/platform/gtk/PlatformScreenGtk.cpp
+++ b/WebCore/platform/gtk/PlatformScreenGtk.cpp
@@ -30,7 +30,9 @@
 #include "config.h"
 #include "PlatformScreen.h"
 
+#include "HostWindow.h"
 #include "NotImplemented.h"
+#include "ScrollView.h"
 #include "Widget.h"
 
 #include <gtk/gtk.h>
@@ -44,27 +46,27 @@
 
 int screenDepth(Widget* widget)
 {
-    GtkWidget* container = GTK_WIDGET(widget->containingWindow());
+    GtkWidget* container = GTK_WIDGET(widget->root()->hostWindow()->platformWindow());
     if (!container)
         return 24;
 
-    GdkVisual* visual = gdk_drawable_get_visual(GDK_DRAWABLE(GTK_WIDGET(widget->containingWindow())->window));
+    GdkVisual* visual = gdk_drawable_get_visual(GDK_DRAWABLE(GTK_WIDGET(widget->root()->hostWindow()->platformWindow()->window)));
     return visual->depth;
 }
 
 int screenDepthPerComponent(Widget* widget)
 {
-    GtkWidget* container = GTK_WIDGET(widget->containingWindow());
+    GtkWidget* container = GTK_WIDGET(widget->root()->hostWindow()->platformWindow());
     if (!container)
         return 8;
 
-    GdkVisual* visual = gdk_drawable_get_visual(GDK_DRAWABLE(GTK_WIDGET(widget->containingWindow())->window));
+    GdkVisual* visual = gdk_drawable_get_visual(GDK_DRAWABLE(GTK_WIDGET(widget->root()->hostWindow()->platformWindow())->window));
     return visual->bits_per_rgb;
 }
 
 bool screenIsMonochrome(Widget* widget)
 {
-    GtkWidget* container = GTK_WIDGET(widget->containingWindow());
+    GtkWidget* container = GTK_WIDGET(widget->root()->hostWindow()->platformWindow());
     if (!container)
         return false;
 
@@ -73,7 +75,7 @@
 
 FloatRect screenRect(Widget* widget)
 {
-    GtkWidget* container = GTK_WIDGET(widget->containingWindow());
+    GtkWidget* container = GTK_WIDGET(widget->root()->hostWindow()->platformWindow());
     if (!container)
         return FloatRect();
 
@@ -91,7 +93,7 @@
 FloatRect screenAvailableRect(Widget* widget)
 {
 #if PLATFORM(X11)
-    GtkWidget* container = GTK_WIDGET(widget->containingWindow());
+    GtkWidget* container = GTK_WIDGET(widget->root()->hostWindow()->platformWindow());
     if (!container)
         return FloatRect();