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

Unified Diff: content/renderer/render_thread.cc

Issue 7242014: Update src/content/renderer to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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
« no previous file with comments | « content/renderer/notification_provider.cc ('k') | content/renderer/render_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread.cc
===================================================================
--- content/renderer/render_thread.cc (revision 90236)
+++ content/renderer/render_thread.cc (working copy)
@@ -83,6 +83,7 @@
#include "ipc/ipc_channel_posix.h"
#endif
+using WebKit::WebDocument;
using WebKit::WebFrame;
using WebKit::WebRuntimeFeatures;
using WebKit::WebScriptController;
@@ -106,14 +107,15 @@
}
virtual bool Visit(RenderView* render_view) {
- WebView* webview = render_view->webview(); // Guaranteed non-NULL.
+ WebView* webview = render_view->webview();
+ WebDocument document = webview->mainFrame()->document();
// Don't set zoom level for full-page plugin since they don't use the same
// zoom settings.
- if (webview->mainFrame()->document().isPluginDocument())
+ if (document.isPluginDocument())
return true;
- if (net::GetHostOrSpecFromURL(GURL(webview->mainFrame()->url())) == host_)
+ if (net::GetHostOrSpecFromURL(GURL(document.url())) == host_)
webview->setZoomLevel(false, zoom_level_);
return true;
}
« no previous file with comments | « content/renderer/notification_provider.cc ('k') | content/renderer/render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698