<!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>[278193] 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/278193">278193</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2021-05-28 01:59:20 -0700 (Fri, 28 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>More readily layout when scroll-snap properties change
https://bugs.webkit.org/show_bug.cgi?id=225950

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

* web-platform-tests/css/css-scroll-snap/scroll-snap-type-change-expected.txt: Updated expectation
for newly passing test.

Source/WebCore:

Do a layout when scroll-snap properties change instead of trying
to update scroll positions without a layout.

Test: css3/scroll-snap/scroll-snap-style-change-crash.html

* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::styleDidChange): Remove code dealing with scrollports
as this is now handled by the RenderStyle diff. Now trigger a layout for scrollports
when the scrolled children change their snap properties.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::enclosingScrollableContainerForSnapping const): Made this return a non-const.
* rendering/RenderObject.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout const): Added code to handle scrollport specific
properties.

LayoutTests:

* css3/scroll-snap/scroll-snap-style-change-crash-expected.txt: Added.
* css3/scroll-snap/scroll-snap-style-change-crash.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssscrollsnapscrollsnaptypechangeexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/scroll-snap-type-change-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerModelObjectcpp">trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3scrollsnapscrollsnapstylechangecrashexpectedtxt">trunk/LayoutTests/css3/scroll-snap/scroll-snap-style-change-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3scrollsnapscrollsnapstylechangecrashhtml">trunk/LayoutTests/css3/scroll-snap/scroll-snap-style-change-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (278192 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-05-28 07:15:43 UTC (rev 278192)
+++ trunk/LayoutTests/ChangeLog 2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-05-28  Martin Robinson  <mrobinson@webkit.org>
+
+        More readily layout when scroll-snap properties change
+        https://bugs.webkit.org/show_bug.cgi?id=225950
+
+        Reviewed by Simon Fraser.
+
+        * css3/scroll-snap/scroll-snap-style-change-crash-expected.txt: Added.
+        * css3/scroll-snap/scroll-snap-style-change-crash.html: Added.
+
</ins><span class="cx"> 2021-05-27  Amir Mark Jr  <amir_mark@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [MacOS Wk1] imported/w3c/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html is a flaky failure
</span></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapscrollsnapstylechangecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/scroll-snap-style-change-crash-expected.txt (0 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-style-change-crash-expected.txt                           (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-style-change-crash-expected.txt      2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapscrollsnapstylechangecrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/scroll-snap-style-change-crash.html (0 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-style-change-crash.html                           (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-style-change-crash.html      2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<style>
+  * {
+    bottom: 0;
+    scroll-snap-type: x;
+    scroll-margin: 1em 0 0;
+    width: 1500px;
+  }
+  :not(:empty) {
+    scroll-snap-align: center;
+  }
+  :nth-of-type(1) {
+    position: fixed;
+  }
+  :read-write {
+    font-size: 0;
+    transform: rotate(-30deg);
+  }
+  :last-child {
+    width: 0;
+  }
+</style>
+<script>
+  onload = () => {
+    if (window.testRunner) {
+        testRunner.dumpAsText();
+        testRunner.waitUntilDone();
+    }
+
+    document.body.offsetTop;
+    document.body.appendChild(document.createElement('span'));
+    let n0 = document.createElement('div');
+    n0.appendChild(document.createElement('frame'));
+    document.body.appendChild(n0);
+    document.documentElement.appendChild(document.createElement('div'));
+    document.body.offsetTop;
+    document.designMode = 'on';
+
+    setTimeout(() => {
+        document.body.innerHTML = 'PASS';
+        testRunner.notifyDone();
+    }, 0);
+  };
+</script>
+<body></body>
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (278192 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-05-28 07:15:43 UTC (rev 278192)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-05-28  Martin Robinson  <mrobinson@webkit.org>
+
+        More readily layout when scroll-snap properties change
+        https://bugs.webkit.org/show_bug.cgi?id=225950
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-scroll-snap/scroll-snap-type-change-expected.txt: Updated expectation
+        for newly passing test.
+
</ins><span class="cx"> 2021-05-27  Said Abou-Hallawa  <said@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Values of keySplines control points must all be in the range 0 to 1
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssscrollsnapscrollsnaptypechangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/scroll-snap-type-change-expected.txt (278192 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/scroll-snap-type-change-expected.txt       2021-05-28 07:15:43 UTC (rev 278192)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/scroll-snap-type-change-expected.txt  2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> 
</span><del>-FAIL scroll-snap-type on HTML should control snapping behavior and changing it takes effect assert_equals: scrolling should not snap expected 100 but got 200
</del><ins>+PASS scroll-snap-type on HTML should control snapping behavior and changing it takes effect
</ins><span class="cx"> PASS scroll-snap-type on DIV should control snapping behavior and changing it takes effect
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278192 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-28 07:15:43 UTC (rev 278192)
+++ trunk/Source/WebCore/ChangeLog      2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2021-05-28  Martin Robinson  <mrobinson@webkit.org>
+
+        More readily layout when scroll-snap properties change
+        https://bugs.webkit.org/show_bug.cgi?id=225950
+
+        Reviewed by Simon Fraser.
+
+        Do a layout when scroll-snap properties change instead of trying
+        to update scroll positions without a layout.
+
+        Test: css3/scroll-snap/scroll-snap-style-change-crash.html
+
+        * rendering/RenderLayerModelObject.cpp:
+        (WebCore::RenderLayerModelObject::styleDidChange): Remove code dealing with scrollports
+        as this is now handled by the RenderStyle diff. Now trigger a layout for scrollports
+        when the scrolled children change their snap properties.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::enclosingScrollableContainerForSnapping const): Made this return a non-const.
+        * rendering/RenderObject.h:
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::changeRequiresLayout const): Added code to handle scrollport specific
+        properties.
+
</ins><span class="cx"> 2021-05-27  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [macOS] Show context menu when clicking on data detection results in image overlays
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (278192 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp        2021-05-28 07:15:43 UTC (rev 278192)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp   2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -107,13 +107,6 @@
</span><span class="cx">     RenderElement::styleWillChange(diff, newStyle);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-static bool scrollSnapContainerRequiresUpdateForStyleUpdate(const RenderStyle& oldStyle, const RenderStyle& newStyle)
-{
-    return oldStyle.scrollPadding() != newStyle.scrollPadding() || oldStyle.scrollSnapType() != newStyle.scrollSnapType();
-}
-#endif
-
</del><span class="cx"> void RenderLayerModelObject::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span><span class="cx"> {
</span><span class="cx">     RenderElement::styleDidChange(diff, oldStyle);
</span><span class="lines">@@ -171,38 +164,12 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><del>-    if (oldStyle && scrollSnapContainerRequiresUpdateForStyleUpdate(*oldStyle, newStyle)) {
-        if (RenderLayer* renderLayer = layer()) {
-            if (auto* scrollableArea = renderLayer->scrollableArea()) {
-                scrollableArea->updateSnapOffsets();
-                scrollableArea->updateScrollSnapState();
-            }
-        } else if (isBody() || isDocumentElementRenderer()) {
-            FrameView& frameView = view().frameView();
-            frameView.updateSnapOffsets();
-            frameView.updateScrollSnapState();
-            frameView.updateScrollingCoordinatorScrollSnapProperties();
-        }
-    }
-
</del><span class="cx">     bool scrollMarginChanged = oldStyle && oldStyle->scrollMargin() != newStyle.scrollMargin();
</span><span class="cx">     bool scrollAlignChanged = oldStyle && oldStyle->scrollSnapAlign() != newStyle.scrollSnapAlign();
</span><span class="cx">     bool scrollSnapStopChanged = oldStyle && oldStyle->scrollSnapStop() != newStyle.scrollSnapStop();
</span><span class="cx">     if (scrollMarginChanged || scrollAlignChanged || scrollSnapStopChanged) {
</span><del>-        auto* scrollSnapBox = enclosingScrollableContainerForSnapping();
-        if (scrollSnapBox && scrollSnapBox->layer()) {
-            const RenderStyle& style = scrollSnapBox->style();
-            if (style.scrollSnapType().strictness != ScrollSnapStrictness::None) {
-                if (auto* scrollableArea = scrollSnapBox->layer()->scrollableArea()) {
-                    scrollableArea->updateSnapOffsets();
-                    scrollableArea->updateScrollSnapState();
-                }
-                if (scrollSnapBox->isBody() || scrollSnapBox->isDocumentElementRenderer())
-                    scrollSnapBox->view().frameView().updateSnapOffsets();
-                    scrollSnapBox->view().frameView().updateScrollSnapState();
-                    scrollSnapBox->view().frameView().updateScrollingCoordinatorScrollSnapProperties();
-            }
-        }
</del><ins>+        if (auto* scrollSnapBox = enclosingScrollableContainerForSnapping())
+            scrollSnapBox->setNeedsLayout();
</ins><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (278192 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp  2021-05-28 07:15:43 UTC (rev 278192)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp     2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx">     return *lineageOfType<RenderBoxModelObject>(const_cast<RenderObject&>(*this)).first();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-const RenderBox* RenderObject::enclosingScrollableContainerForSnapping() const
</del><ins>+RenderBox* RenderObject::enclosingScrollableContainerForSnapping() const
</ins><span class="cx"> {
</span><span class="cx">     // Walk up the container chain to find the scrollable container that contains
</span><span class="cx">     // this RenderObject. The important thing here is that `container()` respects
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (278192 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h    2021-05-28 07:15:43 UTC (rev 278192)
+++ trunk/Source/WebCore/rendering/RenderObject.h       2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT RenderBox& enclosingBox() const;
</span><span class="cx">     RenderBoxModelObject& enclosingBoxModelObject() const;
</span><del>-    const RenderBox* enclosingScrollableContainerForSnapping() const;
</del><ins>+    RenderBox* enclosingScrollableContainerForSnapping() const;
</ins><span class="cx"> 
</span><span class="cx">     // Return our enclosing flow thread if we are contained inside one. Follows the containing block chain.
</span><span class="cx">     RenderFragmentedFlow* enclosingFragmentedFlow() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (278192 => 278193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp     2021-05-28 07:15:43 UTC (rev 278192)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp        2021-05-28 08:59:20 UTC (rev 278193)
</span><span class="lines">@@ -952,6 +952,11 @@
</span><span class="cx">             return true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+    if (scrollPadding() != other.scrollPadding() || scrollSnapType() != other.scrollSnapType())
+        return true;
+#endif
+
</ins><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>