Add scheme to HostZoomMap

content/browser/host_zoom_map_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cmath>
 
 #include "content/browser/host_zoom_map_impl.h"
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
@@ skipping 36 matching lines @@
 
 void HostZoomMapImpl::CopyFrom(HostZoomMap* copy_interface) {
   // This can only be called on the UI thread to avoid deadlocks, otherwise
   //   UI: a.CopyFrom(b);
   //   IO: b.CopyFrom(a);
   // can deadlock.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   HostZoomMapImpl* copy = static_cast<HostZoomMapImpl*>(copy_interface);
   base::AutoLock auto_lock(lock_);
   base::AutoLock copy_auto_lock(copy->lock_);
-  for (HostZoomLevels::const_iterator i(copy->host_zoom_levels_.begin());
-       i != copy->host_zoom_levels_.end(); ++i) {
-    host_zoom_levels_[i->first] = i->second;
+  host_zoom_levels_.
+      insert(copy->host_zoom_levels_.begin(), copy->host_zoom_levels_.end());
+  for (SchemeHostZoomLevels::const_iterator i(copy->
+           scheme_host_zoom_levels_.begin());
+       i != copy->scheme_host_zoom_levels_.end(); ++i) {
+    scheme_host_zoom_levels_[i->first] = HostZoomLevels();
+    scheme_host_zoom_levels_[i->first].
+        insert(i->second.begin(), i->second.end());
   }
   default_zoom_level_ = copy->default_zoom_level_;
 }
 
-double HostZoomMapImpl::GetZoomLevel(const std::string& host) const {
+double HostZoomMapImpl::GetZoomLevel(const std::string& scheme,
+                                     const std::string& host) const {
   base::AutoLock auto_lock(lock_);
+
+  SchemeHostZoomLevels::const_iterator scheme_iterator(
+      scheme_host_zoom_levels_.find(scheme));
+  if (scheme_iterator != scheme_host_zoom_levels_.end()) {
+    HostZoomLevels::const_iterator i(scheme_iterator->second.find(host));
+    if (i != scheme_iterator->second.end())
+      return i->second;
+  }
+
   HostZoomLevels::const_iterator i(host_zoom_levels_.find(host));
   return (i == host_zoom_levels_.end()) ? default_zoom_level_ : i->second;
 }
 
-void HostZoomMapImpl::SetZoomLevel(const std::string& host, double level) {
+
+void HostZoomMapImpl::SetZoomLevel(const std::string& scheme,
+                                   const std::string& host,
+                                   double level) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
   {
     base::AutoLock auto_lock(lock_);
-
-    if (ZoomValuesEqual(level, default_zoom_level_))
-      host_zoom_levels_.erase(host);
-    else
-      host_zoom_levels_[host] = level;
+    if (!scheme.empty()) {
+      scheme_host_zoom_levels_[scheme][host] = level;
+    } else {
+      if (ZoomValuesEqual(level, default_zoom_level_))
+        host_zoom_levels_.erase(host);
+      else
+        host_zoom_levels_[host] = level;
+    }
   }
 
   // Notify renderers from this browser context.
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     RenderProcessHost* render_process_host = i.GetCurrentValue();
     if (HostZoomMap::GetForBrowserContext(
             render_process_host->GetBrowserContext()) == this) {
       render_process_host->Send(
-          new ViewMsg_SetZoomLevelForCurrentURL(host, level));
+          new ViewMsg_SetZoomLevelForCurrentURL(scheme, host, level));
     }
   }
 
   NotificationService::current()->Notify(
       NOTIFICATION_ZOOM_LEVEL_CHANGED,
       Source<HostZoomMap>(this),
       Details<const std::string>(&host));
 }
 
 double HostZoomMapImpl::GetDefaultZoomLevel() const {
@@ skipping 73 matching lines @@
     }
     default:
       NOTREACHED() << "Unexpected preference observed.";
   }
 }
 
 HostZoomMapImpl::~HostZoomMapImpl() {
 }
 
 }  // namespace content