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

Unified Diff: Source/core/html/HTMLFrameOwnerElement.cpp

Issue 655063003: Disconnect frame owners when detaching frames. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on top of frame detach streamlining and add a test Created 6 years, 2 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
« no previous file with comments | « Source/core/frame/Frame.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLFrameOwnerElement.cpp
diff --git a/Source/core/html/HTMLFrameOwnerElement.cpp b/Source/core/html/HTMLFrameOwnerElement.cpp
index 29e31eca22117163abe05319a48612fe0200a89f..70cd4a48b8a8e8f5eae965e62b7a96558fa7b8c1 100644
--- a/Source/core/html/HTMLFrameOwnerElement.cpp
+++ b/Source/core/html/HTMLFrameOwnerElement.cpp
@@ -152,7 +152,6 @@ void HTMLFrameOwnerElement::disconnectContentFrame()
// see if this behavior is really needed as Gecko does not allow this.
if (RefPtrWillBeRawPtr<Frame> frame = contentFrame()) {
frame->detach();
- frame->disconnectOwnerElement();
}
#if ENABLE(OILPAN)
// Oilpan: a plugin container must be explicitly disposed before it
@@ -168,14 +167,9 @@ void HTMLFrameOwnerElement::disconnectContentFrame()
HTMLFrameOwnerElement::~HTMLFrameOwnerElement()
{
-#if ENABLE(OILPAN)
// An owner must by now have been informed of detachment
// when the frame was closed.
ASSERT(!m_contentFrame);
-#else
- if (m_contentFrame)
- m_contentFrame->disconnectOwnerElement();
-#endif
}
Document* HTMLFrameOwnerElement::contentDocument() const
« no previous file with comments | « Source/core/frame/Frame.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698