Remove ViewMsg_SetZoomLevel

content/browser/host_zoom_map_impl.cc

Index: content/browser/host_zoom_map_impl.cc
diff --git a/content/browser/host_zoom_map_impl.cc b/content/browser/host_zoom_map_impl.cc
index 97a2ac7816d10a66751af9bc6f937313047db003..0f95bdbdb0b0e20a05ffbc09b0f6990baee31a3d 100644
--- a/content/browser/host_zoom_map_impl.cc
+++ b/content/browser/host_zoom_map_impl.cc
@@ -4,13 +4,16 @@
 
 #include "content/browser/host_zoom_map_impl.h"
 
+#include <algorithm>
 #include <cmath>
 
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
+#include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -34,6 +37,18 @@ HostZoomMap* HostZoomMap::GetForBrowserContext(BrowserContext* context) {
   return rv;
 }
 
+double HostZoomMap::GetZoomLevel(const WebContents* web_contents) {
+  HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>(
+      HostZoomMap::GetForBrowserContext(web_contents->GetBrowserContext()));
+  return host_zoom_map->GetZoomLevelForWebContents(*web_contents);
+}
+
+void HostZoomMap::SetZoomLevel(const WebContents* web_contents, double level) {
+  HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>(
+      HostZoomMap::GetForBrowserContext(web_contents->GetBrowserContext()));
+  host_zoom_map->SetZoomLevelForWebContents(*web_contents, level);
+}
+
 HostZoomMapImpl::HostZoomMapImpl()
     : default_zoom_level_(0.0) {
   registrar_.Add(
@@ -62,6 +77,27 @@ void HostZoomMapImpl::CopyFrom(HostZoomMap* copy_interface) {
   default_zoom_level_ = copy->default_zoom_level_;
 }
 
+double HostZoomMapImpl::GetZoomLevelForWebContents(
+    const WebContents& web_contents) const {
+  const WebContentsImpl& web_contents_impl =
+      static_cast<const WebContentsImpl&>(web_contents);
+  int render_process_id = web_contents_impl.GetRenderProcessHost()->GetID();
+  int routing_id = web_contents_impl.GetRenderViewHost()->GetRoutingID();
+
+  if (UsesTemporaryZoomLevel(render_process_id, routing_id)) {
+    return GetTemporaryZoomLevel(render_process_id, routing_id);
+  } else {
+    GURL url;
+    NavigationEntry* entry =
+        web_contents_impl.GetController().GetLastCommittedEntry();
+    // Since zoom map is updated using rewritten URL, use rewritten URL to get
+    // the zoom level.
+    url = entry ? entry->GetURL() : GURL::EmptyGURL();
+    return GetZoomLevelForHostAndScheme(url.scheme(),
+                                        net::GetHostOrSpecFromURL(url));
+  }
+}
+
 double HostZoomMapImpl::GetZoomLevelForHost(const std::string& host) const {
   base::AutoLock auto_lock(lock_);
   HostZoomLevels::const_iterator i(host_zoom_levels_.find(host));
@@ -120,6 +156,33 @@ HostZoomMap::ZoomLevelVector HostZoomMapImpl::GetAllZoomLevels() const {
   return result;
 }
 
+void HostZoomMapImpl::SetZoomLevelForWebContents(
+    const WebContents& web_contents,
+    double level) {
+  const WebContentsImpl& web_contents_impl =
+      static_cast<const WebContentsImpl&>(web_contents);
+  int render_process_id = web_contents_impl.GetRenderProcessHost()->GetID();
+  int render_view_id = web_contents_impl.GetRenderViewHost()->GetRoutingID();
+  if (UsesTemporaryZoomLevel(render_process_id, render_view_id)) {
+
+    SetTemporaryZoomLevel(render_process_id, render_view_id, level);
+  } else {
+    SetZoomLevelForHost(
+        net::GetHostOrSpecFromURL(web_contents_impl.GetLastCommittedURL()),
+        level);
+  }
+}
+
+void HostZoomMapImpl::SetZoomLevelForView(int render_process_id,
+                                          int render_view_id,
+                                          double level,
+                                          const std::string& host) {
+  if (UsesTemporaryZoomLevel(render_process_id, render_view_id))
+    SetTemporaryZoomLevel(render_process_id, render_view_id, level);
+  else
+    SetZoomLevelForHost(host, level);
+}
+
 void HostZoomMapImpl::SetZoomLevelForHost(const std::string& host,
                                           double level) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -194,6 +257,33 @@ HostZoomMapImpl::AddZoomLevelChangedCallback(
   return zoom_level_changed_callbacks_.Add(callback);
 }
 
+void HostZoomMapImpl::SetUsesTemporaryZoomLevel(
+    int render_process_id,
+    int render_view_id,
+    bool uses_temporary_zoom_settings) {
+  base::AutoLock auto_lock(lock_);
+  TemporaryZoomLevel zoom_level(
+      render_process_id, render_view_id, default_zoom_level_);
+  TemporaryZoomLevelList::iterator it = find(
+      temporary_zoom_levels_.begin(), temporary_zoom_levels_.end(), zoom_level);
+  if (uses_temporary_zoom_settings) {
+    if (it == temporary_zoom_levels_.end())
+      temporary_zoom_levels_.push_back(zoom_level);
+  } else {
+    if (it != temporary_zoom_levels_.end())
+      temporary_zoom_levels_.erase(it);
+  }
+}
+
+bool HostZoomMapImpl::UsesTemporaryZoomLevel(int render_process_id,
+                                             int render_view_id) const {
+  base::AutoLock auto_lock(lock_);
+  TemporaryZoomLevel zoom_level(render_process_id, render_view_id);
+  TemporaryZoomLevelList::const_iterator it = find(
+      temporary_zoom_levels_.begin(), temporary_zoom_levels_.end(), zoom_level);
+  return it != temporary_zoom_levels_.end();
+}
+
 double HostZoomMapImpl::GetTemporaryZoomLevel(int render_process_id,
                                               int render_view_id) const {
   base::AutoLock auto_lock(lock_);
@@ -227,10 +317,7 @@ void HostZoomMapImpl::SetTemporaryZoomLevel(int render_process_id,
     }
 
     if (level && i == temporary_zoom_levels_.size()) {
-      TemporaryZoomLevel temp;
-      temp.render_process_id = render_process_id;
-      temp.render_view_id = render_view_id;
-      temp.zoom_level = level;
+      TemporaryZoomLevel temp(render_process_id, render_view_id, level);
       temporary_zoom_levels_.push_back(temp);
     }
   }