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

Unified Diff: content/renderer/render_view_impl.cc

Issue 10828143: Zoom level limits must be set before setting a zoom level. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 4 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_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index cfb3ada08d825a33fa95df0bcf754b4979ad2be5..f6b4982db4c5308729af05dcc1832098440abe6c 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1416,6 +1416,13 @@ void RenderViewImpl::UpdateURL(WebFrame* frame) {
if (!frame->parent()) {
// Top-level navigation.
+ // Reset the zoom limits in case a plugin had changed them previously. This
+ // will also call us back which will cause us to send a message to
+ // update WebContentsImpl.
+ webview()->zoomLimitsChanged(
+ WebView::zoomFactorToZoomLevel(content::kMinimumZoomFactor),
+ WebView::zoomFactorToZoomLevel(content::kMaximumZoomFactor));
+
// Set zoom level, but don't do it for full-page plugin since they don't use
// the same zoom settings.
HostZoomLevels::iterator host_zoom =
@@ -1435,13 +1442,6 @@ void RenderViewImpl::UpdateURL(WebFrame* frame) {
host_zoom_levels_.erase(host_zoom);
}
- // Reset the zoom limits in case a plugin had changed them previously. This
- // will also call us back which will cause us to send a message to
- // update WebContentsImpl.
- webview()->zoomLimitsChanged(
- WebView::zoomFactorToZoomLevel(content::kMinimumZoomFactor),
- WebView::zoomFactorToZoomLevel(content::kMaximumZoomFactor));
-
// Update contents MIME type for main frame.
params.contents_mime_type = ds->response().mimeType().utf8();
« content/renderer/render_view_browsertest.cc ('K') | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698