From a9ad783bcaf81b371643dce9b145eb1f3df9c439 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 29 May 2015 13:52:14 +0800 Subject: [PATCH] The ElementSizeChanged has been removed --- atom/browser/api/atom_api_web_contents.cc | 11 ----------- atom/browser/api/atom_api_web_contents.h | 5 ----- 2 files changed, 16 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index d6f934525e..cfc8304d06 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -112,7 +112,6 @@ content::ServiceWorkerContext* GetServiceWorkerContext( WebContents::WebContents(content::WebContents* web_contents) : content::WebContentsObserver(web_contents), guest_instance_id_(-1), - element_instance_id_(-1), guest_opaque_(true), guest_host_(nullptr), auto_size_enabled_(false), @@ -121,7 +120,6 @@ WebContents::WebContents(content::WebContents* web_contents) WebContents::WebContents(const mate::Dictionary& options) : guest_instance_id_(-1), - element_instance_id_(-1), guest_opaque_(true), guest_host_(nullptr), auto_size_enabled_(false), @@ -450,14 +448,6 @@ void WebContents::DidAttach(int guest_proxy_routing_id) { Emit("did-attach"); } -void WebContents::ElementSizeChanged(const gfx::Size& size) { - element_size_ = size; - - // Only resize if needed. - if (!size.IsEmpty()) - guest_host_->SizeContents(size); -} - content::WebContents* WebContents::GetOwnerWebContents() const { return embedder_web_contents_; } @@ -477,7 +467,6 @@ void WebContents::WillAttach(content::WebContents* embedder_web_contents, int element_instance_id, bool is_full_page_plugin) { embedder_web_contents_ = embedder_web_contents; - element_instance_id_ = element_instance_id; is_full_page_plugin_ = is_full_page_plugin; } diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index 63248fd02a..062831577a 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -211,7 +211,6 @@ class WebContents : public mate::EventEmitter, // content::BrowserPluginGuestDelegate: void DidAttach(int guest_proxy_routing_id) final; - void ElementSizeChanged(const gfx::Size& size) final; content::WebContents* GetOwnerWebContents() const final; void GuestSizeChanged(const gfx::Size& new_size) final; void SetGuestHost(content::GuestHost* guest_host) final; @@ -249,10 +248,6 @@ class WebContents : public mate::EventEmitter, // Unique ID for a guest WebContents. int guest_instance_id_; - // |element_instance_id_| is an identifer that's unique to a particular - // element. - int element_instance_id_; - // Stores whether the contents of the guest can be transparent. bool guest_opaque_;