Add ZoomController to manager zoom changes for webcontents

atom/browser/api/atom_api_web_contents.cc

@@ -22,6 +22,7 @@
 #include "atom/browser/ui/drag_util.h"
 #include "atom/browser/web_contents_permission_helper.h"
 #include "atom/browser/web_contents_preferences.h"
+#include "atom/browser/web_contents_zoom_controller.h"
 #include "atom/browser/web_view_guest_delegate.h"
 #include "atom/common/api/api_messages.h"
 #include "atom/common/api/event_emitter_caller.h"
@@ -49,7 +50,6 @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/favicon_status.h"
-#include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
@@ -68,7 +68,6 @@
 #include "content/public/common/context_menu_params.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
-#include "net/base/url_util.h"
 #include "net/url_request/url_request_context.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
@@ -249,13 +248,12 @@ WebContents::WebContents(v8::Isolate* isolate,
                          content::WebContents* web_contents,
                          Type type)
     : content::WebContentsObserver(web_contents),
+      zoom_controller_(nullptr),
       embedder_(nullptr),
       type_(type),
       request_id_(0),
       background_throttling_(true),
-      enable_devtools_(true),
-      zoom_factor_(content::kMinimumZoomFactor) {
-
+      enable_devtools_(true) {
   if (type == REMOTE) {
     web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
     Init(isolate);
@@ -268,17 +266,15 @@ WebContents::WebContents(v8::Isolate* isolate,
   }
 }
 
-WebContents::WebContents(v8::Isolate* isolate,
-                         const mate::Dictionary& options)
-    : embedder_(nullptr),
+WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
+    : zoom_controller_(nullptr),
+      embedder_(nullptr),
       type_(BROWSER_WINDOW),
       request_id_(0),
       background_throttling_(true),
-      enable_devtools_(true),
-      zoom_factor_(content::kMinimumZoomFactor) {
+      enable_devtools_(true) {
   // Read options.
   options.Get("backgroundThrottling", &background_throttling_);
-  options.Get("zoomFactor", &zoom_factor_);
 
   // FIXME(zcbenz): We should read "type" parameter for better design, but
   // on Windows we have encountered a compiler bug that if we read "type"
@@ -350,10 +346,16 @@ void WebContents::InitWithSessionAndOptions(v8::Isolate* isolate,
   // Save the preferences in C++.
   new WebContentsPreferences(web_contents, options);
 
-  // Intialize permission helper.
+  // Initialize permission helper.
   WebContentsPermissionHelper::CreateForWebContents(web_contents);
-  // Intialize security state client.
+  // Initialize security state client.
   SecurityStateTabHelper::CreateForWebContents(web_contents);
+  // Initialize zoom controller.
+  WebContentsZoomController::CreateForWebContents(web_contents);
+  zoom_controller_ = WebContentsZoomController::FromWebContents(web_contents);
+  double zoom_factor;
+  if (options.Get("zoomFactor", &zoom_factor))
+    zoom_controller_->SetDefaultZoomFactor(zoom_factor);
 
   web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());
 
@@ -738,8 +740,6 @@ void WebContents::DidFinishNavigation(
     auto url = navigation_handle->GetURL();
     bool is_in_page = navigation_handle->IsSamePage();
     if (is_main_frame && !is_in_page) {
-      // Set initial zoom factor if needed.
-      SetZoomFactorIfNeeded(url);
       Emit("did-navigate", url);
     } else if (is_in_page) {
       Emit("did-navigate-in-page", url, is_main_frame);
@@ -1506,20 +1506,11 @@ void WebContents::Invalidate() {
 }
 
 void WebContents::SetZoomLevel(double level) {
-  auto factor = content::ZoomLevelToZoomFactor(level);
-  if (!content::ZoomValuesEqual(zoom_factor_, factor)) {
-    content::NavigationEntry* entry =
-        web_contents()->GetController().GetLastCommittedEntry();
-    if (entry) {
-      std::string host = net::GetHostOrSpecFromURL(entry->GetURL());
-      host_zoom_factor_[host] = factor;
-    }
-  }
-  content::HostZoomMap::SetZoomLevel(web_contents(), level);
+  zoom_controller_->SetZoomLevel(level);
 }
 
 double WebContents::GetZoomLevel() {
-  return content::HostZoomMap::GetZoomLevel(web_contents());
+  return zoom_controller_->GetZoomLevel();
 }
 
 void WebContents::SetZoomFactor(double factor) {
@@ -1532,22 +1523,6 @@ double WebContents::GetZoomFactor() {
   return content::ZoomLevelToZoomFactor(level);
 }
 
-void WebContents::SetZoomFactorIfNeeded(const GURL& url) {
-  if (zoom_factor_ == content::kMinimumZoomFactor)
-    return;
-
-  std::string host = net::GetHostOrSpecFromURL(url);
-  double zoom_factor = zoom_factor_;
-  auto it = host_zoom_factor_.find(host);
-  if (it != host_zoom_factor_.end())
-    zoom_factor = it->second;
-  auto level = content::ZoomFactorToZoomLevel(zoom_factor);
-  if (content::ZoomValuesEqual(level, GetZoomLevel()))
-    return;
-
-  SetZoomLevel(level);
-}
-
 v8::Local<v8::Value> WebContents::GetWebPreferences(v8::Isolate* isolate) {
   WebContentsPreferences* web_preferences =
       WebContentsPreferences::FromWebContents(web_contents());

atom/browser/api/atom_api_web_contents.h

@@ -39,6 +39,7 @@ namespace atom {
 
 struct SetSizeParams;
 class AtomBrowserContext;
+class WebContentsZoomController;
 class WebViewGuestDelegate;
 
 namespace api {
@@ -206,6 +207,8 @@ class WebContents : public mate::TrackableObject<WebContents>,
   v8::Local<v8::Value> DevToolsWebContents(v8::Isolate* isolate);
   v8::Local<v8::Value> Debugger(v8::Isolate* isolate);
 
+  WebContentsZoomController* GetZoomController() { return zoom_controller_; }
+
  protected:
   WebContents(v8::Isolate* isolate,
               content::WebContents* web_contents,
@@ -349,20 +352,18 @@ class WebContents : public mate::TrackableObject<WebContents>,
                              const base::ListValue& args,
                              IPC::Message* message);
 
-  // Called after committing a navigation, to set the zoom
-  // factor.
-  void SetZoomFactorIfNeeded(const GURL& url);
-
   v8::Global<v8::Value> session_;
   v8::Global<v8::Value> devtools_web_contents_;
   v8::Global<v8::Value> debugger_;
 
   std::unique_ptr<WebViewGuestDelegate> guest_delegate_;
-  std::map<std::string, double> host_zoom_factor_;
 
   // The host webcontents that may contain this webcontents.
   WebContents* embedder_;
 
+  // The zoom controller for this webContents.
+  WebContentsZoomController* zoom_controller_;
+
   // The type of current WebContents.
   Type type_;
 
@@ -375,9 +376,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
   // Whether to enable devtools.
   bool enable_devtools_;
 
-  // Initial zoom factor.
-  double zoom_factor_;
-
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };
 

atom/browser/api/atom_api_web_view_manager.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "atom/browser/web_contents_preferences.h"
+#include "atom/browser/web_contents_zoom_controller.h"
 #include "atom/browser/web_view_manager.h"
 #include "atom/common/native_mate_converters/content_converter.h"
 #include "atom/common/native_mate_converters/value_converter.h"
@@ -24,6 +25,12 @@ void AddGuest(int guest_instance_id,
     manager->AddGuest(guest_instance_id, element_instance_id, embedder,
                       guest_web_contents);
 
+  double zoom_factor;
+  if (options.GetDouble("zoomFactor", &zoom_factor)) {
+    atom::WebContentsZoomController::FromWebContents(guest_web_contents)
+        ->SetDefaultZoomFactor(zoom_factor);
+  }
+
   WebContentsPreferences::FromWebContents(guest_web_contents)->Merge(options);
 }