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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 663203002: Force reset of RenderViewImpl zoom level. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 3ac2863ba6f89e37d5876d64acf65d9d85f389ed..53abbcb4f01c64d0f152560067cebff7629bb3a6 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3374,8 +3374,13 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(blink::WebFrame* frame) {
// Reset the zoom levels for plugins.
render_view_->webview()->setZoomLevel(0);
} else {
- if (host_zoom != render_view_->host_zoom_levels_.end())
+ if (host_zoom != render_view_->host_zoom_levels_.end()) {
render_view_->webview()->setZoomLevel(host_zoom->second);
+ } else {
+ // If the url was not found, we need to reset in case we are re-using
+ // an existing RenderViewImpl, e.g. to show a network error page.
+ render_view_->webview()->setZoomLevel(0);
+ }
}
if (host_zoom != render_view_->host_zoom_levels_.end()) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698