<!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>[207743] branches/safari-602-branch</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/207743">207743</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-24 00:18:28 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206712">r206712</a>. rdar://problem/28216065</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorepagescrollingScrollingStateTreecpp">branches/safari-602-branch/Source/WebCore/page/scrolling/ScrollingStateTree.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorepagescrollingScrollingStateTreeh">branches/safari-602-branch/Source/WebCore/page/scrolling/ScrollingStateTree.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsfastscrollingstickytofixedexpectedtxt">branches/safari-602-branch/LayoutTests/fast/scrolling/sticky-to-fixed-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsfastscrollingstickytofixedhtml">branches/safari-602-branch/LayoutTests/fast/scrolling/sticky-to-fixed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207742 => 207743)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-24 07:18:25 UTC (rev 207742)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-24 07:18:28 UTC (rev 207743)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206712. rdar://problem/28216065
+
+ 2016-10-01 Simon Fraser <simon.fraser@apple.com>
+
+ Bad cast when CSS position programmatically changed from -webkit-sticky to fixed
+ https://bugs.webkit.org/show_bug.cgi?id=160826
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/scrolling/sticky-to-fixed-expected.txt: Added.
+ * fast/scrolling/sticky-to-fixed.html: Added.
+
+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r206449. rdar://problem/28635085
</span><span class="cx">
</span><span class="cx"> 2016-09-27 Dan Bernstein <mitz@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastscrollingstickytofixedexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/scrolling/sticky-to-fixed-expected.txt (0 => 207743)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/scrolling/sticky-to-fixed-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/scrolling/sticky-to-fixed-expected.txt 2016-10-24 07:18:28 UTC (rev 207743)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test should not assert in debug.
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastscrollingstickytofixedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/scrolling/sticky-to-fixed.html (0 => 207743)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/scrolling/sticky-to-fixed.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/scrolling/sticky-to-fixed.html 2016-10-24 07:18:28 UTC (rev 207743)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+body {
+ height: 2000px;
+}
+.masthead {
+ position: -webkit-sticky;
+ width: 200px;
+ height: 100px;
+ background-color: rgba(0, 0, 0, 0.2);
+}
+
+.make-fixed .masthead {
+ position: fixed;
+}
+
+.fixed {
+ position: fixed;
+ width: 100px;
+ height: 100px;
+}
+</style>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doTest()
+ {
+ window.setTimeout(function() {
+ document.body.classList.add("make-fixed")
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+
+ window.addEventListener('load', doTest, false);
+</script>
+</head>
+<body>
+<div class="masthead">This test should not assert in debug.
+ <div class="fixed">
+ </div>
+</div>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207742 => 207743)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:25 UTC (rev 207742)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:28 UTC (rev 207743)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206712. rdar://problem/28216065
+
+ 2016-10-01 Simon Fraser <simon.fraser@apple.com>
+
+ Bad cast when CSS position programmatically changed from -webkit-sticky to fixed
+ https://bugs.webkit.org/show_bug.cgi?id=160826
+
+ Reviewed by Zalan Bujtas.
+
+ If a scrolling state tree node changed type (e.g. from sticky to fixed), we'd fail
+ to recreate the node so keep a node with the wrong type.
+
+ Fix by destroying the node and making a new one with a new ID in this case. The
+ new ID is necessary to ensure that the scrolling tree is updated.
+
+ Test: fast/scrolling/sticky-to-fixed.html
+
+ * page/scrolling/ScrollingStateTree.cpp:
+ (WebCore::ScrollingStateTree::nodeTypeAndParentMatch):
+ (WebCore::ScrollingStateTree::attachNode):
+ (WebCore::ScrollingStateTree::stateNodeForID):
+ * page/scrolling/ScrollingStateTree.h:
+
+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r206706. rdar://problem/28635081
</span><span class="cx">
</span><span class="cx"> 2016-09-30 David Kilzer <ddkilzer@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepagescrollingScrollingStateTreecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/scrolling/ScrollingStateTree.cpp (207742 => 207743)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2016-10-24 07:18:25 UTC (rev 207742)
+++ branches/safari-602-branch/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2016-10-24 07:18:28 UTC (rev 207743)
</span><span class="lines">@@ -83,21 +83,31 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ScrollingStateTree::nodeTypeAndParentMatch(ScrollingStateNode& node, ScrollingNodeType nodeType, ScrollingNodeID parentID) const
+{
+ if (node.nodeType() != nodeType)
+ return false;
+
+ ScrollingStateNode* parent = stateNodeForID(parentID);
+ if (!parent)
+ return true;
+
+ return node.parent() == parent;
+}
+
</ins><span class="cx"> ScrollingNodeID ScrollingStateTree::attachNode(ScrollingNodeType nodeType, ScrollingNodeID newNodeID, ScrollingNodeID parentID)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(newNodeID);
</span><ins>+
</ins><span class="cx"> if (ScrollingStateNode* node = stateNodeForID(newNodeID)) {
</span><del>- if (!parentID)
</del><ins>+ if (nodeTypeAndParentMatch(*node, nodeType, parentID))
</ins><span class="cx"> return newNodeID;
</span><ins>+
+ // If the type has changed, we need to destroy and recreate the node with a new ID.
+ if (nodeType != node->nodeType())
+ newNodeID = m_scrollingCoordinator->uniqueScrollLayerID();
</ins><span class="cx">
</span><del>- ScrollingStateNode* parent = stateNodeForID(parentID);
- if (!parent)
- return newNodeID;
-
- if (node->parent() == parent)
- return newNodeID;
-
- // The node is being re-parented. To do that, we'll remove it, and then re-create a new node.
</del><ins>+ // The node is being re-parented. To do that, we'll remove it, and then create a new node.
</ins><span class="cx"> removeNodeAndAllDescendants(node, SubframeNodeRemoval::Orphan);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -236,7 +246,7 @@
</span><span class="cx"> m_nodesRemovedSinceLastCommit = WTFMove(nodes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ScrollingStateNode* ScrollingStateTree::stateNodeForID(ScrollingNodeID scrollLayerID)
</del><ins>+ScrollingStateNode* ScrollingStateTree::stateNodeForID(ScrollingNodeID scrollLayerID) const
</ins><span class="cx"> {
</span><span class="cx"> if (!scrollLayerID)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepagescrollingScrollingStateTreeh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/scrolling/ScrollingStateTree.h (207742 => 207743)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/scrolling/ScrollingStateTree.h 2016-10-24 07:18:25 UTC (rev 207742)
+++ branches/safari-602-branch/Source/WebCore/page/scrolling/ScrollingStateTree.h 2016-10-24 07:18:28 UTC (rev 207743)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> WEBCORE_EXPORT ~ScrollingStateTree();
</span><span class="cx">
</span><span class="cx"> ScrollingStateFrameScrollingNode* rootStateNode() const { return m_rootStateNode.get(); }
</span><del>- WEBCORE_EXPORT ScrollingStateNode* stateNodeForID(ScrollingNodeID);
</del><ins>+ WEBCORE_EXPORT ScrollingStateNode* stateNodeForID(ScrollingNodeID) const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ScrollingNodeID attachNode(ScrollingNodeType, ScrollingNodeID, ScrollingNodeID parentID);
</span><span class="cx"> void detachNode(ScrollingNodeID);
</span><span class="lines">@@ -79,7 +79,9 @@
</span><span class="cx"> void addNode(ScrollingStateNode*);
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ScrollingStateNode> createNode(ScrollingNodeType, ScrollingNodeID);
</span><del>-
</del><ins>+
+ bool nodeTypeAndParentMatch(ScrollingStateNode&, ScrollingNodeType, ScrollingNodeID parentID) const;
+
</ins><span class="cx"> enum class SubframeNodeRemoval {
</span><span class="cx"> Delete,
</span><span class="cx"> Orphan
</span></span></pre>
</div>
</div>
</body>
</html>