commit b75b829359b4b432d0462ab5011542f99f2021a5
author jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Oct 01 07:28:25 2010
committer jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Oct 01 07:28:25 2010
tree 564389d8698b140e97918a4cefd7ad18c7c99e7f
parent 3ec5d92cbba6b7b13ead81ebfd9e3c202fae001d

Chrome side of consolidating zoom code for pepper plugins (i.e. pdf) and the rest of Chrome.  Allows plugins to have different zoom ranges, and also to update zoom on its own.
Review URL: http://codereview.chromium.org/3419023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61153 0039d316-1c4b-4281-b951-d872f2087c98

chrome/renderer/render_thread.cc

diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index be4cac6..0c37652f 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -78,6 +78,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebColor.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFontCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
@@ -188,21 +189,31 @@
 
 class RenderViewZoomer : public RenderViewVisitor {
  public:
-  RenderViewZoomer(const GURL& url, int zoom_level)
+  RenderViewZoomer(const GURL& url, double zoom_level)
       : zoom_level_(zoom_level) {
     host_ = net::GetHostOrSpecFromURL(url);
   }
 
   virtual bool Visit(RenderView* render_view) {
     WebView* webview = render_view->webview();  // Guaranteed non-NULL.
+
+    // Don't set zoom level for full-page plugin since they don't use the same
+    // zoom settings.
+    if (webview->mainFrame()->document().isPluginDocument())
+      return true;
+
     if (net::GetHostOrSpecFromURL(GURL(webview->mainFrame()->url())) == host_)
+#ifdef ZOOM_LEVEL_IS_DOUBLE
       webview->setZoomLevel(false, zoom_level_);
+#else
+      webview->setZoomLevel(false, static_cast<int>(zoom_level_));
+#endif
     return true;
   }
 
  private:
   std::string host_;
-  int zoom_level_;
+  double zoom_level_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewZoomer);
 };
@@ -506,7 +517,7 @@
 }
 
 void RenderThread::OnSetZoomLevelForCurrentURL(const GURL& url,
-                                               int zoom_level) {
+                                               double zoom_level) {
   RenderViewZoomer zoomer(url, zoom_level);
   RenderView::ForEach(&zoomer);
 }