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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 287093002: Remove ViewMsg_SetZoomLevel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revised as per comments. Created 6 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: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index fe34eb1ce6215eb052ef4cbb10fe98778fc29879..7c8317ace76e46f4aaf6a43188d610f0d4bb2c7c 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2044,9 +2044,14 @@ void RenderFrameImpl::didCreateDocumentElement(blink::WebLocalFrame* frame) {
if (url.is_valid() && url.spec() != kAboutBlankURL) {
// TODO(nasko): Check if webview()->mainFrame() is the same as the
// frame->tree()->top().
- if (frame == render_view_->webview()->mainFrame()) {
+ blink::WebFrame* main_frame = render_view_->webview()->mainFrame();
+ if (frame == main_frame) {
+ // For now, don't remember plugin zoom values. We don't want to mix them
+ // with normal web content (i.e. a fixed layout plugin would usually want
+ // them different).
render_view_->Send(new ViewHostMsg_DocumentAvailableInMainFrame(
- render_view_->GetRoutingID()));
+ render_view_->GetRoutingID(),
+ main_frame->document().isPluginDocument()));
}
}

Powered by Google App Engine
This is Rietveld 408576698