Merge 85823

Source/WebKit/chromium/src/PlatformBridge.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 86 matching lines @@
 
 #include "Worker.h"
 #include "WorkerContextProxy.h"
 #include <wtf/Assertions.h>
 
 // We are part of the WebKit implementation.
 using namespace WebKit;
 
 namespace WebCore {
 
-static ChromeClientImpl* toChromeClientImpl(Widget* widget)
+static WebWidgetClient* toWebWidgetClient(Widget* widget)
 {
     if (!widget)
         return 0;
 
     FrameView* view;
     if (widget->isFrameView())
         view = static_cast<FrameView*>(widget);
     else if (widget->parent() && widget->parent()->isFrameView())
         view = static_cast<FrameView*>(widget->parent());
     else
         return 0;
 
     Page* page = view->frame() ? view->frame()->page() : 0;
     if (!page)
         return 0;
 
-    return static_cast<ChromeClientImpl*>(page->chrome()->client());
-}
+    void* webView = page->chrome()->client()->webView();
+    if (!webView)
+        return 0;
 
-static WebWidgetClient* toWebWidgetClient(Widget* widget)
-{
-    ChromeClientImpl* chromeClientImpl = toChromeClientImpl(widget);
-    if (!chromeClientImpl || !chromeClientImpl->webView())
-        return 0;
-    return chromeClientImpl->webView()->client();
+    return static_cast<WebViewImpl*>(webView)->client();
 }
 
 static WebCookieJar* getCookieJar(const Document* document)
 {
     WebFrameImpl* frameImpl = WebFrameImpl::fromFrame(document->frame());
     if (!frameImpl || !frameImpl->client())
         return 0;
     WebCookieJar* cookieJar = frameImpl->client()->cookieJar(frameImpl);
     if (!cookieJar)
         cookieJar = webKitClient()->cookieJar();
@@ skipping 904 matching lines @@
     // FIXME: Give the embedder a way to control this.
     return false;
 }
 
 WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
 {
     return WebWorkerClientImpl::createWorkerContextProxy(worker);
 }
 
 } // namespace WebCore