From 2a60db84eae3aff9bb67b68987bb3dfaadc160b1 Mon Sep 17 00:00:00 2001
From: Matt Perry <mpcomplete@chromium.org>
Date: Wed, 19 Nov 2014 15:13:28 -0500
Subject: [PATCH] Revert "Sky: When an iframe element is removed, delete its
 mojo View."

This reverts commit 45991a3752e6a6298901eba36e7bf4cdec4d263c.

It was causing flaky crashes on the bots.

TBR=esprehn@chromium.org
BUG=434555

Review URL: https://codereview.chromium.org/740773002
---
 engine/core/html/HTMLIFrameElement.cpp | 9 +++------
 tests/lowlevel/iframe.sky              | 6 ------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/engine/core/html/HTMLIFrameElement.cpp b/engine/core/html/HTMLIFrameElement.cpp
index 30721b78c65..29b0908cced 100644
--- a/engine/core/html/HTMLIFrameElement.cpp
+++ b/engine/core/html/HTMLIFrameElement.cpp
@@ -26,8 +26,6 @@ HTMLIFrameElement::HTMLIFrameElement(Document& document)
 
 HTMLIFrameElement::~HTMLIFrameElement()
 {
-    if (m_contentView)
-        m_contentView->RemoveObserver(this);
 }
 
 Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode* insertionPoint)
@@ -41,8 +39,9 @@ Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode
 void HTMLIFrameElement::removedFrom(ContainerNode* insertionPoint)
 {
     HTMLElement::removedFrom(insertionPoint);
-    if (m_contentView)
-        m_contentView->Destroy();
+    if (insertionPoint->inDocument()) {
+        // TODO(mpcomplete): Tear down the mojo View.
+    }
 }
 
 RenderObject* HTMLIFrameElement::createRenderer(RenderStyle* style)
@@ -68,8 +67,6 @@ void HTMLIFrameElement::createView()
 
     KURL url = document().completeURL(urlString);
     m_contentView = parentFrame->loaderClient()->createChildFrame(url);
-    if (m_contentView)
-        m_contentView->AddObserver(this);
 }
 
 }
diff --git a/tests/lowlevel/iframe.sky b/tests/lowlevel/iframe.sky
index 8c3682c3a38..2073ce66fec 100644
--- a/tests/lowlevel/iframe.sky
+++ b/tests/lowlevel/iframe.sky
@@ -1,12 +1,6 @@
 <sky>
     <import src="../resources/dump-as-render-tree.sky" />
-    <iframe id="removeMe" src="text.sky">Should not render</iframe>
     <div>This is an <iframe style="border-style: solid; border-width: 20px" src="abarth.sky">iframe</iframe> element.</div>
     <div style="height: 200px">Placeholder.</div>
     <div>Small iframe should render <iframe style="height: 40px" src="abarth.sky">iframe</iframe> correctly.</div>
-
-    <script>
-        var removeMe = document.getElementById("removeMe");
-        removeMe.parentNode.removeChild(removeMe);
-    </script>
 </sky>