Diff
Modified: trunk/LayoutTests/ChangeLog (240503 => 240504)
--- trunk/LayoutTests/ChangeLog 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/ChangeLog 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,3 +1,26 @@
+2019-01-25 Simon Fraser <simon.fra...@apple.com>
+
+ Move tests for scrolling tree mutations into their own directory
+ https://bugs.webkit.org/show_bug.cgi?id=193836
+
+ Reviewed by Tim Horton.
+
+ Add a scrollingcoordinator/scrolling-tree directory, which will contain tests for scrolling
+ tree mutations.
+
+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt: Renamed from LayoutTests/platform/ios/scrollingcoordinator/gain-scrolling-node-parent-expected.txt.
+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt: Renamed from LayoutTests/platform/ios/scrollingcoordinator/lose-scrolling-node-parent-expected.txt.
+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt: Renamed from LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-across-compositing-layers-expected.txt.
+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt: Renamed from LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-with-layer-removal-expected.txt.
+ * scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt: Renamed from LayoutTests/scrollingcoordinator/gain-scrolling-node-parent-expected.txt.
+ * scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent.html: Renamed from LayoutTests/scrollingcoordinator/gain-scrolling-node-parent.html.
+ * scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt: Renamed from LayoutTests/scrollingcoordinator/lose-scrolling-node-parent-expected.txt.
+ * scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent.html: Renamed from LayoutTests/scrollingcoordinator/lose-scrolling-node-parent.html.
+ * scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt: Renamed from LayoutTests/scrollingcoordinator/reparent-across-compositing-layers-expected.txt.
+ * scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers.html: Renamed from LayoutTests/scrollingcoordinator/reparent-across-compositing-layers.html.
+ * scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt: Renamed from LayoutTests/scrollingcoordinator/reparent-with-layer-removal-expected.txt.
+ * scrollingcoordinator/scrolling-tree/reparent-with-layer-removal.html: Renamed from LayoutTests/scrollingcoordinator/reparent-with-layer-removal.html.
+
2019-01-25 Ryosuke Niwa <rn...@webkit.org>
iOS: inputmode="none" disables hardware keyboard's globe key
Deleted: trunk/LayoutTests/platform/ios/scrollingcoordinator/gain-scrolling-node-parent-expected.txt (240503 => 240504)
--- trunk/LayoutTests/platform/ios/scrollingcoordinator/gain-scrolling-node-parent-expected.txt 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/platform/ios/scrollingcoordinator/gain-scrolling-node-parent-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,42 +0,0 @@
-Scrolling content
-Middle scrolling content
-Inner scrolling content
-
-(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 1
- (Overflow scrolling node
- (scrollable area size 420 320)
- (contents size 443 1041)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- (children 1
- (Overflow scrolling node
- (scrollable area size 420 320)
- (contents size 420 1020)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- )
- )
- )
- )
-)
-
-
Deleted: trunk/LayoutTests/platform/ios/scrollingcoordinator/lose-scrolling-node-parent-expected.txt (240503 => 240504)
--- trunk/LayoutTests/platform/ios/scrollingcoordinator/lose-scrolling-node-parent-expected.txt 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/platform/ios/scrollingcoordinator/lose-scrolling-node-parent-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,42 +0,0 @@
-Scrolling content
-Middle scrolling content
-Inner scrolling content
-
-(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 1
- (Overflow scrolling node
- (scrollable area size 420 320)
- (contents size 443 1041)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- (children 1
- (Overflow scrolling node
- (scrollable area size 420 320)
- (contents size 420 1020)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- )
- )
- )
- )
-)
-
-
Deleted: trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-across-compositing-layers-expected.txt (240503 => 240504)
--- trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-across-compositing-layers-expected.txt 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-across-compositing-layers-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,22 +0,0 @@
-Scrolling content
-Intermediate
-Inner scrolling content
-
-(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 0
- )
-)
-
-
Deleted: trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-with-layer-removal-expected.txt (240503 => 240504)
--- trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-with-layer-removal-expected.txt 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-with-layer-removal-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,31 +0,0 @@
-Scrolling content
-Intermediate
-Inner scrolling content
-
-(Frame scrolling node
- (scrollable area size 800 600)
- (contents size 800 1041)
- (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,441))
- (behavior for fixed 0)
- (children 1
- (Overflow scrolling node
- (scrollable area size 440 340)
- (contents size 440 1040)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- )
- )
-)
-
-
Copied: trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt (from rev 240503, trunk/LayoutTests/platform/ios/scrollingcoordinator/gain-scrolling-node-parent-expected.txt) (0 => 240504)
--- trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,42 @@
+Scrolling content
+Middle scrolling content
+Inner scrolling content
+
+(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 1
+ (Overflow scrolling node
+ (scrollable area size 420 320)
+ (contents size 443 1041)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ (children 1
+ (Overflow scrolling node
+ (scrollable area size 420 320)
+ (contents size 420 1020)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ )
+ )
+ )
+ )
+)
+
+
Copied: trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt (from rev 240503, trunk/LayoutTests/platform/ios/scrollingcoordinator/lose-scrolling-node-parent-expected.txt) (0 => 240504)
--- trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,42 @@
+Scrolling content
+Middle scrolling content
+Inner scrolling content
+
+(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 1
+ (Overflow scrolling node
+ (scrollable area size 420 320)
+ (contents size 443 1041)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ (children 1
+ (Overflow scrolling node
+ (scrollable area size 420 320)
+ (contents size 420 1020)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ )
+ )
+ )
+ )
+)
+
+
Copied: trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt (from rev 240503, trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-across-compositing-layers-expected.txt) (0 => 240504)
--- trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,22 @@
+Scrolling content
+Intermediate
+Inner scrolling content
+
+(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 0
+ )
+)
+
+
Copied: trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt (from rev 240503, trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-with-layer-removal-expected.txt) (0 => 240504)
--- trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,31 @@
+Scrolling content
+Intermediate
+Inner scrolling content
+
+(Frame scrolling node
+ (scrollable area size 800 600)
+ (contents size 800 1041)
+ (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,441))
+ (behavior for fixed 0)
+ (children 1
+ (Overflow scrolling node
+ (scrollable area size 440 340)
+ (contents size 440 1040)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ )
+ )
+)
+
+
Deleted: trunk/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent-expected.txt (240503 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent-expected.txt 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,42 +0,0 @@
-Scrolling content
-Middle scrolling content
-Inner scrolling content
-
-(Frame scrolling node
- (scrollable area size 800 600)
- (contents size 800 600)
- (scrollable area parameters
- (horizontal scroll elasticity 2)
- (vertical scroll elasticity 2)
- (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 1
- (Overflow scrolling node
- (scrollable area size 405 305)
- (contents size 443 1039)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- (children 1
- (Overflow scrolling node
- (scrollable area size 405 305)
- (contents size 405 1020)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- )
- )
- )
- )
-)
-
-
Deleted: trunk/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent.html (240503 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent.html 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent.html 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Check that scrolling nodes get reparented when an ancestor is removed</title>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- if (window.internals)
- window.internals.settings.setAsyncOverflowScrollingEnabled(true);
-
- function doTest() {
- requestAnimationFrame(() => {
- document.getElementById('target').classList.add('changed');
- if (window.internals)
- document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
-
- if (window.testRunner)
- testRunner.notifyDone();
- });
- }
-
- window.addEventListener('load', doTest, false);
- </script>
- <style>
- .scroller {
- background-color: silver;
- border: 1px solid black;
- padding: 10px;
- width: 400px;
- height: 300px;
- overflow: scroll;
- }
-
- #target.changed {
- overflow: visible;
- }
-
- .scrolling-content {
- height: 1000px;
- }
- </style>
-</head>
-<body>
- <div class="scroller">
- <div class="scrolling-content">
- Scrolling content
- <div class="intermediate scroller" id="target">
- <div class="scrolling-content">
- Middle scrolling content
- <div class="inner scroller">
- <div class="scrolling-content">
- Inner scrolling content
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <pre id="scrollingTree"></pre>
-</body>
-</html>
Deleted: trunk/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent-expected.txt (240503 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent-expected.txt 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,42 +0,0 @@
-Scrolling content
-Middle scrolling content
-Inner scrolling content
-
-(Frame scrolling node
- (scrollable area size 800 600)
- (contents size 800 600)
- (scrollable area parameters
- (horizontal scroll elasticity 2)
- (vertical scroll elasticity 2)
- (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 1
- (Overflow scrolling node
- (scrollable area size 405 305)
- (contents size 443 1039)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- (children 1
- (Overflow scrolling node
- (scrollable area size 405 305)
- (contents size 405 1020)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- )
- )
- )
- )
-)
-
-
Deleted: trunk/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent.html (240503 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent.html 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent.html 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Check that scrolling nodes get reparented when an ancestor is removed</title>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- if (window.internals)
- window.internals.settings.setAsyncOverflowScrollingEnabled(true);
-
- function doTest() {
- requestAnimationFrame(() => {
- document.getElementById('target').classList.add('changed');
- if (window.internals)
- document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
-
- if (window.testRunner)
- testRunner.notifyDone();
- });
- }
-
- window.addEventListener('load', doTest, false);
- </script>
- <style>
- .scroller {
- background-color: silver;
- border: 1px solid black;
- padding: 10px;
- width: 400px;
- height: 300px;
- overflow: scroll;
- }
-
- #target.changed {
- overflow: visible;
- }
-
- .scrolling-content {
- height: 1000px;
- }
- </style>
-</head>
-<body>
- <div class="scroller">
- <div class="scrolling-content">
- Scrolling content
- <div class="intermediate scroller" id="target">
- <div class="scrolling-content">
- Middle scrolling content
- <div class="inner scroller">
- <div class="scrolling-content">
- Inner scrolling content
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <pre id="scrollingTree"></pre>
-</body>
-</html>
Deleted: trunk/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers-expected.txt (240503 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers-expected.txt 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,22 +0,0 @@
-Scrolling content
-Intermediate
-Inner scrolling content
-
-(Frame scrolling node
- (scrollable area size 800 600)
- (contents size 800 600)
- (scrollable area parameters
- (horizontal scroll elasticity 2)
- (vertical scroll elasticity 2)
- (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 0
- )
-)
-
-
Deleted: trunk/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers.html (240503 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers.html 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers.html 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Check that compositing traverses deeply enough to re-parent scrolling tree nodes</title>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- if (window.internals)
- window.internals.settings.setAsyncOverflowScrollingEnabled(true);
-
- function doTest()
- {
- requestAnimationFrame(() => {
- document.getElementById('main').classList.add('changed');
- if (window.internals)
- document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
-
- if (window.testRunner)
- testRunner.notifyDone();
- });
- }
-
- window.addEventListener('load', doTest, false);
- </script>
- <style>
- .scroller {
- position: relative;
- z-index: 0; /* We want z-order nesting */
- background-color: silver;
- border: 1px solid black;
- padding: 20px;
- margin: 20px;
- width: 400px;
- height: 300px;
- overflow: scroll;
- }
-
- #main {
- height: 500px;
- }
-
- #main.changed {
- overflow: hidden;
- }
-
- .scrolling-content {
- height: 1000px;
- }
-
- .intermediate {
- position: relative;
- z-index: 0;
- }
-
- .composited {
- transform: translateZ(1px);
- background-color: orange;
- }
- </style>
-</head>
-<body>
- <div class="scroller" id="main">
- <div class="scrolling-content">
- Scrolling content
- <div class="intermediate composited">
- Intermediate
- <div class="inner scroller">
- <div class="scrolling-content">
- Inner scrolling content
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <pre id="scrollingTree"></pre>
-</body>
-</html>
Deleted: trunk/LayoutTests/scrollingcoordinator/reparent-with-layer-removal-expected.txt (240503 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/reparent-with-layer-removal-expected.txt 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/scrollingcoordinator/reparent-with-layer-removal-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,32 +0,0 @@
-Scrolling content
-Intermediate
-Inner scrolling content
-
-(Frame scrolling node
- (scrollable area size 785 600)
- (contents size 785 1041)
- (scrollable area parameters
- (horizontal scroll elasticity 2)
- (vertical scroll elasticity 2)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0)
- (has enabled vertical scrollbar 1))
- (visual viewport enabled 1)
- (layout viewport at (0,0) size 785x600)
- (min layout viewport origin (0,0))
- (max layout viewport origin (0,441))
- (behavior for fixed 0)
- (children 1
- (Overflow scrolling node
- (scrollable area size 425 325)
- (contents size 425 1040)
- (scrollable area parameters
- (horizontal scroll elasticity 1)
- (vertical scroll elasticity 1)
- (horizontal scrollbar mode 0)
- (vertical scrollbar mode 0))
- )
- )
-)
-
-
Deleted: trunk/LayoutTests/scrollingcoordinator/reparent-with-layer-removal.html (240503 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/reparent-with-layer-removal.html 2019-01-25 21:51:03 UTC (rev 240503)
+++ trunk/LayoutTests/scrollingcoordinator/reparent-with-layer-removal.html 2019-01-25 21:56:05 UTC (rev 240504)
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Check that compositing traverses deeply enough to re-parent scrolling tree nodes</title>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- if (window.internals)
- window.internals.settings.setAsyncOverflowScrollingEnabled(true);
-
- function doTest() {
- requestAnimationFrame(() => {
- document.getElementById('main').classList.add('changed');
- if (window.internals)
- document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
-
- if (window.testRunner)
- testRunner.notifyDone();
- });
- }
-
- window.addEventListener('load', doTest, false);
- </script>
- <style>
- .scroller {
- position: relative;
- z-index: 0; /* We want z-order nesting */
- background-color: silver;
- border: 1px solid black;
- padding: 20px;
- margin: 20px;
- width: 400px;
- height: 300px;
- overflow: scroll;
- }
-
- #main {
- height: 500px;
- }
-
- #main.changed {
- /* Make it not a RenderLayer */
- position: static;
- overflow: visible;
- }
-
- .scrolling-content {
- height: 1000px;
- }
-
- .intermediate {
- position: relative;
- z-index: 0;
- }
-
- .composited {
- transform: translateZ(1px);
- background-color: orange;
- }
- </style>
-</head>
-<body>
- <div class="scroller" id="main">
- <div class="scrolling-content">
- Scrolling content
- <div class="intermediate composited">
- Intermediate
- <div class="inner scroller">
- <div class="scrolling-content">
- Inner scrolling content
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <pre id="scrollingTree"></pre>
-</body>
-</html>
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt (from rev 240503, trunk/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent-expected.txt) (0 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,42 @@
+Scrolling content
+Middle scrolling content
+Inner scrolling content
+
+(Frame scrolling node
+ (scrollable area size 800 600)
+ (contents size 800 600)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (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 1
+ (Overflow scrolling node
+ (scrollable area size 405 305)
+ (contents size 443 1039)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ (children 1
+ (Overflow scrolling node
+ (scrollable area size 405 305)
+ (contents size 405 1020)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ )
+ )
+ )
+ )
+)
+
+
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent.html (from rev 240503, trunk/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent.html) (0 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent.html (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent.html 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Check that scrolling nodes get reparented when an ancestor is removed</title>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ if (window.internals)
+ window.internals.settings.setAsyncOverflowScrollingEnabled(true);
+
+ function doTest() {
+ requestAnimationFrame(() => {
+ document.getElementById('target').classList.add('changed');
+ if (window.internals)
+ document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+ <style>
+ .scroller {
+ background-color: silver;
+ border: 1px solid black;
+ padding: 10px;
+ width: 400px;
+ height: 300px;
+ overflow: scroll;
+ }
+
+ #target.changed {
+ overflow: visible;
+ }
+
+ .scrolling-content {
+ height: 1000px;
+ }
+ </style>
+</head>
+<body>
+ <div class="scroller">
+ <div class="scrolling-content">
+ Scrolling content
+ <div class="intermediate scroller" id="target">
+ <div class="scrolling-content">
+ Middle scrolling content
+ <div class="inner scroller">
+ <div class="scrolling-content">
+ Inner scrolling content
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <pre id="scrollingTree"></pre>
+</body>
+</html>
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt (from rev 240503, trunk/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent-expected.txt) (0 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,42 @@
+Scrolling content
+Middle scrolling content
+Inner scrolling content
+
+(Frame scrolling node
+ (scrollable area size 800 600)
+ (contents size 800 600)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (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 1
+ (Overflow scrolling node
+ (scrollable area size 405 305)
+ (contents size 443 1039)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ (children 1
+ (Overflow scrolling node
+ (scrollable area size 405 305)
+ (contents size 405 1020)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ )
+ )
+ )
+ )
+)
+
+
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent.html (from rev 240503, trunk/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent.html) (0 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent.html (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent.html 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Check that scrolling nodes get reparented when an ancestor is removed</title>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ if (window.internals)
+ window.internals.settings.setAsyncOverflowScrollingEnabled(true);
+
+ function doTest() {
+ requestAnimationFrame(() => {
+ document.getElementById('target').classList.add('changed');
+ if (window.internals)
+ document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+ <style>
+ .scroller {
+ background-color: silver;
+ border: 1px solid black;
+ padding: 10px;
+ width: 400px;
+ height: 300px;
+ overflow: scroll;
+ }
+
+ #target.changed {
+ overflow: visible;
+ }
+
+ .scrolling-content {
+ height: 1000px;
+ }
+ </style>
+</head>
+<body>
+ <div class="scroller">
+ <div class="scrolling-content">
+ Scrolling content
+ <div class="intermediate scroller" id="target">
+ <div class="scrolling-content">
+ Middle scrolling content
+ <div class="inner scroller">
+ <div class="scrolling-content">
+ Inner scrolling content
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <pre id="scrollingTree"></pre>
+</body>
+</html>
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt (from rev 240503, trunk/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers-expected.txt) (0 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,22 @@
+Scrolling content
+Intermediate
+Inner scrolling content
+
+(Frame scrolling node
+ (scrollable area size 800 600)
+ (contents size 800 600)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (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 0
+ )
+)
+
+
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers.html (from rev 240503, trunk/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers.html) (0 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers.html (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers.html 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Check that compositing traverses deeply enough to re-parent scrolling tree nodes</title>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ if (window.internals)
+ window.internals.settings.setAsyncOverflowScrollingEnabled(true);
+
+ function doTest()
+ {
+ requestAnimationFrame(() => {
+ document.getElementById('main').classList.add('changed');
+ if (window.internals)
+ document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+ <style>
+ .scroller {
+ position: relative;
+ z-index: 0; /* We want z-order nesting */
+ background-color: silver;
+ border: 1px solid black;
+ padding: 20px;
+ margin: 20px;
+ width: 400px;
+ height: 300px;
+ overflow: scroll;
+ }
+
+ #main {
+ height: 500px;
+ }
+
+ #main.changed {
+ overflow: hidden;
+ }
+
+ .scrolling-content {
+ height: 1000px;
+ }
+
+ .intermediate {
+ position: relative;
+ z-index: 0;
+ }
+
+ .composited {
+ transform: translateZ(1px);
+ background-color: orange;
+ }
+ </style>
+</head>
+<body>
+ <div class="scroller" id="main">
+ <div class="scrolling-content">
+ Scrolling content
+ <div class="intermediate composited">
+ Intermediate
+ <div class="inner scroller">
+ <div class="scrolling-content">
+ Inner scrolling content
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <pre id="scrollingTree"></pre>
+</body>
+</html>
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt (from rev 240503, trunk/LayoutTests/scrollingcoordinator/reparent-with-layer-removal-expected.txt) (0 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,32 @@
+Scrolling content
+Intermediate
+Inner scrolling content
+
+(Frame scrolling node
+ (scrollable area size 785 600)
+ (contents size 785 1041)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
+ (layout viewport at (0,0) size 785x600)
+ (min layout viewport origin (0,0))
+ (max layout viewport origin (0,441))
+ (behavior for fixed 0)
+ (children 1
+ (Overflow scrolling node
+ (scrollable area size 425 325)
+ (contents size 425 1040)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ )
+ )
+)
+
+
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal.html (from rev 240503, trunk/LayoutTests/scrollingcoordinator/reparent-with-layer-removal.html) (0 => 240504)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal.html (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal.html 2019-01-25 21:56:05 UTC (rev 240504)
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Check that compositing traverses deeply enough to re-parent scrolling tree nodes</title>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ if (window.internals)
+ window.internals.settings.setAsyncOverflowScrollingEnabled(true);
+
+ function doTest() {
+ requestAnimationFrame(() => {
+ document.getElementById('main').classList.add('changed');
+ if (window.internals)
+ document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+ <style>
+ .scroller {
+ position: relative;
+ z-index: 0; /* We want z-order nesting */
+ background-color: silver;
+ border: 1px solid black;
+ padding: 20px;
+ margin: 20px;
+ width: 400px;
+ height: 300px;
+ overflow: scroll;
+ }
+
+ #main {
+ height: 500px;
+ }
+
+ #main.changed {
+ /* Make it not a RenderLayer */
+ position: static;
+ overflow: visible;
+ }
+
+ .scrolling-content {
+ height: 1000px;
+ }
+
+ .intermediate {
+ position: relative;
+ z-index: 0;
+ }
+
+ .composited {
+ transform: translateZ(1px);
+ background-color: orange;
+ }
+ </style>
+</head>
+<body>
+ <div class="scroller" id="main">
+ <div class="scrolling-content">
+ Scrolling content
+ <div class="intermediate composited">
+ Intermediate
+ <div class="inner scroller">
+ <div class="scrolling-content">
+ Inner scrolling content
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <pre id="scrollingTree"></pre>
+</body>
+</html>
