Title: [172107] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172107
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 16:36:22 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r172039. <rdar://problem/17876385>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172106 => 172107)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 23:34:30 UTC (rev 172106)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 23:36:22 UTC (rev 172107)
@@ -1,5 +1,25 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r172039
+
+ 2014-08-05 Antti Koivisto <an...@apple.com>
+
+ REGRESSION: Extremely flashy scrolling while a page is still loading (because of flush throttling)
+ https://bugs.webkit.org/show_bug.cgi?id=135603
+ <rdar://problem/17876385>
+
+ Reviewed by Andreas Kling.
+
+ * page/FrameView.cpp:
+ (WebCore::determineLayerFlushThrottleState):
+
+ Disable throttling after user has scrolled the page.
+ This is consistent with the speculative tiling. It also gets enabled on first scroll.
+
+ (WebCore::FrameView::setWasScrolledByUser):
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r172032
2014-08-05 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/page/FrameView.cpp (172106 => 172107)
--- branches/safari-600.1-branch/Source/WebCore/page/FrameView.cpp 2014-08-05 23:34:30 UTC (rev 172106)
+++ branches/safari-600.1-branch/Source/WebCore/page/FrameView.cpp 2014-08-05 23:36:22 UTC (rev 172107)
@@ -2276,6 +2276,9 @@
// We only throttle when constantly receiving new data during the inital page load.
if (!page.progress().isMainLoadProgressing())
return 0;
+ // Scrolling during page loading disables throttling.
+ if (page.mainFrame().view()->wasScrolledByUser())
+ return 0;
// Disable for image documents so large GIF animations don't get throttled during loading.
auto* document = page.mainFrame().document();
if (!document || isImageDocument(*document))
@@ -3566,6 +3569,7 @@
if (m_wasScrolledByUser == wasScrolledByUser)
return;
m_wasScrolledByUser = wasScrolledByUser;
+ updateLayerFlushThrottling();
adjustTiledBackingCoverage();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
