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

Fix content::BrowserPluginDelegate::DidResizeElement API changes.

Browse source 
Chromium has removed old_size in DidResizeElement interface as the 'old_size'
is internal.
This commit is contained in:
Haojian Wu 2015-08-04 17:07:31 +08:00 • committed by Cheng Zhao
parent 11ffb9dfb6
commit 0e8a585157
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/renderer/guest_view_container.cc
View file

@ -47,14 +47,12 @@ void GuestViewContainer::SetElementInstanceID(int element_instance_id) {
std::make_pair(element_instance_id, this)); std::make_pair(element_instance_id, this));
} }
void GuestViewContainer::DidResizeElement(const gfx::Size& old_size, void GuestViewContainer::DidResizeElement(const gfx::Size& new_size) {
const gfx::Size& new_size) {
if (element_resize_callback_.is_null()) if (element_resize_callback_.is_null())
return; return;
base::MessageLoop::current()->PostTask( base::MessageLoop::current()->PostTask(
FROM_HERE, FROM_HERE, base::Bind(element_resize_callback_, new_size));
base::Bind(element_resize_callback_, old_size, new_size));
} }
} // namespace atom } // namespace atom

6
atom/renderer/guest_view_container.h
View file

@ -16,8 +16,7 @@ namespace atom {
class GuestViewContainer : public content::BrowserPluginDelegate { class GuestViewContainer : public content::BrowserPluginDelegate {
public: public:
typedef base::Callback<void(const gfx::Size&, const gfx::Size&)> typedef base::Callback<void(const gfx::Size&)> ResizeCallback;
ResizeCallback;
explicit GuestViewContainer(content::RenderFrame* render_frame); explicit GuestViewContainer(content::RenderFrame* render_frame);
~GuestViewContainer() override; ~GuestViewContainer() override;
@ -28,8 +27,7 @@ class GuestViewContainer : public content::BrowserPluginDelegate {
// content::BrowserPluginDelegate: // content::BrowserPluginDelegate:
void SetElementInstanceID(int element_instance_id) final; void SetElementInstanceID(int element_instance_id) final;
void DidResizeElement(const gfx::Size& old_size, void DidResizeElement(const gfx::Size& new_size) final;
const gfx::Size& new_size) final;
private: private:
int element_instance_id_; int element_instance_id_;

4
atom/renderer/lib/web-view/web-view.coffee
View file

@ -123,11 +123,9 @@ class WebViewImpl
# changed. # changed.
@dispatchEvent webViewEvent @dispatchEvent webViewEvent
onElementResize: (oldSize, newSize) -> onElementResize: (newSize) ->
# Dispatch the 'resize' event. # Dispatch the 'resize' event.
resizeEvent = new Event('resize', bubbles: true) resizeEvent = new Event('resize', bubbles: true)
resizeEvent.oldWidth = oldSize.width
resizeEvent.oldHeight = oldSize.height
resizeEvent.newWidth = newSize.width resizeEvent.newWidth = newSize.width
resizeEvent.newHeight = newSize.height resizeEvent.newHeight = newSize.height
@dispatchEvent resizeEvent @dispatchEvent resizeEvent