Merge 85823

Source/WebKit/chromium/src/PlatformBridge.cpp

Index: Source/WebKit/chromium/src/PlatformBridge.cpp
===================================================================
--- Source/WebKit/chromium/src/PlatformBridge.cpp	(revision 85996)
+++ Source/WebKit/chromium/src/PlatformBridge.cpp	(working copy)
@@ -104,7 +104,7 @@
 
 namespace WebCore {
 
-static ChromeClientImpl* toChromeClientImpl(Widget* widget)
+static WebWidgetClient* toWebWidgetClient(Widget* widget)
 {
     if (!widget)
         return 0;
@@ -121,15 +121,11 @@
     if (!page)
         return 0;
 
-    return static_cast<ChromeClientImpl*>(page->chrome()->client());
-}
-
-static WebWidgetClient* toWebWidgetClient(Widget* widget)
-{
-    ChromeClientImpl* chromeClientImpl = toChromeClientImpl(widget);
-    if (!chromeClientImpl || !chromeClientImpl->webView())
+    void* webView = page->chrome()->client()->webView();
+    if (!webView)
         return 0;
-    return chromeClientImpl->webView()->client();
+
+    return static_cast<WebViewImpl*>(webView)->client();
 }
 
 static WebCookieJar* getCookieJar(const Document* document)