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

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

Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Missed a null check 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/LocalFrame.h ('k') | Source/core/html/HTMLFrameElementBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index 87b0b5e5638065a9bcc29fd04ed044ab02271ae4..35b9cd687e4ef09b1df46b4e9c66187eae5494d2 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -103,10 +103,6 @@ inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, HTMLFr
, m_orientation(0)
, m_inViewSourceMode(false)
{
- if (this->ownerElement()) {
- page()->incrementSubframeCount();
- this->ownerElement()->setContentFrame(*this);
- }
}
PassRefPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client, FrameHost* host, HTMLFrameOwnerElement* ownerElement)
@@ -123,8 +119,6 @@ LocalFrame::~LocalFrame()
setView(nullptr);
loader().clear();
setDOMWindow(nullptr);
-
- disconnectOwnerElement();
}
bool LocalFrame::inScope(TreeScope* scope) const
@@ -281,18 +275,6 @@ void LocalFrame::detachFromFrameHost()
Frame::detachFromFrameHost();
}
-void LocalFrame::disconnectOwnerElement()
-{
- if (ownerElement()) {
- if (Document* doc = document())
- doc->topDocument().clearAXObjectCache();
- ownerElement()->clearContentFrame();
- if (page())
- page()->decrementSubframeCount();
- }
- m_ownerElement = 0;
-}
-
String LocalFrame::documentTypeString() const
{
if (DocumentType* doctype = document()->doctype())
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/html/HTMLFrameElementBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698