Fixed version of commit 5499

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5505 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 26 insertions, 5 deletions

diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index 0828731..aa97721 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -112,6 +112,7 @@ elif env['PLATFORM'] == 'posix':
   input_files.extend([
       'webcursor_gtk.cc',
       'webinputevent_linux.cc',
+      'webkit_glue_gtk.cc',
   ])
 
 if env['PLATFORM'] in ('posix', 'darwin'):
diff --git a/webkit/glue/webkit_glue_gtk.cc b/webkit/glue/webkit_glue_gtk.cc
new file mode 100644
index 0000000..fc9c2fa
--- /dev/null
+++ b/webkit/glue/webkit_glue_gtk.cc
@@ -0,0 +1,23 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.  Use of this
+// source code is governed by a BSD-style license that can be found in the
+// LICENSE file.
+
+#include "webkit/glue/webkit_glue.h"
+
+#include <gtk/gtk.h>
+
+namespace webkit_glue {
+
+// TODO: complete this function
+ScreenInfo GetScreenInfoHelper(gfx::ViewHandle window) {
+  GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(window));
+
+  ScreenInfo results;
+  results.rect.SetRect(0, 0, gdk_screen_get_width(screen),
+                       gdk_screen_get_height(screen));
+
+  return results;
+}
+
+}  // namespace webkit_glue
+
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 25fd8e6..3d62e88 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -460,10 +460,7 @@ bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
 }
 
 ScreenInfo GetScreenInfo(gfx::ViewHandle window) {
-  // This should call GetScreenInfoHelper, which should be implemented in
-  // webkit_glue_gtk.cc
-  NOTIMPLEMENTED();
-  return ScreenInfo();
+  return GetScreenInfoHelper(window);
 }
 
 }  // namespace webkit_glue
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index 1b93d9c..9583664 100644
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -115,7 +115,7 @@ void TestWebViewDelegate::SetWindowRect(WebWidget* webwidget,
     GtkWidget* window =
         gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
     gtk_window_resize(GTK_WINDOW(window), rect.width(), rect.height());
-    gtk_window_move(GTK_WINDOW(window), rect.x(), -rect.y());
+    gtk_window_move(GTK_WINDOW(window), rect.x(), rect.y());
   }
 }