diff options
| author | lazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 02:31:32 +0000 |
|---|---|---|
| committer | lazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 02:31:32 +0000 |
| commit | 6344972668c412de8d25e4ae9100995e104788b4 (patch) | |
| tree | f550de752e5156b7918ee6dc312217c679ed5745 /content/renderer/browser_plugin | |
| parent | df5c497a5c211e7bd0f02c858151d33e0e4ee5ee (diff) | |
| download | chromium_src-6344972668c412de8d25e4ae9100995e104788b4.zip chromium_src-6344972668c412de8d25e4ae9100995e104788b4.tar.gz chromium_src-6344972668c412de8d25e4ae9100995e104788b4.tar.bz2 | |
<webview>: Move sizechanged event from content/ to chrome/.
Remove sizechanged event related old code from ad_view.js,
they were never being fired since
autosize/minwidth/maxwidth/minheight/maxheight attributes are ignored
in ad_view.
BUG=166165
TEST=WebViewTest.Shim_TestSizeChanged*
Review URL: https://chromiumcodereview.appspot.com/22576003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/browser_plugin')
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin.cc | 36 | ||||
| -rw-r--r-- | content/renderer/browser_plugin/browser_plugin.h | 4 |
2 files changed, 2 insertions, 38 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc index 03fffc1..0805ea3 100644 --- a/content/renderer/browser_plugin/browser_plugin.cc +++ b/content/renderer/browser_plugin/browser_plugin.cc @@ -85,7 +85,6 @@ BrowserPlugin::BrowserPlugin( content_window_routing_id_(MSG_ROUTING_NONE), plugin_focused_(false), visible_(true), - size_changed_in_flight_(false), before_first_navigation_(true), mouse_locked_(false), browser_plugin_manager_(render_view->GetBrowserPluginManager()), @@ -330,21 +329,6 @@ void BrowserPlugin::UpdateGuestAutoSizeState(bool current_auto_size) { resize_guest_params)); } -void BrowserPlugin::SizeChangedDueToAutoSize(const gfx::Size& old_view_size) { - size_changed_in_flight_ = false; - - std::map<std::string, base::Value*> props; - props[browser_plugin::kOldHeight] = - new base::FundamentalValue(old_view_size.height()); - props[browser_plugin::kOldWidth] = - new base::FundamentalValue(old_view_size.width()); - props[browser_plugin::kNewHeight] = - new base::FundamentalValue(last_view_size_.height()); - props[browser_plugin::kNewWidth] = - new base::FundamentalValue(last_view_size_.width()); - TriggerEvent(browser_plugin::kEventSizeChanged, &props); -} - // static bool BrowserPlugin::UsesDamageBuffer( const BrowserPluginMsg_UpdateRect_Params& params) { @@ -515,8 +499,9 @@ void BrowserPlugin::OnUpdateRect( // In HW mode, we need to do it here so we can continue sending // resize messages when needed. if (params.is_resize_ack || - (!params.needs_ack && (auto_size || auto_size_ack_pending_))) + (!params.needs_ack && (auto_size || auto_size_ack_pending_))) { resize_ack_received_ = true; + } auto_size_ack_pending_ = false; @@ -559,24 +544,7 @@ void BrowserPlugin::OnUpdateRect( if (auto_size && (params.view_size != last_view_size_)) { if (backing_store_) backing_store_->Clear(SK_ColorWHITE); - gfx::Size old_view_size = last_view_size_; last_view_size_ = params.view_size; - // Schedule a SizeChanged instead of calling it directly to ensure that - // the backing store has been updated before the developer attempts to - // resize to avoid flicker. |size_changed_in_flight_| acts as a form of - // flow control for SizeChanged events. If the guest's view size is changing - // rapidly before a SizeChanged event fires, then we avoid scheduling - // another SizeChanged event. SizeChanged reads the new size from - // |last_view_size_| so we can be sure that it always fires an event - // with the last seen view size. - if (container_ && !size_changed_in_flight_) { - size_changed_in_flight_ = true; - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(&BrowserPlugin::SizeChangedDueToAutoSize, - base::Unretained(this), - old_view_size)); - } } if (UsesDamageBuffer(params)) { diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h index d18906a..24ed2f3 100644 --- a/content/renderer/browser_plugin/browser_plugin.h +++ b/content/renderer/browser_plugin/browser_plugin.h @@ -270,9 +270,6 @@ class CONTENT_EXPORT BrowserPlugin : // Informs the guest of an updated autosize state. void UpdateGuestAutoSizeState(bool current_auto_size); - // Informs the BrowserPlugin that guest has changed its size in autosize mode. - void SizeChangedDueToAutoSize(const gfx::Size& old_view_size); - // Indicates whether a damage buffer was used by the guest process for the // provided |params|. static bool UsesDamageBuffer( @@ -343,7 +340,6 @@ class CONTENT_EXPORT BrowserPlugin : WebCursor cursor_; gfx::Size last_view_size_; - bool size_changed_in_flight_; bool before_first_navigation_; bool mouse_locked_; |