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

webkit/glue/chromium_bridge_impl.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.
 
 #include "config.h"
 #include "ChromiumBridge.h"
 
 #include "BitmapImage.h"
 #include "Cursor.h"
 #include "Frame.h"
@@ skipping 29 matching lines @@
 #include "webkit/glue/webplugin_impl.h"
 #include "webkit/glue/webview_impl.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <vssym32.h>
 #include "base/gfx/native_theme.h"
 #endif
 
 using WebKit::WebCursorInfo;
+using WebKit::WebWidgetClient;
 
 namespace {
 
 gfx::NativeViewId ToNativeId(WebCore::Widget* widget) {
   if (!widget)
     return 0;
   return widget->root()->hostWindow()->platformWindow();
 }
 
 ChromeClientImpl* ToChromeClient(WebCore::Widget* widget) {
   WebCore::FrameView* view;
   if (widget->isFrameView()) {
     view = static_cast<WebCore::FrameView*>(widget);
   } else if (widget->parent() && widget->parent()->isFrameView()) {
     view = static_cast<WebCore::FrameView*>(widget->parent());
   } else {
     return NULL;
   }
 
   WebCore::Page* page = view->frame() ? view->frame()->page() : NULL;
   if (!page)
     return NULL;
 
   return static_cast<ChromeClientImpl*>(page->chrome()->client());
 }
 
-WebViewImpl* ToWebView(WebCore::Widget* widget) {
+WebWidgetClient* ToWebWidgetClient(WebCore::Widget* widget) {
   ChromeClientImpl* chrome_client = ToChromeClient(widget);
-  if (!chrome_client)
+  if (!chrome_client || !chrome_client->webview())
     return NULL;
-  return chrome_client->webview();
+  return chrome_client->webview()->delegate();
 }
 
 WebCore::IntRect ToIntRect(const WebKit::WebRect& input) {
   return WebCore::IntRect(input.x, input.y, input.width, input.height);
 }
 
 }  // namespace
 
 namespace WebCore {
 
 // JavaScript -----------------------------------------------------------------
 
 void ChromiumBridge::notifyJSOutOfMemory(Frame* frame) {
   if (!frame)
     return;
 
   // Dispatch to the delegate of the view that owns the frame.
-  WebFrame* webframe = WebFrameImpl::FromFrame(frame);
-  WebView* webview = webframe->GetView();
-  if (!webview)
+  WebViewImpl* webview = WebFrameImpl::FromFrame(frame)->GetWebViewImpl();
+  if (!webview || !webview->delegate())
     return;
-  WebViewDelegate* delegate = webview->GetDelegate();
-  if (!delegate)
-    return;
-  delegate->JSOutOfMemory();
+  webview->delegate()->JSOutOfMemory();
 }
 
 // Plugin ---------------------------------------------------------------------
 
 NPObject* ChromiumBridge::pluginScriptableObject(Widget* widget) {
   if (!widget)
     return NULL;
 
   // NOTE:  We have to trust that the widget passed to us here is a
   // WebPluginImpl.  There isn't a way to dynamically verify it, since the
@@ skipping 15 matching lines @@
 // Protocol -------------------------------------------------------------------
 
 String ChromiumBridge::uiResourceProtocol() {
   return webkit_glue::StdStringToString(webkit_glue::GetUIResourceProtocol());
 }
 
 
 // Screen ---------------------------------------------------------------------
 
 int ChromiumBridge::screenDepth(Widget* widget) {
-  WebViewImpl* view = ToWebView(widget);
-  if (!view || !view->delegate())
-    return NULL;
-  return view->delegate()->GetScreenInfo(view).depth;
+  WebWidgetClient* client = ToWebWidgetClient(widget);
+  if (!client)
+    return 0;
+  return client->screenInfo().depth;
 }
 
 int ChromiumBridge::screenDepthPerComponent(Widget* widget) {
-  WebViewImpl* view = ToWebView(widget);
-  if (!view || !view->delegate())
-    return NULL;
-  return view->delegate()->GetScreenInfo(view).depthPerComponent;
+  WebWidgetClient* client = ToWebWidgetClient(widget);
+  if (!client)
+    return 0;
+  return client->screenInfo().depthPerComponent;
 }
 
 bool ChromiumBridge::screenIsMonochrome(Widget* widget) {
-  WebViewImpl* view = ToWebView(widget);
-  if (!view || !view->delegate())
-    return NULL;
-  return view->delegate()->GetScreenInfo(view).isMonochrome;
+  WebWidgetClient* client = ToWebWidgetClient(widget);
+  if (!client)
+    return false;
+  return client->screenInfo().isMonochrome;
 }
 
 IntRect ChromiumBridge::screenRect(Widget* widget) {
-  WebViewImpl* view = ToWebView(widget);
-  if (!view || !view->delegate())
+  WebWidgetClient* client = ToWebWidgetClient(widget);
+  if (!client)
     return IntRect();
-  return ToIntRect(view->delegate()->GetScreenInfo(view).rect);
+  return ToIntRect(client->screenInfo().rect);
 }
 
 IntRect ChromiumBridge::screenAvailableRect(Widget* widget) {
-  WebViewImpl* view = ToWebView(widget);
-  if (!view || !view->delegate())
+  WebWidgetClient* client = ToWebWidgetClient(widget);
+  if (!client)
     return IntRect();
-  return ToIntRect(view->delegate()->GetScreenInfo(view).availableRect);
+  return ToIntRect(client->screenInfo().availableRect);
 }
 
 // Widget ---------------------------------------------------------------------
 
 void ChromiumBridge::widgetSetCursor(Widget* widget, const Cursor& cursor) {
   ChromeClientImpl* chrome_client = ToChromeClient(widget);
   if (chrome_client)
     chrome_client->SetCursor(webkit_glue::CursorToWebCursorInfo(cursor));
 }
 
 void ChromiumBridge::widgetSetFocus(Widget* widget) {
   ChromeClientImpl* chrome_client = ToChromeClient(widget);
   if (chrome_client)
     chrome_client->focus();
 }
 
 }  // namespace WebCore