From 0e8a585157441358fac9e5a1ec389337f003ac17 Mon Sep 17 00:00:00 2001
From: Haojian Wu <hokein.wu@gmail.com>
Date: Tue, 4 Aug 2015 17:07:31 +0800
Subject: [PATCH] Fix content::BrowserPluginDelegate::DidResizeElement API
 changes.

Chromium has removed old_size in DidResizeElement interface as the 'old_size'
is internal.
---
 atom/renderer/guest_view_container.cc      | 6 ++----
 atom/renderer/guest_view_container.h       | 6 ++----
 atom/renderer/lib/web-view/web-view.coffee | 4 +---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/atom/renderer/guest_view_container.cc b/atom/renderer/guest_view_container.cc
index 7643f72b0e5b..c0bc1427d68c 100644
--- a/atom/renderer/guest_view_container.cc
+++ b/atom/renderer/guest_view_container.cc
@@ -47,14 +47,12 @@ void GuestViewContainer::SetElementInstanceID(int element_instance_id) {
       std::make_pair(element_instance_id, this));
 }
 
-void GuestViewContainer::DidResizeElement(const gfx::Size& old_size,
-                                          const gfx::Size& new_size) {
+void GuestViewContainer::DidResizeElement(const gfx::Size& new_size) {
   if (element_resize_callback_.is_null())
     return;
 
   base::MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(element_resize_callback_, old_size, new_size));
+      FROM_HERE, base::Bind(element_resize_callback_, new_size));
 }
 
 }  // namespace atom
diff --git a/atom/renderer/guest_view_container.h b/atom/renderer/guest_view_container.h
index b81f84cbd050..2846265cb2af 100644
--- a/atom/renderer/guest_view_container.h
+++ b/atom/renderer/guest_view_container.h
@@ -16,8 +16,7 @@ namespace atom {
 
 class GuestViewContainer : public content::BrowserPluginDelegate {
  public:
-  typedef base::Callback<void(const gfx::Size&, const gfx::Size&)>
-      ResizeCallback;
+  typedef base::Callback<void(const gfx::Size&)> ResizeCallback;
 
   explicit GuestViewContainer(content::RenderFrame* render_frame);
   ~GuestViewContainer() override;
@@ -28,8 +27,7 @@ class GuestViewContainer : public content::BrowserPluginDelegate {
 
   // content::BrowserPluginDelegate:
   void SetElementInstanceID(int element_instance_id) final;
-  void DidResizeElement(const gfx::Size& old_size,
-                        const gfx::Size& new_size) final;
+  void DidResizeElement(const gfx::Size& new_size) final;
 
  private:
   int element_instance_id_;
diff --git a/atom/renderer/lib/web-view/web-view.coffee b/atom/renderer/lib/web-view/web-view.coffee
index 35fbe17796f4..f5bcf0496f8c 100644
--- a/atom/renderer/lib/web-view/web-view.coffee
+++ b/atom/renderer/lib/web-view/web-view.coffee
@@ -123,11 +123,9 @@ class WebViewImpl
       # changed.
       @dispatchEvent webViewEvent
 
-  onElementResize: (oldSize, newSize) ->
+  onElementResize: (newSize) ->
     # Dispatch the 'resize' event.
     resizeEvent = new Event('resize', bubbles: true)
-    resizeEvent.oldWidth = oldSize.width
-    resizeEvent.oldHeight = oldSize.height
     resizeEvent.newWidth = newSize.width
     resizeEvent.newHeight = newSize.height
     @dispatchEvent resizeEvent