Use WebWidget from the WebKit API. This change also makes...

webkit/tools/test_shell/test_webview_delegate_gtk.cc

 // 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.
 
 // This file was forked off the Mac port.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
@@ skipping 14 matching lines @@
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/plugins/gtk_plugin_container_manager.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebCursorInfo;
+using WebKit::WebNavigationPolicy;
 using WebKit::WebRect;
 
 namespace {
 
 enum SelectionClipboardType {
   TEXT_HTML,
   PLAIN_TEXT,
 };
 
 GdkAtom GetTextHtmlAtom() {
@@ skipping 67 matching lines @@
 
 void TestWebViewDelegate::ShowJavaScriptAlert(const std::wstring& message) {
   GtkWidget* dialog = gtk_message_dialog_new(
       shell_->mainWnd(), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
       GTK_BUTTONS_OK, "%s", WideToUTF8(message).c_str());
   gtk_window_set_title(GTK_WINDOW(dialog), "JavaScript Alert");
   gtk_dialog_run(GTK_DIALOG(dialog));  // Runs a nested message loop.
   gtk_widget_destroy(dialog);
 }
 
-void TestWebViewDelegate::Show(WebWidget* webwidget,
-                               WindowOpenDisposition disposition) {
-  WebWidgetHost* host = GetHostForWidget(webwidget);
+void TestWebViewDelegate::show(WebNavigationPolicy policy) {
+  WebWidgetHost* host = GetWidgetHost();
   GtkWidget* drawing_area = host->view_handle();
   GtkWidget* window =
       gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
   gtk_widget_show_all(window);
 }
 
-void TestWebViewDelegate::CloseWidgetSoon(WebWidget* webwidget) {
-  if (webwidget == shell_->webView()) {
+void TestWebViewDelegate::closeWidgetSoon() {
+  if (this == shell_->delegate()) {
     MessageLoop::current()->PostTask(FROM_HERE, NewRunnableFunction(
         &gtk_widget_destroy, GTK_WIDGET(shell_->mainWnd())));
-  } else if (webwidget == shell_->popup()) {
+  } else if (this == shell_->popup_delegate()) {
     shell_->ClosePopup();
   }
 }
 
-void TestWebViewDelegate::SetCursor(WebWidget* webwidget,
-                                    const WebCursorInfo& cursor_info) {
+void TestWebViewDelegate::didChangeCursor(const WebCursorInfo& cursor_info) {
   current_cursor_.InitFromCursorInfo(cursor_info);
   GdkCursorType cursor_type = current_cursor_.GetCursorType();
   GdkCursor* gdk_cursor;
   if (cursor_type == GDK_CURSOR_IS_PIXMAP) {
     // TODO(port): WebKit bug https://bugs.webkit.org/show_bug.cgi?id=16388 is
     // that calling gdk_window_set_cursor repeatedly is expensive.  We should
     // avoid it here where possible.
     gdk_cursor = current_cursor_.GetCustomCursor();
   } else {
     // Optimize the common case, where the cursor hasn't changed.
     // However, we can switch between different pixmaps, so only on the
     // non-pixmap branch.
     if (cursor_type_ == cursor_type)
       return;
     if (cursor_type_ == GDK_LAST_CURSOR)
       gdk_cursor = NULL;
     else
       gdk_cursor = gdk_cursor_new(cursor_type);
   }
   cursor_type_ = cursor_type;
   gdk_window_set_cursor(shell_->webViewWnd()->window, gdk_cursor);
   // The window now owns the cursor.
   if (gdk_cursor)
     gdk_cursor_unref(gdk_cursor);
 }
 
-void TestWebViewDelegate::GetWindowRect(WebWidget* webwidget,
-                                        WebRect* out_rect) {
-  DCHECK(out_rect);
-  WebWidgetHost* host = GetHostForWidget(webwidget);
+WebRect TestWebViewDelegate::windowRect() {
+  WebWidgetHost* host = GetWidgetHost();
   GtkWidget* drawing_area = host->view_handle();
   GtkWidget* vbox = gtk_widget_get_parent(drawing_area);
   GtkWidget* window = gtk_widget_get_parent(vbox);
 
   gint x, y;
   gtk_window_get_position(GTK_WINDOW(window), &x, &y);
   x += vbox->allocation.x + drawing_area->allocation.x;
   y += vbox->allocation.y + drawing_area->allocation.y;
 
-  *out_rect = WebRect(x, y,
-                      drawing_area->allocation.width,
-                      drawing_area->allocation.height);
+  return WebRect(x, y,
+                 drawing_area->allocation.width,
+                 drawing_area->allocation.height);
 }
 
-void TestWebViewDelegate::SetWindowRect(WebWidget* webwidget,
-                                        const WebRect& rect) {
-  if (webwidget == shell_->webView()) {
+void TestWebViewDelegate::setWindowRect(const WebRect& rect) {
+  if (this == shell_->delegate()) {
     // ignored
-  } else if (webwidget == shell_->popup()) {
-    WebWidgetHost* host = GetHostForWidget(webwidget);
+  } else if (this == shell_->popup_delegate()) {
+    WebWidgetHost* host = GetWidgetHost();
     GtkWidget* drawing_area = host->view_handle();
     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);
   }
 }
 
-void TestWebViewDelegate::GetRootWindowRect(WebWidget* webwidget,
-                                            WebRect* out_rect) {
-  if (WebWidgetHost* host = GetHostForWidget(webwidget)) {
+WebRect TestWebViewDelegate::rootWindowRect() {
+  if (WebWidgetHost* host = GetWidgetHost()) {
     // We are being asked for the x/y and width/height of the entire browser
     // window.  This means the x/y is the distance from the corner of the
     // screen, and the width/height is the size of the entire browser window.
     // For example, this is used to implement window.screenX and window.screenY.
     GtkWidget* drawing_area = host->view_handle();
     GtkWidget* window =
         gtk_widget_get_parent(gtk_widget_get_parent(drawing_area));
     gint x, y, width, height;
     gtk_window_get_position(GTK_WINDOW(window), &x, &y);
     gtk_window_get_size(GTK_WINDOW(window), &width, &height);
-    *out_rect = WebRect(x, y, width, height);
+    return WebRect(x, y, width, height);
   }
+  return WebRect();
 }
 
-void TestWebViewDelegate::GetRootWindowResizerRect(WebWidget* webwidget,
-                                                   WebRect* out_rect) {
+WebRect TestWebViewDelegate::windowResizerRect() {
   // Not necessary on Linux.
-  *out_rect = WebRect();
+  return WebRect();
 }
 
-void TestWebViewDelegate::DidMove(WebWidget* webwidget,
-                                  const WebPluginGeometry& move) {
-  WebWidgetHost* host = GetHostForWidget(webwidget);
+void TestWebViewDelegate::DidMovePlugin(const WebPluginGeometry& move) {
+  WebWidgetHost* host = GetWidgetHost();
   GtkPluginContainerManager* plugin_container_manager =
       static_cast<WebViewHost*>(host)->plugin_container_manager();
   plugin_container_manager->MovePluginContainer(move);
 }
 
-void TestWebViewDelegate::RunModal(WebWidget* webwidget) {
+void TestWebViewDelegate::runModal() {
   NOTIMPLEMENTED();
 }
 
 void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
   if (is_empty_selection)
     return;
 
   GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
   // Put data on the X clipboard.  This doesn't actually grab the text from
   // the HTML, it just registers a callback for when someone tries to paste.
@@ skipping 14 matching lines @@
 // Private methods -----------------------------------------------------------
 
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   gtk_window_set_title(GTK_WINDOW(shell_->mainWnd()),
                        ("Test Shell - " + WideToUTF8(title)).c_str());
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   gtk_entry_set_text(GTK_ENTRY(shell_->editWnd()), url.spec().c_str());
 }