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

Unified Diff: sky/engine/core/html/HTMLIFrameElement.cpp

Issue 740383002: Unrevert "Sky: When an iframe element is removed, delete its mojo View." (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | sky/tests/lowlevel/iframe.sky » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/html/HTMLIFrameElement.cpp
diff --git a/sky/engine/core/html/HTMLIFrameElement.cpp b/sky/engine/core/html/HTMLIFrameElement.cpp
index 904236915c0e305455bdef5ee714de1a1f9707db..0be9ab3a47c8e70d8f9280bfca90b4e50e117c6e 100644
--- a/sky/engine/core/html/HTMLIFrameElement.cpp
+++ b/sky/engine/core/html/HTMLIFrameElement.cpp
@@ -26,6 +26,8 @@ HTMLIFrameElement::HTMLIFrameElement(Document& document)
HTMLIFrameElement::~HTMLIFrameElement()
{
+ if (m_contentView)
+ m_contentView->RemoveObserver(this);
}
Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode* insertionPoint)
@@ -39,9 +41,8 @@ Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode
void HTMLIFrameElement::removedFrom(ContainerNode* insertionPoint)
{
HTMLElement::removedFrom(insertionPoint);
- if (insertionPoint->inDocument()) {
- // TODO(mpcomplete): Tear down the mojo View.
- }
+ if (m_contentView)
+ m_contentView->Destroy();
}
RenderObject* HTMLIFrameElement::createRenderer(RenderStyle* style)
@@ -67,6 +68,8 @@ void HTMLIFrameElement::createView()
KURL url = document().completeURL(urlString);
m_contentView = parentFrame->loaderClient()->createChildFrame(url);
+ if (m_contentView)
+ m_contentView->AddObserver(this);
}
}
« no previous file with comments | « no previous file | sky/tests/lowlevel/iframe.sky » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698