DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Sky: When an iframe element is removed, delete its mojo View."

Browse Source 
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
This commit is contained in:
Matt Perry 2014-11-19 15:13:28 -05:00
parent 450f56bafa
commit 2a60db84ea
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/core/html/HTMLIFrameElement.cpp
View File

@ -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);
}
}

6
tests/lowlevel/iframe.sky
View File

@ -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>