Attachment 360132 Details for Bug 193836 – Patch

[patch] Patch

bug-193836-20190125111724.patch (text/plain), 43.86 KB, created by Simon Fraser (smfr) on 2019-01-25 11:17:25 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-01-25 11:17:25 PST

Size: 43.86 KB

patch

obsolete

>Subversion Revision: 240435
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 2e64b30445627c82559a25f4fc465912458ccfb5..f82980fd1aac684792d2179c1b51315801c911ff 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,26 @@
>+2019-01-25  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Move tests for scrolling tree mutations into their own directory
>+        https://bugs.webkit.org/show_bug.cgi?id=193836
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-23  Oriol Brufau  <obrufau@igalia.com>
> 
>         Allow failures in flaky tests from bug 193657
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-across-compositing-layers-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-across-compositing-layers-expected.txt
>deleted file mode 100644
>index e651f7916f5599d6f2ded457ccaea775c340529a..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-across-compositing-layers-expected.txt
>+++ /dev/null
>@@ -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
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-with-layer-removal-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-with-layer-removal-expected.txt
>deleted file mode 100644
>index a855f98b32e567e076c27abe999392b5a9017200..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/reparent-with-layer-removal-expected.txt
>+++ /dev/null
>@@ -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))
>-    )
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..0f5dc63b447deb66185498824c097d31b73721e6
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt
>@@ -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))
>+        )
>+      )
>+    )
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..0f5dc63b447deb66185498824c097d31b73721e6
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt
>@@ -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))
>+        )
>+      )
>+    )
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..e651f7916f5599d6f2ded457ccaea775c340529a
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt
>@@ -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
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..a855f98b32e567e076c27abe999392b5a9017200
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt
>@@ -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))
>+    )
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/platform/ios/scrollingcoordinator/gain-scrolling-node-parent-expected.txt b/LayoutTests/platform/ios/scrollingcoordinator/gain-scrolling-node-parent-expected.txt
>deleted file mode 100644
>index 0f5dc63b447deb66185498824c097d31b73721e6..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/ios/scrollingcoordinator/gain-scrolling-node-parent-expected.txt
>+++ /dev/null
>@@ -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))
>-        )
>-      )
>-    )
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/platform/ios/scrollingcoordinator/lose-scrolling-node-parent-expected.txt b/LayoutTests/platform/ios/scrollingcoordinator/lose-scrolling-node-parent-expected.txt
>deleted file mode 100644
>index 0f5dc63b447deb66185498824c097d31b73721e6..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/ios/scrollingcoordinator/lose-scrolling-node-parent-expected.txt
>+++ /dev/null
>@@ -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))
>-        )
>-      )
>-    )
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent-expected.txt b/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent-expected.txt
>deleted file mode 100644
>index 1f123a182a749410966ae7e08e3173e2c4a2f88d..0000000000000000000000000000000000000000
>--- a/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent-expected.txt
>+++ /dev/null
>@@ -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))
>-        )
>-      )
>-    )
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent.html b/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent.html
>deleted file mode 100644
>index 16bed94b768beab3d6786f17dd40525d5f8966dd..0000000000000000000000000000000000000000
>--- a/LayoutTests/scrollingcoordinator/gain-scrolling-node-parent.html
>+++ /dev/null
>@@ -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>
>diff --git a/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent-expected.txt b/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent-expected.txt
>deleted file mode 100644
>index 1f123a182a749410966ae7e08e3173e2c4a2f88d..0000000000000000000000000000000000000000
>--- a/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent-expected.txt
>+++ /dev/null
>@@ -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))
>-        )
>-      )
>-    )
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent.html b/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent.html
>deleted file mode 100644
>index 16bed94b768beab3d6786f17dd40525d5f8966dd..0000000000000000000000000000000000000000
>--- a/LayoutTests/scrollingcoordinator/lose-scrolling-node-parent.html
>+++ /dev/null
>@@ -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>
>diff --git a/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers-expected.txt b/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers-expected.txt
>deleted file mode 100644
>index 353babe68b49c4ed5a23fa02927bc137cc303b33..0000000000000000000000000000000000000000
>--- a/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers-expected.txt
>+++ /dev/null
>@@ -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
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers.html b/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers.html
>deleted file mode 100644
>index e77b2674bb28cfaf98b7d21156ab4fa81dc1633b..0000000000000000000000000000000000000000
>--- a/LayoutTests/scrollingcoordinator/reparent-across-compositing-layers.html
>+++ /dev/null
>@@ -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>
>diff --git a/LayoutTests/scrollingcoordinator/reparent-with-layer-removal-expected.txt b/LayoutTests/scrollingcoordinator/reparent-with-layer-removal-expected.txt
>deleted file mode 100644
>index 7b1e5616227262454a9c0dcceda9ace27524cd95..0000000000000000000000000000000000000000
>--- a/LayoutTests/scrollingcoordinator/reparent-with-layer-removal-expected.txt
>+++ /dev/null
>@@ -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))
>-    )
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/scrollingcoordinator/reparent-with-layer-removal.html b/LayoutTests/scrollingcoordinator/reparent-with-layer-removal.html
>deleted file mode 100644
>index 84a0a623e8d6a6e3fc15a0e7c624f33c17e077fd..0000000000000000000000000000000000000000
>--- a/LayoutTests/scrollingcoordinator/reparent-with-layer-removal.html
>+++ /dev/null
>@@ -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>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..1f123a182a749410966ae7e08e3173e2c4a2f88d
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt
>@@ -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))
>+        )
>+      )
>+    )
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent.html b/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..16bed94b768beab3d6786f17dd40525d5f8966dd
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent.html
>@@ -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>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..1f123a182a749410966ae7e08e3173e2c4a2f88d
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt
>@@ -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))
>+        )
>+      )
>+    )
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent.html b/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..16bed94b768beab3d6786f17dd40525d5f8966dd
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent.html
>@@ -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>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..353babe68b49c4ed5a23fa02927bc137cc303b33
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt
>@@ -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
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers.html b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..e77b2674bb28cfaf98b7d21156ab4fa81dc1633b
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers.html
>@@ -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>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..7b1e5616227262454a9c0dcceda9ace27524cd95
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt
>@@ -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))
>+    )
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal.html b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..84a0a623e8d6a6e3fc15a0e7c624f33c17e077fd
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal.html
>@@ -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>

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193836: 360132