Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1764)

Unified Diff: Source/web/FrameLoaderClientImpl.cpp

Issue 1041473002: Detach old frame on WebFrame::swap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: tests and cleanup Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/FrameLoaderClientImpl.cpp
diff --git a/Source/web/FrameLoaderClientImpl.cpp b/Source/web/FrameLoaderClientImpl.cpp
index a4637ae2164527b05e9f9f131ceda259916834c0..30cc7ef55874d0a2c23b1627d3f7160baf7e03c2 100644
--- a/Source/web/FrameLoaderClientImpl.cpp
+++ b/Source/web/FrameLoaderClientImpl.cpp
@@ -315,7 +315,7 @@ void FrameLoaderClientImpl::willBeDetached()
m_webFrame->willBeDetached();
}
-void FrameLoaderClientImpl::detached()
+void FrameLoaderClientImpl::detached(DetachType type)
{
// Alert the client that the frame is being detached. This is the last
// chance we have to communicate with the client.
@@ -331,7 +331,7 @@ void FrameLoaderClientImpl::detached()
// place at this point since we are no longer associated with the Page.
m_webFrame->setClient(0);
- client->frameDetached(m_webFrame);
+ client->frameDetached(m_webFrame, static_cast<WebFrameClient::DetachType>(type));
dcheng 2015/06/04 00:58:23 There should probably be something in AssertMatchi
lfg 2015/06/04 19:16:57 Done.
// Clear our reference to LocalFrame at the very end, in case the client
// refers to it.
m_webFrame->setCoreFrame(nullptr);

Powered by Google App Engine
This is Rietveld 408576698