Check temporary zoom status when sending zoom level in navigation.

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 "content/browser/host_zoom_map_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/strings/string_piece.h"
@@ skipping 118 matching lines @@
        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::GetZoomLevelForHost(const std::string& host) const {
   base::AutoLock auto_lock(lock_);
+  return GetZoomLevelForHostInternal(host);
+}
+
+double HostZoomMapImpl::GetZoomLevelForHostInternal(
+    const std::string& host) const {
   HostZoomLevels::const_iterator i(host_zoom_levels_.find(host));
   return (i == host_zoom_levels_.end()) ? default_zoom_level_ : i->second;
 }
 
 bool HostZoomMapImpl::HasZoomLevel(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));
 
   const HostZoomLevels& zoom_levels =
       (scheme_iterator != scheme_host_zoom_levels_.end())
           ? scheme_iterator->second
           : host_zoom_levels_;
 
   HostZoomLevels::const_iterator i(zoom_levels.find(host));
   return i != zoom_levels.end();
 }
 
+double HostZoomMapImpl::GetZoomLevelForHostAndSchemeInternal(
+    const std::string& scheme,
+    const std::string& host) const {
+  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;
+  }
+
+  return GetZoomLevelForHostInternal(host);
+}
+
 double HostZoomMapImpl::GetZoomLevelForHostAndScheme(
     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;
-    }
-  }
-  return GetZoomLevelForHost(host);
+  base::AutoLock auto_lock(lock_);
+  return GetZoomLevelForHostAndSchemeInternal(scheme, host);
 }
 
 HostZoomMap::ZoomLevelVector HostZoomMapImpl::GetAllZoomLevels() const {
   HostZoomMap::ZoomLevelVector result;
   {
     base::AutoLock auto_lock(lock_);
     result.reserve(host_zoom_levels_.size() + scheme_host_zoom_levels_.size());
     for (HostZoomLevels::const_iterator i = host_zoom_levels_.begin();
          i != host_zoom_levels_.end();
          ++i) {
@@ skipping 175 matching lines @@
   host->Send(new ViewMsg_SetZoomLevelForView(render_view_id, true, level));
 
   HostZoomMap::ZoomLevelChange change;
   change.mode = HostZoomMap::ZOOM_CHANGED_TEMPORARY_ZOOM;
   change.host = GetHostFromProcessView(render_process_id, render_view_id);
   change.zoom_level = level;
 
   zoom_level_changed_callbacks_.Notify(change);
 }
 
+double HostZoomMapImpl::GetZoomLevelForView(const GURL& url,
+                                            int render_process_id,
+                                            int render_view_id) const {
+  RenderViewKey key(render_process_id, render_view_id);
+  base::AutoLock auto_lock(lock_);
+
+  if (ContainsKey(temporary_zoom_levels_, key))
+    return temporary_zoom_levels_.find(key)->second;
+
+  return GetZoomLevelForHostAndSchemeInternal(url.scheme(),
+                                              net::GetHostOrSpecFromURL(url));
+}
+
 void HostZoomMapImpl::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   switch (type) {
     case NOTIFICATION_RENDER_VIEW_HOST_WILL_CLOSE_RENDER_VIEW: {
       int render_view_id = Source<RenderViewHost>(source)->GetRoutingID();
       int render_process_id =
           Source<RenderViewHost>(source)->GetProcess()->GetID();
       ClearTemporaryZoomLevel(render_process_id, render_view_id);
       break;
@@ skipping 46 matching lines @@
   double error_page_zoom_level = GetZoomLevelForHost(host);
 
   SendZoomLevelChange(std::string(), host, error_page_zoom_level);
 }
 
 HostZoomMapImpl::~HostZoomMapImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 }  // namespace content