Diff
Modified: trunk/LayoutTests/ChangeLog (268996 => 268997)
--- trunk/LayoutTests/ChangeLog 2020-10-26 21:19:02 UTC (rev 268996)
+++ trunk/LayoutTests/ChangeLog 2020-10-26 21:49:20 UTC (rev 268997)
@@ -1,3 +1,16 @@
+2020-10-26 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r268947.
+
+ Caused 60 image failures on Catalina WK2
+
+ Reverted changeset:
+
+ "REGRESSION (r260276): Unable to click on image and text link
+ at the bottom of https://www.nytimes.com/ article"
+ https://bugs.webkit.org/show_bug.cgi?id=218137
+ https://trac.webkit.org/changeset/268947
+
2020-10-26 Diego Pino Garcia <[email protected]>
[GTK] Unreviewed test gardening. Update expectations after r268973.
Modified: trunk/LayoutTests/compositing/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt (268996 => 268997)
--- trunk/LayoutTests/compositing/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt 2020-10-26 21:19:02 UTC (rev 268996)
+++ trunk/LayoutTests/compositing/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt 2020-10-26 21:49:20 UTC (rev 268997)
@@ -6,28 +6,46 @@
(GraphicsLayer
(bounds 800.00 600.00)
(contentsOpaque 1)
- (children 4
+ (children 3
(GraphicsLayer
- (position 30.00 22.00)
- (bounds 320.00 320.00)
- (clips 1)
+ (position 28.00 20.00)
+ (bounds 324.00 324.00)
(children 1
(GraphicsLayer
- (position 10.00 10.00)
- (bounds 300.00 300.00)
- (drawsContent 1)
+ (offsetFromRenderer width=2 height=2)
+ (position 2.00 2.00)
+ (bounds 320.00 320.00)
+ (clips 1)
(children 1
(GraphicsLayer
- (offsetFromRenderer width=2 height=2)
- (position 2.00 2.00)
- (bounds 281.00 296.00)
- (clips 1)
- (children 1
+ (position 10.00 10.00)
+ (bounds 300.00 300.00)
+ (drawsContent 1)
+ (children 2
(GraphicsLayer
(offsetFromRenderer width=2 height=2)
- (anchor 0.00 0.00)
- (bounds 281.00 364.00)
+ (position 2.00 2.00)
+ (bounds 281.00 296.00)
+ (clips 1)
+ (children 1
+ (GraphicsLayer
+ (offsetFromRenderer width=2 height=2)
+ (anchor 0.00 0.00)
+ (bounds 281.00 364.00)
+ )
+ )
)
+ (GraphicsLayer
+ (position 2.00 2.00)
+ (bounds 296.00 296.00)
+ (children 1
+ (GraphicsLayer
+ (position 281.00 0.00)
+ (bounds 15.00 296.00)
+ (drawsContent 1)
+ )
+ )
+ )
)
)
)
@@ -58,24 +76,6 @@
)
)
)
- (GraphicsLayer
- (position 30.00 22.00)
- (bounds 320.00 320.00)
- (clips 1)
- (children 1
- (GraphicsLayer
- (position 12.00 12.00)
- (bounds 296.00 296.00)
- (children 1
- (GraphicsLayer
- (position 281.00 0.00)
- (bounds 15.00 296.00)
- (drawsContent 1)
- )
- )
- )
- )
- )
)
)
)
Modified: trunk/LayoutTests/compositing/shared-backing/overflow-scroll/relative-in-clipping-in-scroller-in-clipping-expected.txt (268996 => 268997)
--- trunk/LayoutTests/compositing/shared-backing/overflow-scroll/relative-in-clipping-in-scroller-in-clipping-expected.txt 2020-10-26 21:19:02 UTC (rev 268996)
+++ trunk/LayoutTests/compositing/shared-backing/overflow-scroll/relative-in-clipping-in-scroller-in-clipping-expected.txt 2020-10-26 21:49:20 UTC (rev 268997)
@@ -8,35 +8,42 @@
(contentsOpaque 1)
(children 1
(GraphicsLayer
- (position 30.00 22.00)
- (bounds 320.00 320.00)
+ (position 28.00 20.00)
+ (bounds 324.00 324.00)
(children 1
(GraphicsLayer
- (position 10.00 10.00)
- (bounds 300.00 300.00)
- (drawsContent 1)
- (children 2
+ (offsetFromRenderer width=2 height=2)
+ (position 2.00 2.00)
+ (bounds 320.00 320.00)
+ (children 1
(GraphicsLayer
- (offsetFromRenderer width=2 height=2)
- (position 2.00 2.00)
- (bounds 281.00 296.00)
- (children 1
+ (position 10.00 10.00)
+ (bounds 300.00 300.00)
+ (drawsContent 1)
+ (children 2
(GraphicsLayer
(offsetFromRenderer width=2 height=2)
- (anchor 0.00 0.00)
- (bounds 281.00 466.00)
- (drawsContent 1)
+ (position 2.00 2.00)
+ (bounds 281.00 296.00)
+ (children 1
+ (GraphicsLayer
+ (offsetFromRenderer width=2 height=2)
+ (anchor 0.00 0.00)
+ (bounds 281.00 466.00)
+ (drawsContent 1)
+ )
+ )
)
- )
- )
- (GraphicsLayer
- (position 2.00 2.00)
- (bounds 296.00 296.00)
- (children 1
(GraphicsLayer
- (position 281.00 0.00)
- (bounds 15.00 296.00)
- (drawsContent 1)
+ (position 2.00 2.00)
+ (bounds 296.00 296.00)
+ (children 1
+ (GraphicsLayer
+ (position 281.00 0.00)
+ (bounds 15.00 296.00)
+ (drawsContent 1)
+ )
+ )
)
)
)
Deleted: trunk/LayoutTests/fast/layers/overflow-scroll-self-painting-expected.html (268996 => 268997)
--- trunk/LayoutTests/fast/layers/overflow-scroll-self-painting-expected.html 2020-10-26 21:19:02 UTC (rev 268996)
+++ trunk/LayoutTests/fast/layers/overflow-scroll-self-painting-expected.html 2020-10-26 21:49:20 UTC (rev 268997)
@@ -1,35 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
-<html>
-<head>
- <style>
- .container {
- width: 300px;
- height: 300px;
- border: 1px solid black;
- background-color: rgba(200, 200, 200, 0.5);
- }
-
- .content {
- height: 90%;
- }
-
- .box {
- margin-top: -120px;
- margin-left: 50px;
- width: 200px;
- height: 200px;
- background-color: blue;
-
- }
-
- .box:hover {
- background-color: green;
- }
- </style>
-</head>
-<body>
- <p>Blue box should be on top.</p>
- <div class="container"></div>
- <div class="box"></div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/layers/overflow-scroll-self-painting.html (268996 => 268997)
--- trunk/LayoutTests/fast/layers/overflow-scroll-self-painting.html 2020-10-26 21:19:02 UTC (rev 268996)
+++ trunk/LayoutTests/fast/layers/overflow-scroll-self-painting.html 2020-10-26 21:49:20 UTC (rev 268997)
@@ -1,36 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
-<html>
-<head>
- <style>
- .container {
- width: 300px;
- height: 300px;
- border: 1px solid black;
- background-color: rgba(200, 200, 200, 0.5);
- overflow-x: hidden;
- }
-
- .content {
- height: 90%;
- }
-
- .box {
- margin-top: -120px;
- margin-left: 50px;
- width: 200px;
- height: 200px;
- background-color: blue;
-
- }
-
- .box:hover {
- background-color: green;
- }
- </style>
-</head>
-<body>
- <p>Blue box should be on top.</p>
- <div class="container"></div>
- <div class="box"></div>
-</body>
-</html>
Modified: trunk/LayoutTests/platform/ios-wk2/compositing/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt (268996 => 268997)
--- trunk/LayoutTests/platform/ios-wk2/compositing/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt 2020-10-26 21:19:02 UTC (rev 268996)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/shared-backing/overflow-scroll/previous-sibling-prevents-inclusiveness-expected.txt 2020-10-26 21:49:20 UTC (rev 268997)
@@ -8,25 +8,32 @@
(contentsOpaque 1)
(children 3
(GraphicsLayer
- (position 30.00 22.00)
- (bounds 320.00 320.00)
- (clips 1)
+ (position 28.00 20.00)
+ (bounds 324.00 324.00)
(children 1
(GraphicsLayer
- (position 10.00 10.00)
- (bounds 300.00 300.00)
- (drawsContent 1)
+ (offsetFromRenderer width=2 height=2)
+ (position 2.00 2.00)
+ (bounds 320.00 320.00)
+ (clips 1)
(children 1
(GraphicsLayer
- (offsetFromRenderer width=2 height=2)
- (position 2.00 2.00)
- (bounds 296.00 296.00)
- (clips 1)
+ (position 10.00 10.00)
+ (bounds 300.00 300.00)
+ (drawsContent 1)
(children 1
(GraphicsLayer
(offsetFromRenderer width=2 height=2)
- (anchor 0.00 0.00)
- (bounds 296.00 364.00)
+ (position 2.00 2.00)
+ (bounds 296.00 296.00)
+ (clips 1)
+ (children 1
+ (GraphicsLayer
+ (offsetFromRenderer width=2 height=2)
+ (anchor 0.00 0.00)
+ (bounds 296.00 364.00)
+ )
+ )
)
)
)
Modified: trunk/LayoutTests/platform/ios-wk2/compositing/shared-backing/overflow-scroll/relative-in-clipping-in-scroller-in-clipping-expected.txt (268996 => 268997)
--- trunk/LayoutTests/platform/ios-wk2/compositing/shared-backing/overflow-scroll/relative-in-clipping-in-scroller-in-clipping-expected.txt 2020-10-26 21:19:02 UTC (rev 268996)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/shared-backing/overflow-scroll/relative-in-clipping-in-scroller-in-clipping-expected.txt 2020-10-26 21:49:20 UTC (rev 268997)
@@ -8,24 +8,31 @@
(contentsOpaque 1)
(children 1
(GraphicsLayer
- (position 30.00 22.00)
- (bounds 320.00 320.00)
+ (position 28.00 20.00)
+ (bounds 324.00 324.00)
(children 1
(GraphicsLayer
- (position 10.00 10.00)
- (bounds 300.00 300.00)
- (drawsContent 1)
+ (offsetFromRenderer width=2 height=2)
+ (position 2.00 2.00)
+ (bounds 320.00 320.00)
(children 1
(GraphicsLayer
- (offsetFromRenderer width=2 height=2)
- (position 2.00 2.00)
- (bounds 296.00 296.00)
+ (position 10.00 10.00)
+ (bounds 300.00 300.00)
+ (drawsContent 1)
(children 1
(GraphicsLayer
(offsetFromRenderer width=2 height=2)
- (anchor 0.00 0.00)
- (bounds 296.00 468.00)
- (drawsContent 1)
+ (position 2.00 2.00)
+ (bounds 296.00 296.00)
+ (children 1
+ (GraphicsLayer
+ (offsetFromRenderer width=2 height=2)
+ (anchor 0.00 0.00)
+ (bounds 296.00 468.00)
+ (drawsContent 1)
+ )
+ )
)
)
)
Modified: trunk/Source/WebCore/ChangeLog (268996 => 268997)
--- trunk/Source/WebCore/ChangeLog 2020-10-26 21:19:02 UTC (rev 268996)
+++ trunk/Source/WebCore/ChangeLog 2020-10-26 21:49:20 UTC (rev 268997)
@@ -1,3 +1,16 @@
+2020-10-26 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r268947.
+
+ Caused 60 image failures on Catalina WK2
+
+ Reverted changeset:
+
+ "REGRESSION (r260276): Unable to click on image and text link
+ at the bottom of https://www.nytimes.com/ article"
+ https://bugs.webkit.org/show_bug.cgi?id=218137
+ https://trac.webkit.org/changeset/268947
+
2020-10-26 Antti Koivisto <[email protected]>
[LFC][Integration] Use term "modern line layout" in RenderBlockFlow
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (268996 => 268997)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2020-10-26 21:19:02 UTC (rev 268996)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2020-10-26 21:49:20 UTC (rev 268997)
@@ -3898,7 +3898,6 @@
ScrollOffset originalScrollOffset = scrollOffset();
computeScrollDimensions();
- updateSelfPaintingLayer();
#if ENABLE(CSS_SCROLL_SNAP)
// FIXME: Ensure that offsets are also updated in case of programmatic style changes.
@@ -6504,7 +6503,7 @@
return true;
return hasOverlayScrollbars()
- || hasCompositedScrollableOverflow()
+ || canUseCompositedScrolling()
|| renderer().isTableRow()
|| renderer().isCanvas()
|| renderer().isVideo()
