diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 03:49:46 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 03:49:46 +0000 |
| commit | 11fd5db93d10e7962cbe2c45d15a571aeb6c9907 (patch) | |
| tree | 1a4efe579b8e13bba0891bf34da343e5ad24cd03 /content | |
| parent | 9274ef62d0afabe19e241457ba8cfa4c5241f77b (diff) | |
| download | chromium_src-11fd5db93d10e7962cbe2c45d15a571aeb6c9907.zip chromium_src-11fd5db93d10e7962cbe2c45d15a571aeb6c9907.tar.gz chromium_src-11fd5db93d10e7962cbe2c45d15a571aeb6c9907.tar.bz2 | |
Move dispatchUnloadEvent to WebFrame, part 2/3.
BUG=357782
TEST=no change
Review URL: https://codereview.chromium.org/219513004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/render_frame_impl.cc | 6 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 74f9812..7c8342b 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -809,10 +809,10 @@ void RenderFrameImpl::OnSwapOut() { render_view_->SyncNavigationState(); // Synchronously run the unload handler before sending the ACK. - // TODO(creis): Move WebView::dispatchUnloadEvent to WebFrame and call it - // here to support unload on subframes as well. + // TODO(creis): Call dispatchUnloadEvent unconditionally here to support + // unload on subframes as well. if (!frame_->parent()) - render_view_->webview()->dispatchUnloadEvent(); + frame_->dispatchUnloadEvent(); // Swap out and stop sending any IPC messages that are not ACKs. if (!frame_->parent()) diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 692575e..4a3bd5b 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -3732,7 +3732,7 @@ void RenderViewImpl::OnClosePage() { // revisited to avoid having two ways to close a page. Having a single way // to close that can run onunload is also useful for fixing // http://b/issue?id=753080. - webview()->dispatchUnloadEvent(); + webview()->mainFrame()->dispatchUnloadEvent(); Send(new ViewHostMsg_ClosePage_ACK(routing_id_)); } |