Title: [172059] branches/safari-600.1.4-branch/Source/WebCore
- Revision
- 172059
- Author
- matthew_han...@apple.com
- Date
- 2014-08-05 13:29:54 -0700 (Tue, 05 Aug 2014)
Log Message
Merge r172053. <rdar://problem/17876385>
Modified Paths
Diff
Modified: branches/safari-600.1.4-branch/Source/WebCore/ChangeLog (172058 => 172059)
--- branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-08-05 20:25:26 UTC (rev 172058)
+++ branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-08-05 20:29:54 UTC (rev 172059)
@@ -1,5 +1,21 @@
2014-08-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r172053. <rdar://problem/17876385>
+
+ 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>
+
+ This hit ASSERT(frame().isMainFrame()) in FrameView::updateLayerFlushThrottling
+ running scrollbars/scrollbar-iframe-click-does-not-blur-content.html and a few other tests.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setWasScrolledByUser): Only invoke updateLayerFlushThrottling for the main frame.
+
+2014-08-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r172039. <rdar://problem/17876385>
2014-08-05 Antti Koivisto <an...@apple.com>
Modified: branches/safari-600.1.4-branch/Source/WebCore/page/FrameView.cpp (172058 => 172059)
--- branches/safari-600.1.4-branch/Source/WebCore/page/FrameView.cpp 2014-08-05 20:25:26 UTC (rev 172058)
+++ branches/safari-600.1.4-branch/Source/WebCore/page/FrameView.cpp 2014-08-05 20:29:54 UTC (rev 172059)
@@ -3563,7 +3563,8 @@
if (m_wasScrolledByUser == wasScrolledByUser)
return;
m_wasScrolledByUser = wasScrolledByUser;
- updateLayerFlushThrottling();
+ if (frame().isMainFrame())
+ updateLayerFlushThrottling();
adjustTiledBackingCoverage();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
