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

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

Issue 334483002: Add Blink APIs for frame tree mirroring. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix some more crashes, etc. Created 6 years, 6 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 | « no previous file | Source/core/frame/FrameOwner.h » ('j') | Source/core/html/HTMLFrameOwnerElement.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Frame.cpp
diff --git a/Source/core/frame/Frame.cpp b/Source/core/frame/Frame.cpp
index db3f719f5951b14d8bae71fdb31142411de8e2df..c741b7b5192af47dbb9fb50a50ca20ddd860895a 100644
--- a/Source/core/frame/Frame.cpp
+++ b/Source/core/frame/Frame.cpp
@@ -71,8 +71,7 @@ Frame::Frame(FrameClient* client, FrameHost* host, FrameOwner* owner)
if (m_owner) {
page()->incrementSubframeCount();
- if (m_owner->isLocal())
- toHTMLFrameOwnerElement(m_owner)->setContentFrame(*this);
+ m_owner->setContentFrame(*this);
}
}
@@ -185,8 +184,7 @@ bool Frame::isMainFrame() const
void Frame::disconnectOwnerElement()
{
if (m_owner) {
- if (m_owner->isLocal())
- toHTMLFrameOwnerElement(m_owner)->clearContentFrame();
+ m_owner->clearContentFrame();
if (page())
page()->decrementSubframeCount();
}
« no previous file with comments | « no previous file | Source/core/frame/FrameOwner.h » ('j') | Source/core/html/HTMLFrameOwnerElement.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698