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

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-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 "V8Proxy.h"
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
@@ skipping 25 matching lines @@
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebURLRequest.h"
 #include "webkit/api/public/WebURLResponse.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
-#include "webkit/glue/webwidget.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 
+using WebKit::WebNavigationPolicy;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebURLRequest;
 
 namespace {
 
 // Default timeout in ms for file page loads when in layout test mode.
 const int kDefaultFileTestTimeoutMillisecs = 10 * 1000;
 
 // Content area size for newly created windows.
@@ skipping 44 matching lines @@
       m_focusedWidgetHost(NULL),
 #if defined(OS_WIN)
       default_edit_wnd_proc_(0),
 #endif
       test_params_(NULL),
       test_is_preparing_(false),
       test_is_pending_(false),
       is_modal_(false),
       dump_stats_table_on_exit_(false) {
     delegate_ = new TestWebViewDelegate(this);
+    popup_delegate_ = new TestWebViewDelegate(this);
     layout_test_controller_.reset(new LayoutTestController(this));
     event_sending_controller_.reset(new EventSendingController(this));
     text_input_controller_.reset(new TextInputController(this));
     navigation_controller_.reset(new TestNavigationController(this));
 
     URLRequestFilter* filter = URLRequestFilter::GetInstance();
     filter->AddHostnameHandler("test-shell-resource", "inspector",
                                &URLRequestTestShellFileJob::InspectorFactory);
     url_util::AddStandardScheme("test-shell-resource");
 }
@@ skipping 115 matching lines @@
     }
     if (dumped_anything)
       printf("#EOF\n");
     fflush(stdout);
   }
 }
 
 // static
 std::string TestShell::DumpImage(WebView* view,
     const std::wstring& file_name, const std::string& pixel_hash) {
-  view->Layout();
-  const WebSize& size = view->GetSize();
+  view->layout();
+  const WebSize& size = view->size();
 
   skia::PlatformCanvas canvas;
   if (!canvas.initialize(size.width, size.height, true))
     return std::string();
-  view->Paint(&canvas, WebRect(0, 0, size.width, size.height));
+  view->paint(&canvas, WebRect(0, 0, size.width, size.height));
 
   skia::BitmapPlatformDevice& device =
       static_cast<skia::BitmapPlatformDevice&>(canvas.getTopPlatformDevice());
   const SkBitmap& src_bmp = device.accessBitmap(false);
 
   // Encode image.
   std::vector<unsigned char> png;
   SkAutoLockPixels src_bmp_lock(src_bmp);
   PNGEncoder::ColorFormat color_format = PNGEncoder::FORMAT_BGRA;
 
@@ skipping 160 matching lines @@
                 TestShell::windowList()->end(),
                 window);
   if (entry != TestShell::windowList()->end()) {
     TestShell::windowList()->erase(entry);
     return true;
   }
 
   return false;
 }
 
-void TestShell::Show(WebView* webview, WindowOpenDisposition disposition) {
-  delegate_->Show(webview, disposition);
+void TestShell::Show(WebNavigationPolicy policy) {
+  delegate_->show(policy);
 }
 
 void TestShell::BindJSObjectsToWindow(WebFrame* frame) {
   // Only bind the test classes if we're running tests.
   if (layout_test_mode_) {
     layout_test_controller_->BindToJavascript(frame, L"layoutTestController");
     event_sending_controller_->BindToJavascript(frame, L"eventSender");
     text_input_controller_->BindToJavascript(frame, L"textInputController");
   }
 }
@@ skipping 134 matching lines @@
     navigation_controller_->Reload();
 }
 
 void TestShell::SetFocus(WebWidgetHost* host, bool enable) {
   if (!layout_test_mode_) {
     InteractiveSetFocus(host, enable);
   } else {
     if (enable) {
       if (m_focusedWidgetHost != host) {
         if (m_focusedWidgetHost)
-            m_focusedWidgetHost->webwidget()->SetFocus(false);
-        host->webwidget()->SetFocus(enable);
+            m_focusedWidgetHost->webwidget()->setFocus(false);
+        host->webwidget()->setFocus(enable);
         m_focusedWidgetHost = host;
       }
     } else {
       if (m_focusedWidgetHost == host) {
-        host->webwidget()->SetFocus(enable);
+        host->webwidget()->setFocus(enable);
         m_focusedWidgetHost = NULL;
       }
     }
   }
 }
 
 //-----------------------------------------------------------------------------
 
 namespace webkit_glue {
 
@@ skipping 59 matching lines @@
 
 void CloseIdleConnections() {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 void SetCacheMode(bool enabled) {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 }  // namespace webkit_glue