mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

The ElementSizeChanged has been removed

Browse source
This commit is contained in:
Cheng Zhao 2015-05-29 13:52:14 +08:00
parent b5c9fe78f1
commit a9ad783bca
2 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/api/atom_api_web_contents.cc
View file

@ -112,7 +112,6 @@ content::ServiceWorkerContext* GetServiceWorkerContext(
WebContents::WebContents(content::WebContents* web_contents) WebContents::WebContents(content::WebContents* web_contents)
: content::WebContentsObserver(web_contents), : content::WebContentsObserver(web_contents),
guest_instance_id_(-1), guest_instance_id_(-1),
element_instance_id_(-1),
guest_opaque_(true), guest_opaque_(true),
guest_host_(nullptr), guest_host_(nullptr),
auto_size_enabled_(false), auto_size_enabled_(false),
@ -121,7 +120,6 @@ WebContents::WebContents(content::WebContents* web_contents)
WebContents::WebContents(const mate::Dictionary& options) WebContents::WebContents(const mate::Dictionary& options)
: guest_instance_id_(-1), : guest_instance_id_(-1),
element_instance_id_(-1),
guest_opaque_(true), guest_opaque_(true),
guest_host_(nullptr), guest_host_(nullptr),
auto_size_enabled_(false), auto_size_enabled_(false),
@ -450,14 +448,6 @@ void WebContents::DidAttach(int guest_proxy_routing_id) {
Emit("did-attach"); 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 { content::WebContents* WebContents::GetOwnerWebContents() const {
return embedder_web_contents_; return embedder_web_contents_;
} }
@ -477,7 +467,6 @@ void WebContents::WillAttach(content::WebContents* embedder_web_contents,
int element_instance_id, int element_instance_id,
bool is_full_page_plugin) { bool is_full_page_plugin) {
embedder_web_contents_ = embedder_web_contents; embedder_web_contents_ = embedder_web_contents;
element_instance_id_ = element_instance_id;
is_full_page_plugin_ = is_full_page_plugin; is_full_page_plugin_ = is_full_page_plugin;
} }

5
atom/browser/api/atom_api_web_contents.h
View file

@ -211,7 +211,6 @@ class WebContents : public mate::EventEmitter,
// content::BrowserPluginGuestDelegate: // content::BrowserPluginGuestDelegate:
void DidAttach(int guest_proxy_routing_id) final; void DidAttach(int guest_proxy_routing_id) final;
void ElementSizeChanged(const gfx::Size& size) final;
content::WebContents* GetOwnerWebContents() const final; content::WebContents* GetOwnerWebContents() const final;
void GuestSizeChanged(const gfx::Size& new_size) final; void GuestSizeChanged(const gfx::Size& new_size) final;
void SetGuestHost(content::GuestHost* guest_host) final; void SetGuestHost(content::GuestHost* guest_host) final;
@ -249,10 +248,6 @@ class WebContents : public mate::EventEmitter,
// Unique ID for a guest WebContents. // Unique ID for a guest WebContents.
int guest_instance_id_; 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. // Stores whether the contents of the guest can be transparent.
bool guest_opaque_; bool guest_opaque_;