Add scheme to HostZoomMap

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 8f7cf3862cb2d7df5035b05b5df80603a6765f58..ab983a2478c0cd3420260247b0e901b8baa6df19 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -141,8 +141,10 @@ base::LazyInstance<base::ThreadLocalPointer<RenderThreadImpl> >
 
 class RenderViewZoomer : public RenderViewVisitor {
  public:
-  RenderViewZoomer(const std::string& host, double zoom_level)
-      : host_(host), zoom_level_(zoom_level) {
+  RenderViewZoomer(const std::string& scheme,
+      const std::string& host,
+      double zoom_level)
+      : scheme_(scheme), host_(host), zoom_level_(zoom_level) {
   }
 
   virtual bool Visit(RenderView* render_view) {
@@ -153,13 +155,15 @@ class RenderViewZoomer : public RenderViewVisitor {
     // zoom settings.
     if (document.isPluginDocument())
       return true;
-
-    if (net::GetHostOrSpecFromURL(GURL(document.url())) == host_)
+    GURL url(document.url());
+    if ((net::GetHostOrSpecFromURL(url) == host_) &&
+         (scheme_.empty() || scheme_ == url.scheme()))

[Nikita (slow), 2013/01/11 15:23:55]

nit: move one space left

[Denis Kuznetsov (DE-MUC), 2013/01/11 15:48:59]

Done.

       webview->setZoomLevel(false, zoom_level_);

[Nikita (slow), 2013/01/11 15:23:55]

nit: add {}

[Denis Kuznetsov (DE-MUC), 2013/01/11 15:48:59]

Done.

     return true;
   }
 
  private:
+  std::string scheme_;
   std::string host_;
   double zoom_level_;
 
@@ -1006,9 +1010,10 @@ void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() {
   notify_webkit_of_modal_loop_ = false;
 }
 
-void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& host,
+void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& scheme,
+                                                   const std::string& host,
                                                    double zoom_level) {
-  RenderViewZoomer zoomer(host, zoom_level);
+  RenderViewZoomer zoomer(scheme, host, zoom_level);
   RenderView::ForEach(&zoomer);
 }