Zoom Extension API (content changes)

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index df91a8dd4bab0c55b6f3f817be1c8846270d1c0c..306bae2400050da609c3e068419e35710f4c5beb 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -180,10 +180,10 @@ class RenderViewZoomer : public RenderViewVisitor {
  public:
   RenderViewZoomer(const std::string& scheme,
                    const std::string& host,
-                   double zoom_level) : scheme_(scheme),
-                                        host_(host),
-                                        zoom_level_(zoom_level) {
-  }
+                   double zoom_level)

[Fady Samuel, 2014/06/12 18:49:48]

Unnecessary change. Please revert to avoid code churn.

[wjmaclean, 2014/06/12 19:35:27]

Done.

+      : scheme_(scheme),
+        host_(host),
+        zoom_level_(zoom_level) {}
 
   virtual bool Visit(RenderView* render_view) OVERRIDE {
     WebView* webview = render_view->GetWebView();
@@ -196,7 +196,9 @@ class RenderViewZoomer : public RenderViewVisitor {
     GURL url(document.url());
     // Empty scheme works as wildcard that matches any scheme,
     if ((net::GetHostOrSpecFromURL(url) == host_) &&
-        (scheme_.empty() || scheme_ == url.scheme())) {
+        (scheme_.empty() || scheme_ == url.scheme()) &&
+        !static_cast<RenderViewImpl*>(render_view)
+             ->uses_temporary_zoom_level()) {
       webview->hidePopups();
       webview->setZoomLevel(zoom_level_);
     }
@@ -1193,9 +1195,10 @@ void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() {
   notify_webkit_of_modal_loop_ = false;
 }
 
-void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme,
-                                                   const std::string& host,
-                                                   double zoom_level) {
+void RenderThreadImpl::OnSetZoomLevelForCurrentURL(

[Fady Samuel, 2014/06/12 18:49:48]

Unnecessary change, please revert to avoid code churn.

[wjmaclean, 2014/06/12 19:35:53]

Done.

+    const std::string& scheme,
+    const std::string& host,
+    double zoom_level) {
   RenderViewZoomer zoomer(scheme, host, zoom_level);
   RenderView::ForEach(&zoomer);
 }