Reset embedder_zoom_controller_ before assigning new one

asd281533890 · Dec 1, 2017 · dadfbd3 · dadfbd3
1 parent fd7af5c
commit dadfbd3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/atom/browser/web_view_guest_delegate.cc b/atom/browser/web_view_guest_delegate.cc
@@ -41,10 +41,7 @@ void WebViewGuestDelegate::Initialize(api::WebContents* api_web_contents) {
 
 void WebViewGuestDelegate::Destroy() {
   // Give the content module an opportunity to perform some cleanup.
-  if (embedder_zoom_controller_) {
-    embedder_zoom_controller_->RemoveObserver(this);
-    embedder_zoom_controller_ = nullptr;
-  }
+  ResetZoomController();
   guest_host_->WillDestroy();
   guest_host_ = nullptr;
 }
@@ -113,11 +110,15 @@ void WebViewGuestDelegate::DidFinishNavigation(
 
 void WebViewGuestDelegate::DidDetach() {
   attached_ = false;
+  ResetZoomController();
 }
 
 void WebViewGuestDelegate::DidAttach(int guest_proxy_routing_id) {
   attached_ = true;
   api_web_contents_->Emit("did-attach");
+
+  ResetZoomController();
+
   embedder_zoom_controller_ =
       WebContentsZoomController::FromWebContents(embedder_web_contents_);
   auto zoom_controller = api_web_contents_->GetZoomController();
@@ -183,6 +184,13 @@ gfx::Size WebViewGuestDelegate::GetDefaultSize() const {
   }
 }
 
+void WebViewGuestDelegate::ResetZoomController() {
+  if (embedder_zoom_controller_) {
+    embedder_zoom_controller_->RemoveObserver(this);
+    embedder_zoom_controller_ = nullptr;
+  }
+}
+
 bool WebViewGuestDelegate::CanBeEmbeddedInsideCrossProcessFrames() {
   return true;
 }

diff --git a/atom/browser/web_view_guest_delegate.h b/atom/browser/web_view_guest_delegate.h
@@ -88,6 +88,8 @@ class WebViewGuestDelegate : public content::BrowserPluginGuestDelegate,
   // Returns the default size of the guestview.
   gfx::Size GetDefaultSize() const;
 
+  void ResetZoomController();
+
   // The WebContents that attaches this guest view.
   content::WebContents* embedder_web_contents_ = nullptr;