Fix page zoom for plug-in documents (PDF, etc.)

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
===================================================================
--- content/renderer/render_view_impl.cc	(revision 113821)
+++ content/renderer/render_view_impl.cc	(working copy)
@@ -3706,11 +3706,6 @@
 }
 
 void RenderViewImpl::OnSetZoomLevel(double zoom_level) {
-  // Don't set zoom level for full-page plugin since they don't use the same
-  // zoom settings.
-  if (webview()->mainFrame()->document().isPluginDocument())
-    return;
-
   webview()->hidePopups();
   webview()->setZoomLevel(false, zoom_level);
   zoomLevelChanged();
@@ -3920,6 +3915,7 @@
 
 void RenderViewImpl::OnSetRendererPrefs(
     const content::RendererPreferences& renderer_prefs) {
+  double old_zoom_level = renderer_preferences_.default_zoom_level;
   renderer_preferences_ = renderer_prefs;
   UpdateFontRenderingFromRendererPrefs();
 #if defined(TOOLKIT_USES_GTK)
@@ -3944,6 +3940,13 @@
     webview()->themeChanged();
   }
 #endif
+  // If the zoom level for this page matches the old zoom default, and this
+  // is not a plugin, update the zoom level to match the new default.
+  if (webview() && !webview()->mainFrame()->document().isPluginDocument() &&
+      content::ZoomValuesEqual(webview()->zoomLevel(), old_zoom_level)) {
+    webview()->setZoomLevel(false, renderer_preferences_.default_zoom_level);
+    zoomLevelChanged();
+  }
 }
 
 void RenderViewImpl::OnMediaPlayerActionAt(const gfx::Point& location,