Diff
Modified: trunk/LayoutTests/ChangeLog (243291 => 243292)
--- trunk/LayoutTests/ChangeLog 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/ChangeLog 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1,3 +1,16 @@
+2019-03-21 Shawn Roberts <[email protected]>
+
+ Unreviewed, rolling out r243250.
+
+ Causing 109 Failures and 2 crashes on iOS Sim Debug
+ OpenSource/Internal queues
+
+ Reverted changeset:
+
+ "[iOS WK2] Turn on async overflow scrolling by default"
+ https://bugs.webkit.org/show_bug.cgi?id=196011
+ https://trac.webkit.org/changeset/243250
+
2019-03-21 Miguel Gomez <[email protected]>
Unreviewed GTK+ and WPE gardening after r243278.
Modified: trunk/LayoutTests/platform/ios/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -11,7 +11,7 @@
(GraphicsLayer
(bounds 800.00 2618.00)
(contentsOpaque 1)
- (children 7
+ (children 6
(GraphicsLayer
(position 21.00 21.00)
(bounds 100.00 100.00)
@@ -48,35 +48,13 @@
)
)
(GraphicsLayer
- (position 18.00 240.00)
- (bounds 220.00 220.00)
- (drawsContent 1)
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=10 height=10)
- (position 10.00 10.00)
- (bounds origin 0.00 100.00)
- (bounds 200.00 200.00)
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=10 height=10)
- (scrollOffset (0,100))
- (anchor 0.00 0.00)
- (bounds 200.00 2210.00)
- )
- )
- )
- )
- )
- (GraphicsLayer
(offsetFromRenderer width=0 height=100)
(position 28.00 250.00)
- (bounds 200.00 200.00)
+ (bounds 185.00 200.00)
(children 1
(GraphicsLayer
- (position 0.00 -100.00)
- (bounds 110.00 2210.00)
- (usingTiledLayer 1)
+ (offsetFromRenderer width=0 height=100)
+ (bounds 110.00 200.00)
(contentsOpaque 1)
(drawsContent 1)
)
@@ -85,7 +63,7 @@
(GraphicsLayer
(offsetFromRenderer width=-5 height=-145)
(position 28.00 250.00)
- (bounds 200.00 200.00)
+ (bounds 185.00 200.00)
(children 1
(GraphicsLayer
(offsetFromRenderer width=0 height=-1)
Modified: trunk/LayoutTests/platform/ios/compositing/layers-inside-overflow-scroll-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios/compositing/layers-inside-overflow-scroll-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios/compositing/layers-inside-overflow-scroll-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -10,6 +10,6 @@
RenderText {#text} at (0,0) size 0x0
layer at (19,53) size 300x200
RenderVideo {VIDEO} at (1,1) size 300x200
-layer at (18,269) size 302x152 clip at (19,270) size 300x150 scrollY 100 scrollHeight 500
+layer at (18,269) size 302x152 clip at (19,270) size 285x150 scrollY 100 scrollHeight 500
RenderBlock {DIV} at (10,253) size 302x152 [border: (1px solid #000000)]
- RenderBlock {DIV} at (1,1) size 300x500
+ RenderBlock {DIV} at (1,1) size 285x500
Modified: trunk/LayoutTests/platform/ios/compositing/overflow/scroll-ancestor-update-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios/compositing/overflow/scroll-ancestor-update-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios/compositing/overflow/scroll-ancestor-update-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -15,8 +15,8 @@
text run at (0,0) width 193: "The green box should obscure"
text run at (0,20) width 182: "the red box, and move when"
text run at (0,40) width 144: "you drag the scrollbar."
-layer at (50,50) size 202x202 clip at (51,51) size 200x200 scrollY 50 scrollHeight 550
+layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeight 550
RenderBlock {DIV} at (0,0) size 202x202 [border: (1px solid #000000)]
- RenderBlock {DIV} at (1,51) size 200x500
+ RenderBlock {DIV} at (1,51) size 185x500
layer at (51,51) size 100x100
RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
Modified: trunk/LayoutTests/platform/ios/compositing/reflections/nested-reflection-on-overflow-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios/compositing/reflections/nested-reflection-on-overflow-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios/compositing/reflections/nested-reflection-on-overflow-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -10,27 +10,31 @@
RenderBlock {DIV} at (20,40) size 122x232 [border: (1px solid #000000)]
layer at (39,67) size 100x100
RenderBlock {DIV} at (11,11) size 100x100 [bgcolor=#008000]
-layer at (39,67) size 100x100 scrollHeight 500
+layer at (39,67) size 100x100 clip at (39,67) size 85x85 scrollHeight 500
RenderBlock (relative positioned) {DIV} at (0,0) size 100x100
-layer at (39,67) size 100x500 backgroundClip at (39,67) size 100x100 clip at (39,67) size 100x100
- RenderBlock {DIV} at (0,0) size 100x500
- RenderText {#text} at (0,0) size 100x379
- text run at (0,0) width 86: "Lorem ipsum"
- text run at (0,20) width 92: "dolor sit amet,"
- text run at (0,40) width 73: "consectetur"
- text run at (0,60) width 99: "adipisicing elit,"
- text run at (0,80) width 100: "sed do eiusmod"
- text run at (0,100) width 46: "tempor"
- text run at (0,120) width 82: "incididunt ut"
- text run at (0,140) width 56: "labore et"
- text run at (0,160) width 88: "dolore magna"
- text run at (0,180) width 100: "aliqua. Ut enim"
- text run at (0,200) width 61: "ad minim"
- text run at (0,220) width 82: "veniam, quis"
- text run at (0,240) width 48: "nostrud"
- text run at (0,260) width 76: "exercitation"
- text run at (0,280) width 100: "ullamco laboris"
- text run at (0,300) width 88: "nisi ut aliquip"
- text run at (0,320) width 34: "ex ea"
- text run at (0,340) width 64: "commodo"
- text run at (0,360) width 68: "consequat."
+layer at (39,67) size 85x500 backgroundClip at (39,67) size 85x85 clip at (39,67) size 85x85
+ RenderBlock {DIV} at (0,0) size 85x500
+ RenderText {#text} at (0,0) size 83x459
+ text run at (0,0) width 43: "Lorem"
+ text run at (0,20) width 77: "ipsum dolor"
+ text run at (0,40) width 55: "sit amet,"
+ text run at (0,60) width 73: "consectetur"
+ text run at (0,80) width 71: "adipisicing"
+ text run at (0,100) width 70: "elit, sed do"
+ text run at (0,120) width 55: "eiusmod"
+ text run at (0,140) width 46: "tempor"
+ text run at (0,160) width 82: "incididunt ut"
+ text run at (0,180) width 56: "labore et"
+ text run at (0,200) width 41: "dolore"
+ text run at (0,220) width 43: "magna"
+ text run at (0,240) width 64: "aliqua. Ut"
+ text run at (0,260) width 52: "enim ad"
+ text run at (0,280) width 42: "minim"
+ text run at (0,300) width 82: "veniam, quis"
+ text run at (0,320) width 48: "nostrud"
+ text run at (0,340) width 76: "exercitation"
+ text run at (0,360) width 52: "ullamco"
+ text run at (0,380) width 71: "laboris nisi"
+ text run at (0,400) width 80: "ut aliquip ex"
+ text run at (0,420) width 83: "ea commodo"
+ text run at (0,440) width 68: "consequat."
Modified: trunk/LayoutTests/platform/ios/compositing/self-painting-layers-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios/compositing/self-painting-layers-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios/compositing/self-painting-layers-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -10,9 +10,9 @@
RenderText {#text} at (0,0) size 0x0
layer at (19,53) size 300x200
RenderVideo {VIDEO} at (1,1) size 300x200
-layer at (18,269) size 302x152 clip at (19,270) size 300x150 scrollY 24 scrollHeight 500
+layer at (18,269) size 302x152 clip at (19,270) size 285x150 scrollY 24 scrollHeight 500
RenderBlock {DIV} at (10,253) size 302x152 [border: (1px solid #000000)]
- RenderBlock {DIV} at (1,1) size 300x500
+ RenderBlock {DIV} at (1,1) size 285x500
RenderText {#text} at (0,6) size 107x36
text run at (0,6) width 107: "Scrolled"
RenderBR {BR} at (106,6) size 1x36
Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/TestExpectations 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1310,9 +1310,5 @@
webkit.org/b/194253 [ Debug ] scrollingcoordinator/scrolling-tree/fixed-inside-frame.html [ Pass Failure ]
webkit.org/b/195341 fast/viewport/ios/device-width-viewport-after-changing-view-scale.html [ Pass Failure ]
+
webkit.org/b/195341 compositing/ios/overflow-scroll-update-overlap.html [ ImageOnlyFailure ]
-
-webkit.org/b/196013 compositing/rtl/rtl-overflow-scrolling.html [ Failure ]
-webkit.org/b/196013 fast/scrolling/rtl-scrollbars-sticky-overflow-scroll-2.html [ ImageOnlyFailure ]
-webkit.org/b/196013 fast/scrolling/rtl-scrollbars-sticky-overflow-scroll.html [ ImageOnlyFailure ]
-webkit.org/b/196013 fast/scrolling/rubber-band-shows-background.html [ ImageOnlyFailure ]
Deleted: trunk/LayoutTests/platform/ios-wk2/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1,44 +0,0 @@
-middle
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (children 3
- (GraphicsLayer
- (position 129.00 29.00)
- (bounds 100.00 100.00)
- )
- (GraphicsLayer
- (position 129.00 29.00)
- (bounds 200.00 100.00)
- (contentsOpaque 1)
- )
- (GraphicsLayer
- (position 8.00 8.00)
- (bounds 242.00 162.00)
- (drawsContent 1)
- (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [100.00 0.00 0.00 1.00])
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=1 height=1)
- (position 1.00 1.00)
- (bounds 240.00 160.00)
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=1 height=1)
- (anchor 0.00 0.00)
- (bounds 1070.00 160.00)
- (drawsContent 1)
- )
- )
- )
- )
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/platform/ios-wk2/compositing/layer-creation/overflow-scroll-overlap-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/compositing/layer-creation/overflow-scroll-overlap-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/layer-creation/overflow-scroll-overlap-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1,50 +0,0 @@
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (children 3
- (GraphicsLayer
- (position 8.00 8.00)
- (bounds 30.00 30.00)
- )
- (GraphicsLayer
- (position 20.00 20.00)
- (bounds 306.00 206.00)
- (drawsContent 1)
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=3 height=3)
- (position 3.00 3.00)
- (bounds origin 0.00 165.00)
- (bounds 300.00 200.00)
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=3 height=3)
- (scrollOffset (0,165))
- (anchor 0.00 0.00)
- (bounds 300.00 365.00)
- )
- )
- )
- )
- )
- (GraphicsLayer
- (offsetFromRenderer width=-20 height=-45)
- (position 23.00 23.00)
- (bounds 300.00 200.00)
- (children 1
- (GraphicsLayer
- (position 20.00 45.00)
- (bounds 210.00 100.00)
- (contentsOpaque 1)
- )
- )
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/platform/ios-wk2/compositing/layer-creation/scroll-partial-update-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/compositing/layer-creation/scroll-partial-update-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/layer-creation/scroll-partial-update-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1,49 +0,0 @@
-scroll me
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (children 3
- (GraphicsLayer
- (position 8.00 8.00)
- (bounds 20.00 20.00)
- )
- (GraphicsLayer
- (position 10.00 10.00)
- (bounds 400.00 100.00)
- )
- (GraphicsLayer
- (position 200.00 8.00)
- (bounds 204.00 204.00)
- (drawsContent 1)
- (children 1
- (GraphicsLayer
- (position 2.00 2.00)
- (bounds 200.00 200.00)
- (contentsOpaque 1)
- (drawsContent 1)
- (children 1
- (GraphicsLayer
- (bounds origin 0.00 50.00)
- (bounds 200.00 200.00)
- (children 1
- (GraphicsLayer
- (scrollOffset (0,50))
- (anchor 0.00 0.00)
- (bounds 200.00 400.00)
- (drawsContent 1)
- )
- )
- )
- )
- )
- )
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/platform/ios-wk2/compositing/overflow/content-gains-scrollbars-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/compositing/overflow/content-gains-scrollbars-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/overflow/content-gains-scrollbars-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1,87 +0,0 @@
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (children 4
- (GraphicsLayer
- (position 8.00 13.00)
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 100.00 200.00)
- (children 1
- (GraphicsLayer
- (bounds 10.00 200.00)
- )
- )
- )
- )
- )
- )
- )
- (GraphicsLayer
- (position 8.00 13.00)
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 200.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 200.00 10.00)
- )
- )
- )
- )
- )
- )
- )
- (GraphicsLayer
- (position 8.00 13.00)
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 200.00 200.00)
- (children 1
- (GraphicsLayer
- (bounds 200.00 200.00)
- )
- )
- )
- )
- )
- )
- )
- (GraphicsLayer
- (position 8.00 13.00)
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 10.00 10.00)
- )
- )
- )
- )
- )
- )
- )
- )
-)
-
Modified: trunk/LayoutTests/platform/ios-wk2/compositing/overflow/overflow-scroll-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/compositing/overflow/overflow-scroll-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/overflow/overflow-scroll-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -32,39 +32,39 @@
RenderText {#text} at (524,511) size 4x19
text run at (524,511) width 4: " "
RenderText {#text} at (0,0) size 0x0
-layer at (18,62) size 152x152 clip at (19,63) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (18,62) size 152x152 clip at (19,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (10,10) size 152x152 [border: (1px solid #000000)]
-layer at (194,62) size 152x152 clip at (195,63) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (194,62) size 152x152 clip at (195,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (186,10) size 152x152 [border: (1px solid #000000)]
-layer at (19,13) size 210x510 backgroundClip at (19,63) size 150x150 clip at (19,63) size 150x150
+layer at (19,13) size 210x510 backgroundClip at (19,63) size 135x135 clip at (19,63) size 135x135
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (195,13) size 210x510 backgroundClip at (195,63) size 150x150 clip at (195,63) size 150x150
+layer at (195,13) size 210x510 backgroundClip at (195,63) size 135x135 clip at (195,63) size 135x135
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (370,62) size 152x152 clip at (371,63) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (370,62) size 152x152 clip at (371,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (362,10) size 152x152 [border: (1px solid #000000)]
-layer at (371,13) size 210x510 backgroundClip at (371,63) size 150x150 clip at (371,63) size 150x150
+layer at (371,13) size 210x510 backgroundClip at (371,63) size 135x135 clip at (371,63) size 135x135
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (546,62) size 152x152 clip at (547,63) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (546,62) size 152x152 clip at (547,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (538,10) size 152x152 [border: (1px solid #000000)]
-layer at (547,13) size 210x510 backgroundClip at (547,63) size 150x150 clip at (547,63) size 150x150
+layer at (547,13) size 210x510 backgroundClip at (547,63) size 135x135 clip at (547,63) size 135x135
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (18,239) size 152x152 clip at (19,240) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (18,239) size 152x152 clip at (19,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (10,187) size 152x152 [border: (1px solid #000000)]
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
@@ -71,31 +71,31 @@
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (194,239) size 152x152 clip at (195,240) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (194,239) size 152x152 clip at (195,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (186,187) size 152x152 [border: (1px solid #000000)]
-layer at (195,190) size 210x510 backgroundClip at (195,240) size 150x150 clip at (195,240) size 150x150
+layer at (195,190) size 210x510 backgroundClip at (195,240) size 135x135 clip at (195,240) size 135x135
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (370,239) size 152x152 clip at (371,240) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (370,239) size 152x152 clip at (371,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (362,187) size 152x152 [border: (1px solid #000000)]
-layer at (371,190) size 210x510 backgroundClip at (371,240) size 150x150 clip at (371,240) size 150x150
+layer at (371,190) size 210x510 backgroundClip at (371,240) size 135x135 clip at (371,240) size 135x135
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (546,239) size 152x152 clip at (547,240) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (546,239) size 152x152 clip at (547,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock {DIV} at (538,187) size 152x152 [border: (1px solid #000000)]
-layer at (547,190) size 210x510 backgroundClip at (547,240) size 150x150 clip at (547,240) size 150x150
+layer at (547,190) size 210x510 backgroundClip at (547,240) size 135x135 clip at (547,240) size 135x135
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (18,416) size 152x152 clip at (19,417) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (18,416) size 152x152 clip at (19,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (10,364) size 152x152 [border: (1px solid #000000)]
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
@@ -102,25 +102,25 @@
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (194,416) size 152x152 clip at (195,417) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (194,416) size 152x152 clip at (195,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (186,364) size 152x152 [border: (1px solid #000000)]
-layer at (195,367) size 210x510 backgroundClip at (195,417) size 150x150 clip at (195,417) size 150x150
+layer at (195,367) size 210x510 backgroundClip at (195,417) size 135x135 clip at (195,417) size 135x135
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (370,416) size 152x152 clip at (371,417) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (370,416) size 152x152 clip at (371,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (362,364) size 152x152 [border: (1px solid #000000)]
-layer at (371,367) size 210x510 backgroundClip at (371,417) size 150x150 clip at (371,417) size 150x150
+layer at (371,367) size 210x510 backgroundClip at (371,417) size 135x135 clip at (371,417) size 135x135
RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
text run at (0,1) width 192: "This is the inner div"
text run at (0,31) width 111: "that scrolls."
-layer at (546,416) size 152x152 clip at (547,417) size 150x150 scrollY 50 scrollWidth 210 scrollHeight 510
+layer at (546,416) size 152x152 clip at (547,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510
RenderBlock (relative positioned) {DIV} at (538,364) size 152x152 [border: (1px solid #000000)]
-layer at (547,367) size 210x510 backgroundClip at (547,417) size 150x150 clip at (547,417) size 150x150
+layer at (547,367) size 210x510 backgroundClip at (547,417) size 135x135 clip at (547,417) size 135x135
RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080]
RenderBlock {P} at (5,29) size 200x60
RenderText {#text} at (0,1) size 192x58
Deleted: trunk/LayoutTests/platform/ios-wk2/compositing/overflow/overflow-scrollbar-layer-positions-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/compositing/overflow/overflow-scrollbar-layer-positions-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/overflow/overflow-scrollbar-layer-positions-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1,41 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt
ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=-21 height=-21)
- (position 2.00 -6.00)
- (bounds 244.00 244.00)
- (drawsContent 1)
- (children 2
- (GraphicsLayer
- (offsetFromRenderer width=1 height=1)
- (position 22.00 22.00)
- (bounds 200.00 200.00)
- (children 1
- (GraphicsLayer
- (offsetFromRenderer width=1 height=1)
- (anchor 0.00 0.00)
- (bounds 200.00 1536.00)
- (usingTiledLayer 1)
- (drawsContent 1)
- )
- )
- )
- (GraphicsLayer
- (position 207.00 22.00)
- (bounds 15.00 200.00)
- (drawsContent 1)
- )
- )
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/platform/ios-wk2/compositing/overflow/overflow-scrollbar-layers-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/compositing/overflow/overflow-scrollbar-layers-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/overflow/overflow-scrollbar-layers-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1,87 +0,0 @@
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (bounds 800.00 600.00)
- (contentsOpaque 1)
- (children 4
- (GraphicsLayer
- (position 8.00 13.00)
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 100.00 200.00)
- (children 1
- (GraphicsLayer
- (bounds 10.00 200.00)
- )
- )
- )
- )
- )
- )
- )
- (GraphicsLayer
- (position 8.00 13.00)
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 200.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 200.00 10.00)
- )
- )
- )
- )
- )
- )
- )
- (GraphicsLayer
- (position 8.00 13.00)
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 200.00 200.00)
- (children 1
- (GraphicsLayer
- (bounds 200.00 200.00)
- )
- )
- )
- )
- )
- )
- )
- (GraphicsLayer
- (position 8.00 13.00)
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 100.00 100.00)
- (children 1
- (GraphicsLayer
- (bounds 10.00 10.00)
- )
- )
- )
- )
- )
- )
- )
- )
-)
-
Modified: trunk/LayoutTests/platform/ios-wk2/compositing/overflow/remove-overflow-crash2-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/compositing/overflow/remove-overflow-crash2-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/overflow/remove-overflow-crash2-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -3,74 +3,90 @@
layer at (0,0) size 800x218
RenderBlock {HTML} at (0,0) size 800x218
RenderBody {BODY} at (8,8) size 784x202
-layer at (8,8) size 103x202 clip at (9,9) size 101x200 scrollHeight 1360
+layer at (8,8) size 103x202 clip at (9,9) size 86x185 scrollHeight 1680
RenderBlock {DIV} at (0,0) size 103x202 [border: (1px solid #000000)]
- RenderText {#text} at (1,1) size 101x1359
+ RenderText {#text} at (1,1) size 86x1679
text run at (1,1) width 86: "Lorem ipsum"
- text run at (1,21) width 92: "dolor sit amet,"
- text run at (1,41) width 73: "consectetur"
- text run at (1,61) width 99: "adipisicing elit,"
- text run at (1,81) width 100: "sed do eiusmod"
- text run at (1,101) width 46: "tempor"
- text run at (1,121) width 82: "incididunt ut"
- text run at (1,141) width 101: "labore et dolore"
- text run at (1,161) width 90: "magna aliqua."
- text run at (1,181) width 72: "Ut enim ad"
- text run at (1,201) width 97: "minim veniam,"
- text run at (1,221) width 79: "quis nostrud"
- text run at (1,241) width 76: "exercitation"
- text run at (1,261) width 100: "ullamco laboris"
- text run at (1,281) width 88: "nisi ut aliquip"
- text run at (1,301) width 34: "ex ea"
- text run at (1,321) width 64: "commodo"
- text run at (1,341) width 68: "consequat."
- text run at (1,361) width 96: "Duis aute irure"
- text run at (1,381) width 51: "dolor in"
- text run at (1,401) width 86: "reprehenderit"
- text run at (1,421) width 76: "in voluptate"
- text run at (1,441) width 60: "velit esse"
- text run at (1,461) width 86: "cillum dolore"
- text run at (1,481) width 93: "eu fugiat nulla"
- text run at (1,501) width 53: "pariatur."
- text run at (1,521) width 92: "Excepteur sint"
- text run at (1,541) width 56: "occaecat"
- text run at (1,561) width 87: "cupidatat non"
- text run at (1,581) width 88: "proident, sunt"
- text run at (1,601) width 76: "in culpa qui"
- text run at (1,621) width 100: "officia deserunt"
- text run at (1,641) width 91: "mollit anim id"
- text run at (1,661) width 80: "est laborum."
- text run at (1,681) width 86: "Lorem ipsum"
- text run at (1,701) width 92: "dolor sit amet,"
- text run at (1,721) width 73: "consectetur"
- text run at (1,741) width 99: "adipisicing elit,"
- text run at (1,761) width 100: "sed do eiusmod"
- text run at (1,781) width 46: "tempor"
- text run at (1,801) width 82: "incididunt ut"
- text run at (1,821) width 101: "labore et dolore"
- text run at (1,841) width 90: "magna aliqua."
- text run at (1,861) width 72: "Ut enim ad"
- text run at (1,881) width 97: "minim veniam,"
- text run at (1,901) width 79: "quis nostrud"
- text run at (1,921) width 76: "exercitation"
- text run at (1,941) width 100: "ullamco laboris"
- text run at (1,961) width 88: "nisi ut aliquip"
- text run at (1,981) width 34: "ex ea"
- text run at (1,1001) width 64: "commodo"
- text run at (1,1021) width 68: "consequat."
- text run at (1,1041) width 96: "Duis aute irure"
- text run at (1,1061) width 51: "dolor in"
- text run at (1,1081) width 86: "reprehenderit"
- text run at (1,1101) width 76: "in voluptate"
- text run at (1,1121) width 60: "velit esse"
- text run at (1,1141) width 86: "cillum dolore"
- text run at (1,1161) width 93: "eu fugiat nulla"
- text run at (1,1181) width 53: "pariatur."
- text run at (1,1201) width 92: "Excepteur sint"
- text run at (1,1221) width 56: "occaecat"
- text run at (1,1241) width 87: "cupidatat non"
- text run at (1,1261) width 88: "proident, sunt"
- text run at (1,1281) width 76: "in culpa qui"
- text run at (1,1301) width 100: "officia deserunt"
- text run at (1,1321) width 91: "mollit anim id"
- text run at (1,1341) width 80: "est laborum."
+ text run at (1,21) width 53: "dolor sit"
+ text run at (1,41) width 36: "amet,"
+ text run at (1,61) width 73: "consectetur"
+ text run at (1,81) width 71: "adipisicing"
+ text run at (1,101) width 70: "elit, sed do"
+ text run at (1,121) width 55: "eiusmod"
+ text run at (1,141) width 46: "tempor"
+ text run at (1,161) width 82: "incididunt ut"
+ text run at (1,181) width 56: "labore et"
+ text run at (1,201) width 41: "dolore"
+ text run at (1,221) width 43: "magna"
+ text run at (1,241) width 64: "aliqua. Ut"
+ text run at (1,261) width 52: "enim ad"
+ text run at (1,281) width 42: "minim"
+ text run at (1,301) width 82: "veniam, quis"
+ text run at (1,321) width 48: "nostrud"
+ text run at (1,341) width 76: "exercitation"
+ text run at (1,361) width 52: "ullamco"
+ text run at (1,381) width 71: "laboris nisi"
+ text run at (1,401) width 80: "ut aliquip ex"
+ text run at (1,421) width 83: "ea commodo"
+ text run at (1,441) width 68: "consequat."
+ text run at (1,461) width 61: "Duis aute"
+ text run at (1,481) width 85: "irure dolor in"
+ text run at (1,501) width 86: "reprehenderit"
+ text run at (1,521) width 76: "in voluptate"
+ text run at (1,541) width 60: "velit esse"
+ text run at (1,561) width 86: "cillum dolore"
+ text run at (1,581) width 57: "eu fugiat"
+ text run at (1,601) width 32: "nulla"
+ text run at (1,621) width 53: "pariatur."
+ text run at (1,641) width 65: "Excepteur"
+ text run at (1,661) width 83: "sint occaecat"
+ text run at (1,681) width 59: "cupidatat"
+ text run at (1,701) width 86: "non proident,"
+ text run at (1,721) width 82: "sunt in culpa"
+ text run at (1,741) width 66: "qui officia"
+ text run at (1,761) width 55: "deserunt"
+ text run at (1,781) width 75: "mollit anim"
+ text run at (1,801) width 35: "id est"
+ text run at (1,821) width 58: "laborum."
+ text run at (1,841) width 86: "Lorem ipsum"
+ text run at (1,861) width 53: "dolor sit"
+ text run at (1,881) width 36: "amet,"
+ text run at (1,901) width 73: "consectetur"
+ text run at (1,921) width 71: "adipisicing"
+ text run at (1,941) width 70: "elit, sed do"
+ text run at (1,961) width 55: "eiusmod"
+ text run at (1,981) width 46: "tempor"
+ text run at (1,1001) width 82: "incididunt ut"
+ text run at (1,1021) width 56: "labore et"
+ text run at (1,1041) width 41: "dolore"
+ text run at (1,1061) width 43: "magna"
+ text run at (1,1081) width 64: "aliqua. Ut"
+ text run at (1,1101) width 52: "enim ad"
+ text run at (1,1121) width 42: "minim"
+ text run at (1,1141) width 82: "veniam, quis"
+ text run at (1,1161) width 48: "nostrud"
+ text run at (1,1181) width 76: "exercitation"
+ text run at (1,1201) width 52: "ullamco"
+ text run at (1,1221) width 71: "laboris nisi"
+ text run at (1,1241) width 80: "ut aliquip ex"
+ text run at (1,1261) width 83: "ea commodo"
+ text run at (1,1281) width 68: "consequat."
+ text run at (1,1301) width 61: "Duis aute"
+ text run at (1,1321) width 85: "irure dolor in"
+ text run at (1,1341) width 86: "reprehenderit"
+ text run at (1,1361) width 76: "in voluptate"
+ text run at (1,1381) width 60: "velit esse"
+ text run at (1,1401) width 86: "cillum dolore"
+ text run at (1,1421) width 57: "eu fugiat"
+ text run at (1,1441) width 32: "nulla"
+ text run at (1,1461) width 53: "pariatur."
+ text run at (1,1481) width 65: "Excepteur"
+ text run at (1,1501) width 83: "sint occaecat"
+ text run at (1,1521) width 59: "cupidatat"
+ text run at (1,1541) width 86: "non proident,"
+ text run at (1,1561) width 82: "sunt in culpa"
+ text run at (1,1581) width 66: "qui officia"
+ text run at (1,1601) width 55: "deserunt"
+ text run at (1,1621) width 75: "mollit anim"
+ text run at (1,1641) width 35: "id est"
+ text run at (1,1661) width 58: "laborum."
Modified: trunk/LayoutTests/platform/ios-wk2/compositing/overflow/scrollbar-painting-expected.txt (243291 => 243292)
--- trunk/LayoutTests/platform/ios-wk2/compositing/overflow/scrollbar-painting-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/platform/ios-wk2/compositing/overflow/scrollbar-painting-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -6,9 +6,9 @@
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 484x19
text run at (0,0) width 484: "You should see scrollbars on the gray square, and a resizer control below it."
-layer at (18,52) size 100x100 scrollWidth 500 scrollHeight 500
+layer at (18,52) size 100x100 clip at (18,52) size 85x85 scrollWidth 500 scrollHeight 500
RenderBlock (relative positioned) {DIV} at (10,36) size 100x100
-layer at (18,52) size 500x500 backgroundClip at (18,52) size 100x100 clip at (18,52) size 100x100
+layer at (18,52) size 500x500 backgroundClip at (18,52) size 85x85 clip at (18,52) size 85x85
RenderBlock {DIV} at (0,0) size 500x500 [bgcolor=#808080]
layer at (18,162) size 100x100
RenderBlock {DIV} at (10,146) size 100x100
Modified: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/positioned-nodes-complex-expected.txt (243291 => 243292)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/positioned-nodes-complex-expected.txt 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/positioned-nodes-complex-expected.txt 2019-03-21 16:21:15 UTC (rev 243292)
@@ -132,14 +132,6 @@
(layer-position-at-last-layout (10,28))
(positioning-behavior moves))
(related overflow nodes 1)
- (children 1
- (Positioned node
- (layout constraints
- (layer-position-at-last-layout (79,18))
- (positioning-behavior stationary))
- (related overflow nodes 1)
- )
- )
)
)
)
Modified: trunk/Source/WebKit/ChangeLog (243291 => 243292)
--- trunk/Source/WebKit/ChangeLog 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/Source/WebKit/ChangeLog 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1,3 +1,16 @@
+2019-03-21 Shawn Roberts <[email protected]>
+
+ Unreviewed, rolling out r243250.
+
+ Causing 109 Failures and 2 crashes on iOS Sim Debug
+ OpenSource/Internal queues
+
+ Reverted changeset:
+
+ "[iOS WK2] Turn on async overflow scrolling by default"
+ https://bugs.webkit.org/show_bug.cgi?id=196011
+ https://trac.webkit.org/changeset/243250
+
2019-03-21 Brent Fulgham <[email protected]>
Fix possible memory leak when dismissing a color picker
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (243291 => 243292)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2019-03-21 16:21:15 UTC (rev 243292)
@@ -1437,7 +1437,7 @@
AsyncOverflowScrollingEnabled:
type: bool
- defaultValue: DEFAULT_ASYNC_OVERFLOW_SCROLLING_ENABLED
+ defaultValue: false
humanReadableName: "Async Overflow Scrolling"
humanReadableDescription: "Perform overflow scrolling off the main thread"
category: internal
Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h (243291 => 243292)
--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2019-03-21 15:51:07 UTC (rev 243291)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2019-03-21 16:21:15 UTC (rev 243292)
@@ -76,7 +76,6 @@
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_AUDIO_PLAYBACK true
#define DEFAULT_INTERACTIVE_MEDIA_CAPTURE_STREAM_REPROMPT_INTERVAL_IN_MINUTES 1
#define DEFAULT_ASYNC_FRAME_SCROLLING_ENABLED true
-#define DEFAULT_ASYNC_OVERFLOW_SCROLLING_ENABLED true
#define EXPERIMENTAL_FULLSCREEN_API_HIDDEN false
#else
#define DEFAULT_ALLOWS_PICTURE_IN_PICTURE_MEDIA_PLAYBACK false
@@ -97,7 +96,6 @@
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_AUDIO_PLAYBACK false
#define DEFAULT_INTERACTIVE_MEDIA_CAPTURE_STREAM_REPROMPT_INTERVAL_IN_MINUTES 10
#define DEFAULT_ASYNC_FRAME_SCROLLING_ENABLED false
-#define DEFAULT_ASYNC_OVERFLOW_SCROLLING_ENABLED false
#define EXPERIMENTAL_FULLSCREEN_API_HIDDEN true
#endif
