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

Unified Diff: Source/core/frame/Frame.cpp

Issue 219903002: Revert 170347 "Convert HTMLFrameOwnerElement and FocusController..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1917/
Patch Set: Created 6 years, 9 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.h ('k') | Source/core/frame/LocalFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Frame.cpp
===================================================================
--- Source/core/frame/Frame.cpp (revision 170478)
+++ Source/core/frame/Frame.cpp (working copy)
@@ -80,16 +80,10 @@
#ifndef NDEBUG
frameCounter.increment();
#endif
-
- if (this->ownerElement()) {
- page()->incrementSubframeCount();
- this->ownerElement()->setContentFrame(*this);
- }
}
Frame::~Frame()
{
- disconnectOwnerElement();
setDOMWindow(nullptr);
// FIXME: We should not be doing all this work inside the destructor
@@ -203,18 +197,4 @@
return page && this == page->mainFrame();
}
-void Frame::disconnectOwnerElement()
-{
- // FIXME: The semantics here are specific to LocalFrame and will need to change
- // when RemoteFrames no longer have Documents.
- if (ownerElement()) {
- if (Document* doc = document())
- doc->topDocument().clearAXObjectCache();
- ownerElement()->clearContentFrame();
- if (page())
- page()->decrementSubframeCount();
- }
- m_ownerElement = 0;
-}
-
} // namespace WebCore
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698