<!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>[181522] 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/181522">181522</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-03-15 22:34:27 -0700 (Sun, 15 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scroll snap points are not supported on iframe content
https://bugs.webkit.org/show_bug.cgi?id=142582
<rdar://problem/20121319>
Source/WebCore:
Tested by css3/scroll-snap/scroll-snap-iframe.html
Reviewed by Simon Fraser.
The scroll snap points were not being applied to the iframe contents because the code
that sets up the scroll snap point content is not called for iframes.
To correct this, we need to make sure the snap offsets are set during post-frame layout
for iframes. We also need to make sure (on Mac) that the scroll animator and timers are updated.
* page/FrameView.cpp:
(WebCore::FrameView::performPostLayoutTasks): Call 'updateSnapOffsets' if the frame is not a
MainFrame. Also notify scroll animators they need to update their snap point settings.
LayoutTests:
Reviewed by Simon Fraser.
* css3/scroll-snap/resources: Added.
* css3/scroll-snap/resources/iframe-content.html: Added.
* css3/scroll-snap/scroll-snap-iframe-expected.txt: Added.
* css3/scroll-snap/scroll-snap-iframe.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="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/css3/scroll-snap/resources/</li>
<li><a href="#trunkLayoutTestscss3scrollsnapresourcesiframecontenthtml">trunk/LayoutTests/css3/scroll-snap/resources/iframe-content.html</a></li>
<li><a href="#trunkLayoutTestscss3scrollsnapscrollsnapiframeexpectedtxt">trunk/LayoutTests/css3/scroll-snap/scroll-snap-iframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3scrollsnapscrollsnapiframehtml">trunk/LayoutTests/css3/scroll-snap/scroll-snap-iframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181521 => 181522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-16 05:31:28 UTC (rev 181521)
+++ trunk/LayoutTests/ChangeLog 2015-03-16 05:34:27 UTC (rev 181522)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-03-15 Brent Fulgham <bfulgham@apple.com>
+
+ Scroll snap points are not supported on iframe content
+ https://bugs.webkit.org/show_bug.cgi?id=142582
+ <rdar://problem/20121319>
+
+ Reviewed by Simon Fraser.
+
+ * css3/scroll-snap/resources: Added.
+ * css3/scroll-snap/resources/iframe-content.html: Added.
+ * css3/scroll-snap/scroll-snap-iframe-expected.txt: Added.
+ * css3/scroll-snap/scroll-snap-iframe.html: Added.
+
</ins><span class="cx"> 2015-03-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Better handle displaying -0
</span></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapresourcesiframecontenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/resources/iframe-content.html (0 => 181522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/resources/iframe-content.html (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/resources/iframe-content.html 2015-03-16 05:34:27 UTC (rev 181522)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ .horizontalGallery {
+ width: 400px;
+ height: 50px;
+ overflow-y: hidden;
+ overflow-x: auto;
+ }
+ .horizontalGalleryDrawer {
+ width: 3000px;
+ height: 50px;
+ }
+ .colorBox {
+ height: 50px;
+ width: 400px;
+ float: left;
+ }
+
+ .noInitial {
+ -webkit-scroll-snap-type: mandatory;
+ -webkit-scroll-snap-points-x: repeat(100%);
+ -webkit-scroll-snap-points-y: repeat(100%);
+ -webkit-scroll-snap-coordinate: left top;
+ }
+
+ #item0 { background-color: red; }
+ #item1 { background-color: green; }
+ #item2 { background-color: blue; }
+ #item3 { background-color: aqua; }
+ #item4 { background-color: yellow; }
+ #item5 { background-color: fuchsia; }
+ </style>
+ <script>
+ top.succeeded = true;
+ </script>
+ </head>
+ <body>
+ <div style="width: 400px">
+ <div id="noInitial" class="horizontalGallery noInitial" style="-webkit-scroll-snap-destination: right bottom; -webkit-scroll-snap-coordinate: left top;">
+ <div class="horizontalGalleryDrawer">
+ <div id="item0" class="colorBox"></div>
+ <div id="item1" class="colorBox"></div>
+ <div id="item2" class="colorBox"></div>
+ <div id="item3" class="colorBox"></div>
+ <div id="item4" class="colorBox"></div>
+ <div id="item5" class="colorBox"></div>
+ </div>
+ </div>
+ </div>
+ <div id="console"></div>
+ <script>
+
+ function shouldMatch(_a, _b, result)
+ {
+ if (typeof _a !== "string" || typeof _b !== "string")
+ top.debug("WARN: shouldBeEqualToString() expects string arguments");
+
+ var _av;
+ try {
+ _av = eval(_a);
+ } catch (e) {
+ return false;
+ }
+
+ return top.isResultCorrect(_av, _b);
+ }
+
+ var noInitial = document.getElementById('noInitial');
+ top.succeeded = shouldMatch("window.getComputedStyle(noInitial).getPropertyValue('-webkit-scroll-snap-type')", "mandatory");
+ top.succeeded = top.succeeded && shouldMatch("window.getComputedStyle(noInitial).getPropertyValue('-webkit-scroll-snap-points-x')", "repeat(100%)");
+ top.succeeded = top.succeeded && shouldMatch("window.getComputedStyle(noInitial).getPropertyValue('-webkit-scroll-snap-points-y')", "repeat(100%)");
+ top.succeeded = top.succeeded && shouldMatch("noInitial.style['-webkit-scroll-snap-coordinate']", "0% 0%");
+ top.succeeded = top.succeeded && shouldMatch("window.getComputedStyle(noInitial).getPropertyValue('-webkit-scroll-snap-coordinate')", "0% 0%");
+
+ if (top.succeeded)
+ top.debug("iframe processed all tests successfully.");
+ else
+ top.debug("iframe processing failed.");
+ </script>
+ </body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapscrollsnapiframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/scroll-snap-iframe-expected.txt (0 => 181522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-iframe-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-iframe-expected.txt 2015-03-16 05:34:27 UTC (rev 181522)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+iframe processed all tests successfully.
+PASS succeeded is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Verify that the iframe propery parses snap-point settings.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapscrollsnapiframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/scroll-snap-iframe.html (0 => 181522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-iframe.html (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-iframe.html 2015-03-16 05:34:27 UTC (rev 181522)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ }
+
+ var succeeded = false;
+ var successfullyParsed = false;
+
+ window.onload = function() {
+ shouldBe("succeeded", "true");
+
+ isSuccessfullyParsed();
+ };
+ </script>
+</head>
+<body>
+ <p id="description"></p>
+ <iframe id="frame" src="resources/iframe-content.html" style="width: 100vw; height: 100vh"></iframe>
+ <script>
+ description("Verify that the iframe propery parses snap-point settings.");
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181521 => 181522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-16 05:31:28 UTC (rev 181521)
+++ trunk/Source/WebCore/ChangeLog 2015-03-16 05:34:27 UTC (rev 181522)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-03-15 Brent Fulgham <bfulgham@apple.com>
+
+ Scroll snap points are not supported on iframe content
+ https://bugs.webkit.org/show_bug.cgi?id=142582
+ <rdar://problem/20121319>
+
+ Tested by css3/scroll-snap/scroll-snap-iframe.html
+
+ Reviewed by Simon Fraser.
+
+ The scroll snap points were not being applied to the iframe contents because the code
+ that sets up the scroll snap point content is not called for iframes.
+
+ To correct this, we need to make sure the snap offsets are set during post-frame layout
+ for iframes. We also need to make sure (on Mac) that the scroll animator and timers are updated.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::performPostLayoutTasks): Call 'updateSnapOffsets' if the frame is not a
+ MainFrame. Also notify scroll animators they need to update their snap point settings.
+
</ins><span class="cx"> 2015-03-15 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the same is<RenderBox> test to KeyframeAnimation::computeExtentOfTransformAnimation()
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (181521 => 181522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-03-16 05:31:28 UTC (rev 181521)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-03-16 05:34:27 UTC (rev 181522)
</span><span class="lines">@@ -2976,6 +2976,14 @@
</span><span class="cx">
</span><span class="cx"> sendResizeEventIfNeeded();
</span><span class="cx"> viewportContentsChanged();
</span><ins>+
+#if ENABLE(CSS_SCROLL_SNAP)
+ if (!frame().isMainFrame()) {
+ updateSnapOffsets();
+ if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
+ return scrollAnimator->updateScrollAnimatorsAndTimers();
+ }
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize FrameView::sizeForResizeEvent() const
</span></span></pre>
</div>
</div>
</body>
</html>