<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200216] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200216">200216</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-04-28 16:38:09 -0700 (Thu, 28 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure we don't mishandle HTMLFrameOwnerElement lifecycle
https://bugs.webkit.org/show_bug.cgi?id=157040
Reviewed by Chris Dumez.
Source/WebCore:
Protect a couple of sites where event handling could result in the owning frame
being destroyed during execution.
Tested by fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash.html.
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::didCommitLoad):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollRectToVisible):
LayoutTests:
* fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash-expected.txt: Added.
* fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash.html: Added.
* fast/dom/HTMLAnchorElement/resources/iframe-with-anchor-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchorinnoscrolliframecrashexpectedtxt">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementanchorinnoscrolliframecrashhtml">trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash.html</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLAnchorElementresourcesiframewithanchorcrashhtml">trunk/LayoutTests/fast/dom/HTMLAnchorElement/resources/iframe-with-anchor-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200215 => 200216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-28 23:13:59 UTC (rev 200215)
+++ trunk/LayoutTests/ChangeLog 2016-04-28 23:38:09 UTC (rev 200216)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-27 Brent Fulgham <bfulgham@apple.com>
+
+ Make sure we don't mishandle HTMLFrameOwnerElement lifecycle
+ https://bugs.webkit.org/show_bug.cgi?id=157040
+
+ Reviewed by Chris Dumez.
+
+ * fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash-expected.txt: Added.
+ * fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash.html: Added.
+ * fast/dom/HTMLAnchorElement/resources/iframe-with-anchor-crash.html: Added.
+
</ins><span class="cx"> 2016-04-28 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Add CSS Grid Layout runtime flag
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchorinnoscrolliframecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash-expected.txt (0 => 200216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash-expected.txt 2016-04-28 23:38:09 UTC (rev 200216)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This tests whether clicking on an anchor in an iframe with scrolling="no" will scroll to anchor. If clicking on the link below triggers a scroll, the test passes.
+
+
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementanchorinnoscrolliframecrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash.html (0 => 200216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash.html (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash.html 2016-04-28 23:38:09 UTC (rev 200216)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests whether clicking on an anchor in an iframe with scrolling="no" will scroll to anchor. If clicking on the link below triggers a scroll, the test passes.<p>
+<iframe id="target" src="resources/iframe-with-anchor-crash.html" width="100%" height="2000" scrolling="no" onload="setupTopLevel();"></iframe>
+<script>
+ var iframeTarget = document.getElementById('target');
+
+ function finish() {
+ var result = "PASS";
+ window.top.document.body.appendChild(document.createTextNode(result));
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ function setupTopLevel() {
+ var scrollTarget = window.frames['target'].document.getElementById('might_scroll');
+
+ window.frames['target'].window.registerAction(function () {
+ iframeTarget.remove();
+ setTimeout(finish, 0);
+ });
+
+ window.frames['target'].window.run();
+ }
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLAnchorElementresourcesiframewithanchorcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLAnchorElement/resources/iframe-with-anchor-crash.html (0 => 200216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLAnchorElement/resources/iframe-with-anchor-crash.html (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLAnchorElement/resources/iframe-with-anchor-crash.html 2016-04-28 23:38:09 UTC (rev 200216)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ }
+
+ var workToDo;
+
+ function registerAction(action)
+ {
+ workToDo = action;
+ }
+
+ function run()
+ {
+ if (!window.eventSender)
+ return;
+
+ var anchor = document.getElementById("start");
+ var x = window.frameElement.offsetLeft + anchor.offsetLeft + 2;
+ var y = window.frameElement.offsetTop + anchor.offsetTop + 2;
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ workToDo();
+ }
+</script>
+</head>
+<body>
+ <a id="start" href="#anchor">Go to anchor</a>
+ <div id="might_scroll" style="height: 1000px"></div>
+ <a name="anchor">Anchor</a>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200215 => 200216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-28 23:13:59 UTC (rev 200215)
+++ trunk/Source/WebCore/ChangeLog 2016-04-28 23:38:09 UTC (rev 200216)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-27 Brent Fulgham <bfulgham@apple.com>
+
+ Make sure we don't mishandle HTMLFrameOwnerElement lifecycle
+ https://bugs.webkit.org/show_bug.cgi?id=157040
+
+ Reviewed by Chris Dumez.
+
+ Protect a couple of sites where event handling could result in the owning frame
+ being destroyed during execution.
+
+ Tested by fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe-crash.html.
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::didCommitLoad):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollRectToVisible):
+
</ins><span class="cx"> 2016-04-28 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Add CSS Grid Layout runtime flag
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (200215 => 200216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-04-28 23:13:59 UTC (rev 200215)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-04-28 23:38:09 UTC (rev 200216)
</span><span class="lines">@@ -1869,7 +1869,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::didCommitLoad(Document* document)
</span><span class="cx"> {
</span><del>- Element* frameOwner = document->ownerElement();
</del><ins>+ RefPtr<Element> frameOwner = document->ownerElement();
</ins><span class="cx"> if (!frameOwner)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1878,12 +1878,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Re-add frame owner element together with its new children.
</span><del>- int parentId = m_documentNodeToIdMap.get(innerParentNode(frameOwner));
</del><ins>+ int parentId = m_documentNodeToIdMap.get(innerParentNode(frameOwner.get()));
</ins><span class="cx"> m_frontendDispatcher->childNodeRemoved(parentId, frameOwnerId);
</span><del>- unbind(frameOwner, &m_documentNodeToIdMap);
</del><ins>+ unbind(frameOwner.get(), &m_documentNodeToIdMap);
</ins><span class="cx">
</span><del>- Ref<Inspector::Protocol::DOM::Node> value = buildObjectForNode(frameOwner, 0, &m_documentNodeToIdMap);
- Node* previousSibling = innerPreviousSibling(frameOwner);
</del><ins>+ Ref<Inspector::Protocol::DOM::Node> value = buildObjectForNode(frameOwner.get(), 0, &m_documentNodeToIdMap);
+ Node* previousSibling = innerPreviousSibling(frameOwner.get());
</ins><span class="cx"> int prevId = previousSibling ? m_documentNodeToIdMap.get(previousSibling) : 0;
</span><span class="cx"> m_frontendDispatcher->childNodeInserted(parentId, prevId, WTFMove(value));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (200215 => 200216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-04-28 23:13:59 UTC (rev 200215)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-04-28 23:38:09 UTC (rev 200216)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> #include "HitTestRequest.h"
</span><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "NoEventDispatchAssertion.h"
</ins><span class="cx"> #include "OverflowEvent.h"
</span><span class="cx"> #include "OverlapTestRequestClient.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -2519,6 +2520,9 @@
</span><span class="cx"> frameElementBase = downcast<HTMLFrameElementBase>(ownerElement);
</span><span class="cx">
</span><span class="cx"> if (frameElementAndViewPermitScroll(frameElementBase, frameView)) {
</span><ins>+ // If this assertion fires we need to protect the ownerElement from being destroyed.
+ NoEventDispatchAssertion assertNoEventDispatch;
+
</ins><span class="cx"> LayoutRect viewRect = frameView.visibleContentRect(LegacyIOSDocumentVisibleRect);
</span><span class="cx"> LayoutRect exposeRect = getRectToExpose(viewRect, viewRect, rect, alignX, alignY);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>