Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: Source/WebKit/chromium/src/PlatformBridge.cpp

Issue 6955016: Merge 85823 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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)
« no previous file with comments | « Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp ('k') | Source/WebKit/chromium/src/StorageNamespaceProxy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698