Title: [237946] trunk
- Revision
- 237946
- Author
- [email protected]
- Date
- 2018-11-07 15:02:37 -0800 (Wed, 07 Nov 2018)
Log Message
Revert 237849: it breaks MotionMark
https://bugs.webkit.org/show_bug.cgi?id=191398
Reviewed by Simon Fraser.
Source/WebCore:
This change broke painting while the test is running.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateScrollCoordinatedStatus):
LayoutTests:
* fast/scrolling/ios/update-scroll-coordinated-status-expected.txt: Removed.
* fast/scrolling/ios/update-scroll-coordinated-status.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (237945 => 237946)
--- trunk/LayoutTests/ChangeLog 2018-11-07 22:14:21 UTC (rev 237945)
+++ trunk/LayoutTests/ChangeLog 2018-11-07 23:02:37 UTC (rev 237946)
@@ -1,5 +1,15 @@
2018-11-07 Simon Fraser <[email protected]>
+ Revert 237849: it breaks MotionMark
+ https://bugs.webkit.org/show_bug.cgi?id=191398
+
+ Reviewed by Simon Fraser.
+
+ * fast/scrolling/ios/update-scroll-coordinated-status-expected.txt: Removed.
+ * fast/scrolling/ios/update-scroll-coordinated-status.html: Removed.
+
+2018-11-07 Simon Fraser <[email protected]>
+
Some WK1 repaint tests are flakey
https://bugs.webkit.org/show_bug.cgi?id=190627
Deleted: trunk/LayoutTests/fast/scrolling/ios/update-scroll-coordinated-status-expected.txt (237945 => 237946)
--- trunk/LayoutTests/fast/scrolling/ios/update-scroll-coordinated-status-expected.txt 2018-11-07 22:14:21 UTC (rev 237945)
+++ trunk/LayoutTests/fast/scrolling/ios/update-scroll-coordinated-status-expected.txt 2018-11-07 23:02:37 UTC (rev 237946)
@@ -1,108 +0,0 @@
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (visible rect 0.00, 0.00 800.00 x 600.00)
- (coverage rect 0.00, 0.00 800.00 x 600.00)
- (intersects coverage rect 1)
- (contentsScale 2.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (visible rect 0.00, 0.00 800.00 x 600.00)
- (coverage rect 0.00, 0.00 800.00 x 600.00)
- (intersects coverage rect 1)
- (contentsScale 2.00)
- (tile cache coverage 0, 0 800 x 600)
- (tile size 800 x 600)
- (top left tile 0, 0 tiles grid 1 x 1)
- (in window 1)
- (children 2
- (GraphicsLayer
- (position 13.00 18.00)
- (bounds 210.00 210.00)
- (drawsContent 1)
- (visible rect 0.00, 0.00 210.00 x 210.00)
- (coverage rect -13.00, -18.00 800.00 x 600.00)
- (intersects coverage rect 1)
- (contentsScale 2.00)
- )
- (GraphicsLayer
- (position 255.00 18.00)
- (bounds 210.00 210.00)
- (drawsContent 1)
- (visible rect 0.00, 0.00 210.00 x 210.00)
- (coverage rect -255.00, -18.00 800.00 x 600.00)
- (intersects coverage rect 1)
- (contentsScale 2.00)
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=-5 height=-5)
- (position 5.00 5.00)
- (bounds 200.00 200.00)
- (visible rect 0.00, 0.00 200.00 x 200.00)
- (coverage rect 0.00, 0.00 200.00 x 200.00)
- (intersects coverage rect 1)
- (contentsScale 2.00)
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=5 height=5)
- (bounds 200.00 400.00)
- (drawsContent 1)
- (visible rect 0.00, 0.00 200.00 x 200.00)
- (coverage rect 0.00, 0.00 200.00 x 200.00)
- (intersects coverage rect 1)
- (contentsScale 2.00)
- )
- )
- )
- )
- )
- )
- )
- )
-)
-
-
-
-(Frame scrolling node
- (scrollable area size 800 600)
- (contents size 800 600)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- (visual viewport enabled 1)
- (layout viewport at (0,0) size 800x600)
- (min layout viewport origin (0,0))
- (max layout viewport origin (0,0))
- (behavior for fixed 0)
- (children 2
- (Fixed node
- (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
- (viewport rect at last layout at (0,0) size 800x600)
- (layer position at last layout (13,18))
- (children 0
- )
- )
- (Fixed node
- (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
- (viewport rect at last layout at (0,0) size 800x600)
- (layer position at last layout (255,18))
- (children 1
- (Overflow scrolling node
- (scrollable area size 200 200)
- (contents size 200 400)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- )
- )
- )
- )
-)
-
-
Deleted: trunk/LayoutTests/fast/scrolling/ios/update-scroll-coordinated-status.html (237945 => 237946)
--- trunk/LayoutTests/fast/scrolling/ios/update-scroll-coordinated-status.html 2018-11-07 22:14:21 UTC (rev 237945)
+++ trunk/LayoutTests/fast/scrolling/ios/update-scroll-coordinated-status.html 2018-11-07 23:02:37 UTC (rev 237946)
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Update scroll coordinated status</title>
- <style>
- .scrollable {
- position: fixed;
- width: 200px;
- height: 200px;
- overflow: auto;
- -webkit-overflow-scrolling: touch;
- border: 5px solid orange;
- margin: 5px;
- }
- .scrollable-content {
- width: 100px;
- height: 100px;
- background: linear-gradient(135deg, yellow, cyan);
- }
- .overflowing {
- height: 400px;
- }
- </style>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
- function doTest()
- {
- requestAnimationFrame(() => {
- document.querySelectorAll('.scrollable-content').forEach((div) => {
- div.classList.toggle('overflowing');
- });
- if (window.testRunner && window.internals) {
- requestAnimationFrame(() => {
- document.getElementById('layerTree').innerText = internals.layerTreeAsText(document,
- internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES) + "\n\n" +
- internals.scrollingStateTreeAsText() + "\n";
- testRunner.notifyDone();
- });
- }
- });
- }
- window.addEventListener('load', doTest, false);
- </script>
- </head>
- <body>
- <div class="scrollable">
- <div class="scrollable-content overflowing">
- </div>
- </div>
- <div class="scrollable" style="left: 250px">
- <div class="scrollable-content">
- </div>
- </div>
- <pre id="layerTree"></pre>
- </body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (237945 => 237946)
--- trunk/Source/WebCore/ChangeLog 2018-11-07 22:14:21 UTC (rev 237945)
+++ trunk/Source/WebCore/ChangeLog 2018-11-07 23:02:37 UTC (rev 237946)
@@ -1,3 +1,15 @@
+2018-11-07 Simon Fraser <[email protected]>
+
+ Revert 237849: it breaks MotionMark
+ https://bugs.webkit.org/show_bug.cgi?id=191398
+
+ Reviewed by Simon Fraser.
+
+ This change broke painting while the test is running.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateScrollCoordinatedStatus):
+
2018-11-07 Don Olmstead <[email protected]>
Simplify macros in platform
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (237945 => 237946)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2018-11-07 22:14:21 UTC (rev 237945)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2018-11-07 23:02:37 UTC (rev 237946)
@@ -3544,9 +3544,6 @@
if (layer.isComposited())
layer.backing()->setIsScrollCoordinatedWithViewportConstrainedRole(coordinationRoles.contains(ViewportConstrained));
- if (layer.backing() && layer.backing()->updateConfiguration())
- setCompositingLayersNeedRebuild();
-
if (coordinationRoles && canCoordinateScrollingForLayer(layer)) {
if (m_scrollCoordinatedLayers.add(&layer).isNewEntry)
m_subframeScrollLayersNeedReattach = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
