<!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>[182346] 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/182346">182346</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-04-04 15:39:29 -0700 (Sat, 04 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/182215">r182215</a>): Feedly crashes when closing article
https://bugs.webkit.org/show_bug.cgi?id=143405
rdar://problem/20382734, rdar://problem/20395497
Reviewed by Tim Horton.
Source/WebCore:
Calling computeNonFastScrollableRegion() eagerly when scrollable areas come and go
is bad, because it can cause FrameView::layout() to get called in the middle of
RenderObject destruction, which leaves the render tree in a bad state.
Fix by calling computeNonFastScrollableRegion() lazily, just before scrolling tree commit.
AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged() now just sets
a flag to say that the non-fast region needs to be recomputed, and that schedules
a scrolling tree commit. When the commit happens, we recompute the region. If the
region didn't change, and no other changes are pending, there's no need to commit.
Test: platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash.html
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::setNonFastScrollableRegionDirty):
(WebCore::AsyncScrollingCoordinator::willCommitTree):
(WebCore::AsyncScrollingCoordinator::updateNonFastScrollableRegion):
(WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
(WebCore::AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged):
(WebCore::AsyncScrollingCoordinator::scrollingStateTreeAsText): Need to eagerly update
the non-fast scrollable region.
* page/scrolling/AsyncScrollingCoordinator.h:
(WebCore::AsyncScrollingCoordinator::nonFastScrollableRegionDirty):
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::ScrollingCoordinator):
(WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
* page/scrolling/ScrollingCoordinator.h:
(WebCore::ScrollingCoordinator::willCommitTree):
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::commitTreeStateIfNeeded):
(WebCore::ScrollingCoordinatorMac::scheduleTreeStateCommit):
(WebCore::ScrollingCoordinatorMac::commitTreeState):
Source/WebKit2:
Calling computeNonFastScrollableRegion() eagerly when scrollable areas come and go
is bad, because it can cause FrameView::layout() to get called in the middle of
RenderObject destruction, which leaves the render tree in a bad state.
Fix by calling computeNonFastScrollableRegion() lazily, just before scrolling tree commit.
AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged() now just sets
a flag to say that the non-fast region needs to be recomputed, and that schedules
a scrolling tree commit. When the commit happens, we recompute the region. If the
region didn't change, and no other changes are pending, there's no need to commit.
* WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
(WebKit::RemoteScrollingCoordinator::buildTransaction):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::flushLayers): Outdent #ifdefs.
LayoutTests:
Test that triggers a crash without the fix (thanks to Zalan for the test).
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-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="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm">trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregioncomputeregioninsidedeleterenderercrashexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregioncomputeregioninsidedeleterenderercrashhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/LayoutTests/ChangeLog 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-04-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r182215): Feedly crashes when closing article
+ https://bugs.webkit.org/show_bug.cgi?id=143405
+ rdar://problem/20382734, rdar://problem/20395497
+
+ Reviewed by Tim Horton.
+
+ Test that triggers a crash without the fix (thanks to Zalan for the test).
+
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash.html: Added.
+
+2015-04-04 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Differentiate between composited scrolling, and async scrolling
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143291
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregioncomputeregioninsidedeleterenderercrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash-expected.txt (0 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash-expected.txt 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Test passes if it does not crash.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregioncomputeregioninsidedeleterenderercrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash.html (0 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash.html 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<html>
+<head>
+ <style>
+ .scroller {
+ height: 10px;
+ width: 10px;
+ overflow: scroll;
+ border: 1px solid black;
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doTest()
+ {
+ setTimeout(function() {
+ var scroller = document.getElementById('scoller');
+ var newNode = document.createElement('div');
+ var container = document.getElementById('container');
+ container.insertBefore(newNode, scroller);
+ scroller.parentNode.removeChild(scroller);
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<p>Test passes if it does not crash.</p>
+<div><div id="container"><div id="scoller" class="scroller">foo</div></div></div>
+<script>
+ document.getElementById("scoller").addEventListener("mousewheel", function() { }, false);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/Source/WebCore/ChangeLog 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2015-04-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r182215): Feedly crashes when closing article
+ https://bugs.webkit.org/show_bug.cgi?id=143405
+ rdar://problem/20382734, rdar://problem/20395497
+
+ Reviewed by Tim Horton.
+
+ Calling computeNonFastScrollableRegion() eagerly when scrollable areas come and go
+ is bad, because it can cause FrameView::layout() to get called in the middle of
+ RenderObject destruction, which leaves the render tree in a bad state.
+
+ Fix by calling computeNonFastScrollableRegion() lazily, just before scrolling tree commit.
+
+ AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged() now just sets
+ a flag to say that the non-fast region needs to be recomputed, and that schedules
+ a scrolling tree commit. When the commit happens, we recompute the region. If the
+ region didn't change, and no other changes are pending, there's no need to commit.
+
+ Test: platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/compute-region-inside-delete-renderer-crash.html
+
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::setNonFastScrollableRegionDirty):
+ (WebCore::AsyncScrollingCoordinator::willCommitTree):
+ (WebCore::AsyncScrollingCoordinator::updateNonFastScrollableRegion):
+ (WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
+ (WebCore::AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged):
+ (WebCore::AsyncScrollingCoordinator::scrollingStateTreeAsText): Need to eagerly update
+ the non-fast scrollable region.
+ * page/scrolling/AsyncScrollingCoordinator.h:
+ (WebCore::AsyncScrollingCoordinator::nonFastScrollableRegionDirty):
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::ScrollingCoordinator):
+ (WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
+ * page/scrolling/ScrollingCoordinator.h:
+ (WebCore::ScrollingCoordinator::willCommitTree):
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::commitTreeStateIfNeeded):
+ (WebCore::ScrollingCoordinatorMac::scheduleTreeStateCommit):
+ (WebCore::ScrollingCoordinatorMac::commitTreeState):
+
+2015-04-04 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Differentiate between composited scrolling, and async scrolling
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143291
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -73,6 +73,27 @@
</span><span class="cx"> node.setVerticalSnapOffsets(snapOffsetsAsFloat);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AsyncScrollingCoordinator::setNonFastScrollableRegionDirty()
+{
+ m_nonFastScrollableRegionDirty = true;
+ // We have to schedule a commit, but the computed non-fast region may not have actually changed.
+ scheduleTreeStateCommit();
+}
+
+void AsyncScrollingCoordinator::willCommitTree()
+{
+ updateNonFastScrollableRegion();
+}
+
+void AsyncScrollingCoordinator::updateNonFastScrollableRegion()
+{
+ if (!m_nonFastScrollableRegionDirty)
+ return;
+
+ m_scrollingStateTree->rootStateNode()->setNonFastScrollableRegion(computeNonFastScrollableRegion(m_page->mainFrame(), IntPoint()));
+ m_nonFastScrollableRegionDirty = false;
+}
+
</ins><span class="cx"> void AsyncScrollingCoordinator::frameViewLayoutUpdated(FrameView& frameView)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -88,6 +109,7 @@
</span><span class="cx"> // In the future, we may want to have the ability to set non-fast scrolling regions for more than
</span><span class="cx"> // just the root node. But right now, this concept only applies to the root.
</span><span class="cx"> m_scrollingStateTree->rootStateNode()->setNonFastScrollableRegion(computeNonFastScrollableRegion(m_page->mainFrame(), IntPoint()));
</span><ins>+ m_nonFastScrollableRegionDirty = false;
</ins><span class="cx">
</span><span class="cx"> if (!coordinatesScrollingForFrameView(frameView))
</span><span class="cx"> return;
</span><span class="lines">@@ -135,8 +157,7 @@
</span><span class="cx"> if (!m_scrollingStateTree->rootStateNode())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME: computeNonFastScrollableRegion lazily.
- m_scrollingStateTree->rootStateNode()->setNonFastScrollableRegion(computeNonFastScrollableRegion(m_page->mainFrame(), IntPoint()));
</del><ins>+ setNonFastScrollableRegionDirty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AsyncScrollingCoordinator::frameViewRootLayerDidChange(FrameView& frameView)
</span><span class="lines">@@ -500,8 +521,11 @@
</span><span class="cx">
</span><span class="cx"> String AsyncScrollingCoordinator::scrollingStateTreeAsText() const
</span><span class="cx"> {
</span><del>- if (m_scrollingStateTree->rootStateNode())
</del><ins>+ if (m_scrollingStateTree->rootStateNode()) {
+ if (m_nonFastScrollableRegionDirty)
+ m_scrollingStateTree->rootStateNode()->setNonFastScrollableRegion(computeNonFastScrollableRegion(m_page->mainFrame(), IntPoint()));
</ins><span class="cx"> return m_scrollingStateTree->rootStateNode()->scrollingStateTreeAsText();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return String();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -68,7 +68,10 @@
</span><span class="cx"> void updateScrollPositionAfterAsyncScroll(ScrollingNodeID, const FloatPoint&, bool programmaticScroll, SetOrSyncScrollingLayerPosition);
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT virtual String scrollingStateTreeAsText() const override;
</span><ins>+ WEBCORE_EXPORT virtual void willCommitTree() override;
</ins><span class="cx">
</span><ins>+ bool nonFastScrollableRegionDirty() const { return m_nonFastScrollableRegionDirty; }
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual bool isAsyncScrollingCoordinator() const override { return true; }
</span><span class="cx">
</span><span class="lines">@@ -104,6 +107,8 @@
</span><span class="cx"> void updateMainFrameScrollLayerPosition();
</span><span class="cx">
</span><span class="cx"> void updateScrollPositionAfterAsyncScrollTimerFired();
</span><ins>+ void setNonFastScrollableRegionDirty();
+ void updateNonFastScrollableRegion();
</ins><span class="cx">
</span><span class="cx"> FrameView* frameViewForScrollingNode(ScrollingNodeID) const;
</span><span class="cx">
</span><span class="lines">@@ -140,6 +145,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ScrollingStateTree> m_scrollingStateTree;
</span><span class="cx"> RefPtr<ScrollingTree> m_scrollingTree;
</span><ins>+
+ bool m_nonFastScrollableRegionDirty { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -67,7 +67,6 @@
</span><span class="cx">
</span><span class="cx"> ScrollingCoordinator::ScrollingCoordinator(Page* page)
</span><span class="cx"> : m_page(page)
</span><del>- , m_forceSynchronousScrollLayerPositionUpdates(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -126,6 +125,9 @@
</span><span class="cx"> if (!frameView)
</span><span class="cx"> return nonFastScrollableRegion;
</span><span class="cx">
</span><ins>+ // FIXME: should ASSERT(!frameView->needsLayout()) here, but need to fix DebugPageOverlays
+ // to not ask for regions at bad times.
+
</ins><span class="cx"> IntPoint offset = frameLocation;
</span><span class="cx"> offset.moveBy(frameView->frameRect().location());
</span><span class="cx"> offset.move(0, frameView->topContentInset());
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -214,6 +214,8 @@
</span><span class="cx"> GraphicsLayer* headerLayerForFrameView(FrameView&);
</span><span class="cx"> GraphicsLayer* footerLayerForFrameView(FrameView&);
</span><span class="cx">
</span><ins>+ virtual void willCommitTree() { }
+
</ins><span class="cx"> Page* m_page; // FIXME: ideally this would be a reference but it gets nulled on async teardown.
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -222,7 +224,7 @@
</span><span class="cx"> virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(const FrameView&) const;
</span><span class="cx"> void updateSynchronousScrollingReasons(FrameView&);
</span><span class="cx">
</span><del>- bool m_forceSynchronousScrollLayerPositionUpdates;
</del><ins>+ bool m_forceSynchronousScrollLayerPositionUpdates { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -79,9 +79,6 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingCoordinatorMac::commitTreeStateIfNeeded()
</span><span class="cx"> {
</span><del>- if (!scrollingStateTree()->hasChangedProperties())
- return;
-
</del><span class="cx"> commitTreeState();
</span><span class="cx"> m_scrollingStateTreeCommitterTimer.stop();
</span><span class="cx"> }
</span><span class="lines">@@ -103,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingCoordinatorMac::scheduleTreeStateCommit()
</span><span class="cx"> {
</span><del>- ASSERT(scrollingStateTree()->hasChangedProperties());
</del><ins>+ ASSERT(scrollingStateTree()->hasChangedProperties() || nonFastScrollableRegionDirty());
</ins><span class="cx">
</span><span class="cx"> if (m_scrollingStateTreeCommitterTimer.isActive())
</span><span class="cx"> return;
</span><span class="lines">@@ -118,7 +115,9 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingCoordinatorMac::commitTreeState()
</span><span class="cx"> {
</span><del>- ASSERT(scrollingStateTree()->hasChangedProperties());
</del><ins>+ willCommitTree();
+ if (!scrollingStateTree()->hasChangedProperties())
+ return;
</ins><span class="cx">
</span><span class="cx"> RefPtr<ThreadedScrollingTree> threadedScrollingTree = downcast<ThreadedScrollingTree>(scrollingTree());
</span><span class="cx"> ScrollingStateTree* unprotectedTreeState = scrollingStateTree()->commit(LayerRepresentation::PlatformLayerRepresentation).release();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-04-04 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r182215): Feedly crashes when closing article
+ https://bugs.webkit.org/show_bug.cgi?id=143405
+ rdar://problem/20382734, rdar://problem/20395497
+
+ Reviewed by Tim Horton.
+
+ Calling computeNonFastScrollableRegion() eagerly when scrollable areas come and go
+ is bad, because it can cause FrameView::layout() to get called in the middle of
+ RenderObject destruction, which leaves the render tree in a bad state.
+
+ Fix by calling computeNonFastScrollableRegion() lazily, just before scrolling tree commit.
+
+ AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged() now just sets
+ a flag to say that the non-fast region needs to be recomputed, and that schedules
+ a scrolling tree commit. When the commit happens, we recompute the region. If the
+ region didn't change, and no other changes are pending, there's no need to commit.
+
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
+ (WebKit::RemoteScrollingCoordinator::buildTransaction):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::flushLayers): Outdent #ifdefs.
+
</ins><span class="cx"> 2015-04-03 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempted build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx">
</span><span class="cx"> void RemoteScrollingCoordinator::buildTransaction(RemoteScrollingCoordinatorTransaction& transaction)
</span><span class="cx"> {
</span><ins>+ willCommitTree();
</ins><span class="cx"> transaction.setStateTreeToEncode(scrollingStateTree()->commit(LayerRepresentation::PlatformLayerIDRepresentation));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (182345 => 182346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-04-04 19:24:45 UTC (rev 182345)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-04-04 22:39:29 UTC (rev 182346)
</span><span class="lines">@@ -318,10 +318,10 @@
</span><span class="cx"> m_viewOverlayRootLayer->flushCompositingState(visibleRect);
</span><span class="cx">
</span><span class="cx"> bool returnValue = m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();
</span><del>- #if ENABLE(ASYNC_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = m_webPage.corePage()->scrollingCoordinator())
</span><span class="cx"> scrollingCoordinator->commitTreeStateIfNeeded();
</span><del>- #endif
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // If we have an active transient zoom, we want the zoom to win over any changes
</span><span class="cx"> // that WebCore makes to the relevant layers, so re-apply our changes after flushing.
</span></span></pre>
</div>
</div>
</body>
</html>