<!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>[180300] branches/safari-600.4.10-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/180300">180300</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 14:38:52 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176899">r176899</a>. rdar://problem/19585775</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari600410branchChangeLog">branches/safari-600.4.10-branch/ChangeLog</a></li>
<li><a href="#branchessafari600410branchSourceWebCoreChangeLog">branches/safari-600.4.10-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari600410branchSourceWebCorepageFrameViewcpp">branches/safari-600.4.10-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari600410branchSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">branches/safari-600.4.10-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari600410branchManualTestsprogrammaticscrollflickerhtml">branches/safari-600.4.10-branch/ManualTests/programmatic-scroll-flicker.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari600410branchChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/ChangeLog (180299 => 180300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/ChangeLog 2015-02-18 22:35:08 UTC (rev 180299)
+++ branches/safari-600.4.10-branch/ChangeLog 2015-02-18 22:38:52 UTC (rev 180300)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-18 Lucas Forschler <lforschler@apple.com>
+
+ Merge r176899
+
+ 2014-12-05 Simon Fraser <simon.fraser@apple.com>
+
+ Programmatic scrolling and content changes are not always synchronized
+ https://bugs.webkit.org/show_bug.cgi?id=139245
+ rdar://problem/18833612
+
+ Reviewed by Anders Carlsson.
+
+ Manual test that tries to sync layout with programmatic scrolling.
+
+ * ManualTests/programmatic-scroll-flicker.html: Added.
+
</ins><span class="cx"> 2014-07-15 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMAKE] ENABLE_ENCRYPTED_MEDIA_V2 should depend on ENABLE_VIDEO
</span></span></pre></div>
<a id="branchessafari600410branchManualTestsprogrammaticscrollflickerhtmlfromrev176899trunkManualTestsprogrammaticscrollflickerhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.4.10-branch/ManualTests/programmatic-scroll-flicker.html (from rev 176899, trunk/ManualTests/programmatic-scroll-flicker.html) (0 => 180300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/ManualTests/programmatic-scroll-flicker.html (rev 0)
+++ branches/safari-600.4.10-branch/ManualTests/programmatic-scroll-flicker.html 2015-02-18 22:38:52 UTC (rev 180300)
</span><span class="lines">@@ -0,0 +1,120 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<style>
+ #testInner {
+ position: absolute;
+ width: 600px;
+ top: 400px;
+ left: 200px;;
+ padding: 1em;
+ background: yellow;
+ box-shadow: 0 0 0.5em gray;
+ }
+
+ .marker {
+ position: fixed;
+ background: black;
+ color: white;
+ top: 200px;
+ padding: 1em;
+ }
+
+ .spacer {
+ height: 200px;
+ }
+
+ button {
+ position: fixed;
+ top: 100px;
+ left: 200px;
+ padding: 2em;
+ font-size: 16px;
+ font-weight: bold;
+ }
+
+ .trigger #testInner {
+ -webkit-transform: translateY(-200px);
+ }
+</style>
+</head>
+<body>
+<button onclick="toggleRunning()">
+ CLICK ME to start / stop test
+</button>
+<div class="marker">Correct top position</div>
+<div id="parent" class="trigger">
+ <div id="testInner">test element</div>
+</div>
+<p class="spacer">.</p>
+<p class="spacer">.</p>
+<p class="spacer">.</p>
+<p class="spacer">.</p>
+<p class="spacer">.</p>
+<p class="spacer">.</p>
+<p class="spacer" id="last">.</p>
+
+<script>
+var INTERVAL_MS = 17;
+var testElement = document.getElementById('testInner');
+var testContainerElement = document.getElementById('parent');
+
+var state = {};
+state.triggerTranslationOnOrOff = false;
+state.running = false;
+state.intervalId = 0;
+
+function updateState()
+{
+ var translated = testContainerElement.classList.contains('trigger');
+ state.scrolled = !translated;
+}
+
+function toggleRunning()
+{
+ state.running = !state.running;
+ if (state.running) {
+ updateState();
+ state.intervalId = setInterval(runSequence, INTERVAL_MS);
+ } else {
+ clearInterval(state.intervalId);
+ }
+}
+
+function doExpensiveContentUpdate()
+{
+ var content = 'I should be stable at the correct position and not flicker above/below';
+ if (state.scrolled)
+ content += '.';
+
+ testElement.innerHTML = content;
+
+ var lastElement = document.getElementById('last');
+ var startTime = Date.now();
+ for (var i = 0; i < 1000; i++) {
+ lastElement.innerHTML = (lastElement.innerHTML + '.');
+ }
+ var domWriteTimeMs = Date.now() - startTime;
+ if (domWriteTimeMs > 2 * INTERVAL_MS)
+ lastElement.innerHTML = '';
+}
+
+function runSequence()
+{
+ doExpensiveContentUpdate();
+
+ var newScrollTop;
+ if (state.scrolled) {
+ testContainerElement.classList.add('trigger');
+ newScrollTop = 0;
+ } else {
+ testContainerElement.classList.remove('trigger');
+ newScrollTop = 200;
+ }
+
+ document.body.scrollTop = newScrollTop;
+ state.scrolled = !state.scrolled;
+}
+
+</script>
+</body>
+
</ins></span></pre></div>
<a id="branchessafari600410branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/Source/WebCore/ChangeLog (180299 => 180300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/Source/WebCore/ChangeLog 2015-02-18 22:35:08 UTC (rev 180299)
+++ branches/safari-600.4.10-branch/Source/WebCore/ChangeLog 2015-02-18 22:38:52 UTC (rev 180300)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2015-02-18 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176899
+
+ 2014-12-05 Simon Fraser <simon.fraser@apple.com>
+
+ Programmatic scrolling and content changes are not always synchronized
+ https://bugs.webkit.org/show_bug.cgi?id=139245
+ rdar://problem/18833612
+
+ Reviewed by Anders Carlsson.
+
+ For programmatic scrolls, AsyncScrollingCoordinator::requestScrollPositionUpdate()
+ calls updateScrollPositionAfterAsyncScroll(), then dispatches the requested
+ scroll position to the scrolling thread.
+
+ Once the scrolling thread commits, it calls back to the main thread via
+ scheduleUpdateScrollPositionAfterAsyncScroll(), which schedules a second
+ call to updateScrollPositionAfterAsyncScroll() on a timer. That's a problem,
+ because some other scroll may have happened in the meantime; when the timer
+ fires, it can sometimes restore a stale scroll position.
+
+ Fix by bailing early from scheduleUpdateScrollPositionAfterAsyncScroll()
+ for programmatic scrolls, since we know that requestScrollPositionUpdate()
+ already did the updateScrollPositionAfterAsyncScroll().
+
+ Test:
+ ManualTests/programmatic-scroll-flicker.html
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::reset): nullptr.
+ (WebCore::FrameView::setScrollPosition): Ditto.
+ (WebCore::FrameView::setWasScrolledByUser): Ditto.
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::requestScrollPositionUpdate): Use a local variable for
+ isProgrammaticScroll just to make sure we use the same value for the duration of this function.
+ (WebCore::AsyncScrollingCoordinator::scheduleUpdateScrollPositionAfterAsyncScroll): Do nothing
+ if this is a programmatic scroll.
+
+2015-02-18 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r176750
</span><span class="cx">
</span><span class="cx"> 2014-12-03 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari600410branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/Source/WebCore/page/FrameView.cpp (180299 => 180300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/Source/WebCore/page/FrameView.cpp 2015-02-18 22:35:08 UTC (rev 180299)
+++ branches/safari-600.4.10-branch/Source/WebCore/page/FrameView.cpp 2015-02-18 22:38:52 UTC (rev 180300)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> m_visuallyNonEmptyPixelCount = 0;
</span><span class="cx"> m_isVisuallyNonEmpty = false;
</span><span class="cx"> m_firstVisuallyNonEmptyLayoutCallbackPending = true;
</span><del>- m_maintainScrollPositionAnchor = 0;
</del><ins>+ m_maintainScrollPositionAnchor = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::removeFromAXObjectCache()
</span><span class="lines">@@ -1989,7 +1989,7 @@
</span><span class="cx"> void FrameView::setScrollPosition(const IntPoint& scrollPoint)
</span><span class="cx"> {
</span><span class="cx"> TemporaryChange<bool> changeInProgrammaticScroll(m_inProgrammaticScroll, true);
</span><del>- m_maintainScrollPositionAnchor = 0;
</del><ins>+ m_maintainScrollPositionAnchor = nullptr;
</ins><span class="cx"> ScrollView::setScrollPosition(scrollPoint);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3577,7 +3577,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_inProgrammaticScroll)
</span><span class="cx"> return;
</span><del>- m_maintainScrollPositionAnchor = 0;
</del><ins>+ m_maintainScrollPositionAnchor = nullptr;
</ins><span class="cx"> if (m_wasScrolledByUser == wasScrolledByUser)
</span><span class="cx"> return;
</span><span class="cx"> m_wasScrolledByUser = wasScrolledByUser;
</span></span></pre></div>
<a id="branchessafari600410branchSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (180299 => 180300)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2015-02-18 22:35:08 UTC (rev 180299)
+++ branches/safari-600.4.10-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2015-02-18 22:38:52 UTC (rev 180300)
</span><span class="lines">@@ -153,8 +153,9 @@
</span><span class="cx"> if (!coordinatesScrollingForFrameView(frameView))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (frameView->inProgrammaticScroll() || frameView->frame().document()->inPageCache())
- updateScrollPositionAfterAsyncScroll(frameView->scrollLayerID(), scrollPosition, frameView->inProgrammaticScroll(), SetScrollingLayerPosition);
</del><ins>+ bool isProgrammaticScroll = frameView->inProgrammaticScroll();
+ if (isProgrammaticScroll || frameView->frame().document()->inPageCache())
+ updateScrollPositionAfterAsyncScroll(frameView->scrollLayerID(), scrollPosition, isProgrammaticScroll, SetScrollingLayerPosition);
</ins><span class="cx">
</span><span class="cx"> // If this frame view's document is being put into the page cache, we don't want to update our
</span><span class="cx"> // main frame scroll position. Just let the FrameView think that we did.
</span><span class="lines">@@ -165,7 +166,7 @@
</span><span class="cx"> if (!stateNode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- stateNode->setRequestedScrollPosition(scrollPosition, frameView->inProgrammaticScroll());
</del><ins>+ stateNode->setRequestedScrollPosition(scrollPosition, isProgrammaticScroll);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -173,6 +174,10 @@
</span><span class="cx"> {
</span><span class="cx"> ScheduledScrollUpdate scrollUpdate(nodeID, scrollPosition, programmaticScroll, scrollingLayerPositionAction);
</span><span class="cx">
</span><ins>+ // For programmatic scrolls, requestScrollPositionUpdate() has already called updateScrollPositionAfterAsyncScroll().
+ if (programmaticScroll)
+ return;
+
</ins><span class="cx"> if (m_updateNodeScrollPositionTimer.isActive()) {
</span><span class="cx"> if (m_scheduledScrollUpdate.matchesUpdateType(scrollUpdate)) {
</span><span class="cx"> m_scheduledScrollUpdate.scrollPosition = scrollPosition;
</span></span></pre>
</div>
</div>
</body>
</html>