Attachment 360159 Details for Bug 193845 – Patch

[patch] Patch

bug-193845-20190125135139.patch (text/plain), 75.68 KB, created by Simon Fraser (smfr) on 2019-01-25 13:51:40 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-01-25 13:51:40 PST

Size: 75.68 KB

patch

obsolete

>Subversion Revision: 240435
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 7cb16a8b71ef960223d7c3585fdd7a58bedbe336..5e49d16a986375ed5729b4a7b959e223fa1fc0e9 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,38 @@
>+2019-01-25  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Move more scrolling tree tests into scrollingcoordinator/scrolling-tree
>+        https://bugs.webkit.org/show_bug.cgi?id=193845
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        Gather more tests of the scrolling tree into scrollingcoordinator/scrolling-tree.
>+
>+        * platform/gtk/TestExpectations:
>+        * platform/ios-wk1/fast/scrolling/scrolling-tree-includes-frame-expected.txt: Removed.
>+        * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt: Added.
>+        * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt: Copied from LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt.
>+        * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt: Added.
>+        * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt: Added.
>+        * platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt: Renamed from LayoutTests/platform/ios/fast/scrolling/scrolling-tree-includes-frame-expected.txt.
>+        * platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt: Renamed from LayoutTests/platform/ios-wk2/fast/scrolling/scrolling-tree-includes-frame-expected.txt.
>+        * platform/mac-wk1/fast/scrolling/scrolling-tree-includes-frame-expected.txt: Removed.
>+        * platform/win/TestExpectations:
>+        * scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt: Renamed from LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt.
>+        * scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt: Renamed from LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt.
>+        * scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor.html.
>+        * scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt: Renamed from LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt.
>+        * scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed.html.
>+        * scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt: Renamed from LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt.
>+        * scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor.html.
>+        * scrollingcoordinator/scrolling-tree/coordinated-frame.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame.html.
>+        * scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt: Renamed from LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame-expected.txt.
>+        * scrollingcoordinator/scrolling-tree/remove-coordinated-frame.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame.html.
>+        * scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt: Renamed from LayoutTests/fast/scrolling/ios/remove-scrolling-role-expected.txt.
>+        * scrollingcoordinator/scrolling-tree/remove-scrolling-role.html: Renamed from LayoutTests/fast/scrolling/ios/remove-scrolling-role.html.
>+        * scrollingcoordinator/scrolling-tree/resources/doc-with-sticky.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/resources/doc-with-sticky.html.
>+        * scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt: Renamed from LayoutTests/fast/scrolling/scrolling-tree-includes-frame-expected.txt.
>+        * scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html: Renamed from LayoutTests/fast/scrolling/scrolling-tree-includes-frame.html.
>+
> 2019-01-25  Simon Fraser  <simon.fraser@apple.com>
> 
>         Move tests for scrolling tree mutations into their own directory
>diff --git a/LayoutTests/fast/scrolling/ios/remove-scrolling-role-expected.txt b/LayoutTests/fast/scrolling/ios/remove-scrolling-role-expected.txt
>deleted file mode 100644
>index 276780ce9674fda8238813ca85bf34af8c07ed26..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/ios/remove-scrolling-role-expected.txt
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-
>-(Frame scrolling node
>-  (scrollable area size 800 600)
>-  (contents size 800 2513)
>-  (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,1913))
>-  (behavior for fixed 0)
>-  (children 1
>-    (Overflow scrolling node
>-      (scrollable area size 300 400)
>-      (contents size 300 2000)
>-      (scrollable area parameters 
>-        (horizontal scroll elasticity 1)
>-        (vertical scroll elasticity 1)
>-        (horizontal scrollbar mode 0)
>-        (vertical scrollbar mode 0))
>-    )
>-  )
>-)
>-
>diff --git a/LayoutTests/fast/scrolling/ios/remove-scrolling-role.html b/LayoutTests/fast/scrolling/ios/remove-scrolling-role.html
>deleted file mode 100644
>index e01a297965000589e635e299ae2d90e9732f73bd..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/ios/remove-scrolling-role.html
>+++ /dev/null
>@@ -1,63 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-
>-<head>
>-    <style>
>-        body {
>-            margin: 0;
>-            height: 2500px;
>-        }
>-
>-        #fixed {
>-            position: fixed;
>-            left: 10px;
>-            top: 10px;
>-            -webkit-overflow-scrolling: touch;
>-            height: 400px;
>-            width: 300px;
>-            overflow: auto;
>-            border: 4px solid black;
>-        }
>-
>-        #fixed.changed {
>-            position: absolute;
>-            border: 4px solid green;
>-        }
>-
>-        .content {
>-            height: 2000px;
>-            background-color: silver;
>-        }
>-
>-    </style>
>-    <script>
>-        if (window.testRunner) {
>-            testRunner.waitUntilDone();
>-            testRunner.dumpAsText();
>-        }
>-
>-        function doTest()
>-        {
>-            window.setTimeout(function() {
>-                document.getElementById('fixed').classList.add('changed');
>-
>-                if (window.internals)
>-                    document.getElementById('results').innerText = internals.scrollingStateTreeAsText();
>-
>-                if (window.testRunner)
>-                    testRunner.notifyDone();
>-
>-                }, 0);
>-        }
>-
>-        window.addEventListener('load', doTest, false);
>-    </script>
>-</head>
>-<body>
>-  <pre id="results"></pre>
>-  <div id="fixed">
>-    <div class="content">
>-    </div>
>-  </div>
>-</body>
>-</html>
>diff --git a/LayoutTests/fast/scrolling/scrolling-tree-includes-frame-expected.txt b/LayoutTests/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>deleted file mode 100644
>index 99fdd043a9722ae11ef9e381d07006a2faed0c88..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>+++ /dev/null
>@@ -1,36 +0,0 @@
>-
>-
>-(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
>-    (Frame scrolling node
>-      (scrollable area size 85 185)
>-      (contents size 308 416)
>-      (scrollable area parameters 
>-        (horizontal scroll elasticity 0)
>-        (vertical scroll elasticity 0)
>-        (horizontal scrollbar mode 0)
>-        (vertical scrollbar mode 0)
>-        (has enabled horizontal scrollbar 1)
>-        (has enabled vertical scrollbar 1))
>-      (visual viewport enabled 1)
>-      (layout viewport at (0,0) size 85x185)
>-      (min layout viewport origin (0,0))
>-      (max layout viewport origin (223,231))
>-      (behavior for fixed 0)
>-    )
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/fast/scrolling/scrolling-tree-includes-frame.html b/LayoutTests/fast/scrolling/scrolling-tree-includes-frame.html
>deleted file mode 100644
>index 4bb2d1900056120e450095f4237ccd25f4fd5f91..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/scrolling-tree-includes-frame.html
>+++ /dev/null
>@@ -1,39 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-  <head>
>-    <title>Check whether scrollable iframes are included in the scrolling tree when async frame scrolling is enabled</title>
>-    <script>
>-      if (window.testRunner) {
>-          testRunner.dumpAsText();
>-          testRunner.waitUntilDone();
>-      }
>-      if (window.internals)
>-          window.internals.settings.setAsyncFrameScrollingEnabled(true);
>-      function doTest()
>-      {
>-          if (window.internals)
>-              document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
>-          if (window.testRunner)
>-              testRunner.notifyDone();
>-      }
>-    </script>
>-    <style>
>-      iframe {
>-          position: absolute;
>-          left: 0;
>-          top: 0;
>-          width: 100px;
>-          height: 200px;
>-          margin: 0;
>-          border: 0;
>-          padding: 0;
>-      }
>-    </style>
>-  </head>
>-  <body>
>-    <iframe onload="doTest()" srcdoc="
>-        <div style='width: 300px; height: 400px; background: gray;'></div>">
>-    </iframe>
>-    <pre id="scrollingTree"></pre>
>-  </body>
>-</html>
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index e4f546ac2de5da6e0787d9896fcc8e7ad9dfc421..af3749a2323a096e8055df94cf625620b9644b1b 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -1102,9 +1102,6 @@ inspector/canvas/resolveCanvasContext-webmetal.html [ Skip ]
> # We don't support APPLE_PAY.
> http/tests/ssl/applepay [ Skip ]
> 
>-# GTK port doesn't use the scrolling tree
>-fast/scrolling/scrolling-tree-includes-frame.html [ Skip ]
>-
> # This test assumes that color on sliders is not reversed for RTL, so failing is good.
> fast/forms/range/input-appearance-range-rtl.html [ ImageOnlyFailure ]
> 
>diff --git a/LayoutTests/platform/ios-wk1/fast/scrolling/scrolling-tree-includes-frame-expected.txt b/LayoutTests/platform/ios-wk1/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>deleted file mode 100644
>index b28b04f643122b019e912540f228c8ed20be9eeb..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/ios-wk1/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-
>-
>-
>diff --git a/LayoutTests/platform/ios-wk2/fast/scrolling/scrolling-tree-includes-frame-expected.txt b/LayoutTests/platform/ios-wk2/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>deleted file mode 100644
>index 4b34bf64bfc00b3034e664f899880ed18f3e9fb3..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/ios-wk2/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>+++ /dev/null
>@@ -1,34 +0,0 @@
>-
>-
>-(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
>-    (Frame scrolling node
>-      (scrollable area size 100 200)
>-      (contents size 308 416)
>-      (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 100x200)
>-      (min layout viewport origin (0,0))
>-      (max layout viewport origin (208,216))
>-      (behavior for fixed 0)
>-    )
>-  )
>-)
>-
>-
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4cfaf4b66bc7d4bb43754d7188d0d04763c7b5e0
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt
>@@ -0,0 +1,65 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 800 600)
>+  (contents size 800 1016)
>+  (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,416))
>+  (behavior for fixed 0)
>+  (children 1
>+    (Frame scrolling node
>+      (scrollable area size 500 300)
>+      (contents size 500 420)
>+      (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 500x300)
>+      (min layout viewport origin (0,0))
>+      (max layout viewport origin (0,120))
>+      (behavior for fixed 0)
>+      (children 2
>+        (Overflow scrolling node
>+          (scrollable area size 400 300)
>+          (contents size 400 1760)
>+          (scrollable area parameters 
>+            (horizontal scroll elasticity 1)
>+            (vertical scroll elasticity 1)
>+            (horizontal scrollbar mode 0)
>+            (vertical scrollbar mode 0))
>+          (children 1
>+            (Sticky node
>+              (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+              (top offset 10.00)
>+              (bottom offset 10.00)
>+              (containing block rect at (2,2) size 400x1760)
>+              (sticky box rect at (0,830) size 100x100)
>+              (constraining rect at (0,0) size 400x300)
>+              (sticky offset at last layout width=0 height=-640)
>+              (layer position at last layout (0,190))
>+            )
>+          )
>+        )
>+        (Sticky node
>+          (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+          (top offset 10.00)
>+          (bottom offset 10.00)
>+          (containing block rect at (8,8) size 484x404)
>+          (sticky box rect at (8,312) size 100x100)
>+          (constraining rect at (0,0) size 500x300)
>+          (sticky offset at last layout width=0 height=-122)
>+          (layer position at last layout (8,190))
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..c90398275b414d3f886a2b2d1ede35015a891996
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt
>@@ -0,0 +1,72 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 800 600)
>+  (contents size 800 1016)
>+  (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,416))
>+  (behavior for fixed 0)
>+  (children 1
>+    (Fixed node
>+      (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
>+      (viewport rect at last layout at (0,0) size 800x600)
>+      (layer position at last layout (8,10))
>+      (children 1
>+        (Frame scrolling node
>+          (scrollable area size 500 300)
>+          (contents size 500 420)
>+          (scrollable area parameters 
>+            (horizontal scroll elasticity 1)
>+            (vertical scroll elasticity 1)
>+            (horizontal scrollbar mode 1)
>+            (vertical scrollbar mode 1))
>+          (visual viewport enabled 1)
>+          (layout viewport at (0,0) size 500x300)
>+          (min layout viewport origin (0,0))
>+          (max layout viewport origin (0,120))
>+          (behavior for fixed 0)
>+          (children 2
>+            (Overflow scrolling node
>+              (scrollable area size 400 300)
>+              (contents size 400 1760)
>+              (scrollable area parameters 
>+                (horizontal scroll elasticity 1)
>+                (vertical scroll elasticity 1)
>+                (horizontal scrollbar mode 0)
>+                (vertical scrollbar mode 0))
>+              (children 1
>+                (Sticky node
>+                  (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+                  (top offset 10.00)
>+                  (bottom offset 10.00)
>+                  (containing block rect at (2,2) size 400x1760)
>+                  (sticky box rect at (0,830) size 100x100)
>+                  (constraining rect at (0,0) size 400x300)
>+                  (sticky offset at last layout width=0 height=-640)
>+                  (layer position at last layout (0,190))
>+                )
>+              )
>+            )
>+            (Sticky node
>+              (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+              (top offset 10.00)
>+              (bottom offset 10.00)
>+              (containing block rect at (8,8) size 484x404)
>+              (sticky box rect at (8,312) size 100x100)
>+              (constraining rect at (0,0) size 500x300)
>+              (sticky offset at last layout width=0 height=-122)
>+              (layer position at last layout (8,190))
>+            )
>+          )
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..cca344843769b92ec67a4b2105c440e8d9395b86
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt
>@@ -0,0 +1,72 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 800 600)
>+  (contents size 800 1016)
>+  (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,416))
>+  (behavior for fixed 0)
>+  (children 1
>+    (Fixed node
>+      (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
>+      (viewport rect at last layout at (0,0) size 800x600)
>+      (layer position at last layout (8,0))
>+      (children 1
>+        (Frame scrolling node
>+          (scrollable area size 500 300)
>+          (contents size 500 420)
>+          (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 500x300)
>+          (min layout viewport origin (0,0))
>+          (max layout viewport origin (0,120))
>+          (behavior for fixed 0)
>+          (children 2
>+            (Overflow scrolling node
>+              (scrollable area size 400 300)
>+              (contents size 400 1760)
>+              (scrollable area parameters 
>+                (horizontal scroll elasticity 1)
>+                (vertical scroll elasticity 1)
>+                (horizontal scrollbar mode 0)
>+                (vertical scrollbar mode 0))
>+              (children 1
>+                (Sticky node
>+                  (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+                  (top offset 10.00)
>+                  (bottom offset 10.00)
>+                  (containing block rect at (2,2) size 400x1760)
>+                  (sticky box rect at (0,830) size 100x100)
>+                  (constraining rect at (0,0) size 400x300)
>+                  (sticky offset at last layout width=0 height=-640)
>+                  (layer position at last layout (0,190))
>+                )
>+              )
>+            )
>+            (Sticky node
>+              (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+              (top offset 10.00)
>+              (bottom offset 10.00)
>+              (containing block rect at (8,8) size 484x404)
>+              (sticky box rect at (8,312) size 100x100)
>+              (constraining rect at (0,0) size 500x300)
>+              (sticky offset at last layout width=0 height=-122)
>+              (layer position at last layout (8,190))
>+            )
>+          )
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..ff36fdeafccbdac0d22a817133b487e78a8430ee
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt
>@@ -0,0 +1,65 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 800 600)
>+  (contents size 800 1016)
>+  (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,416))
>+  (behavior for fixed 0)
>+  (children 1
>+    (Frame scrolling node
>+      (scrollable area size 500 300)
>+      (contents size 500 420)
>+      (scrollable area parameters 
>+        (horizontal scroll elasticity 1)
>+        (vertical scroll elasticity 1)
>+        (horizontal scrollbar mode 1)
>+        (vertical scrollbar mode 1))
>+      (visual viewport enabled 1)
>+      (layout viewport at (0,0) size 500x300)
>+      (min layout viewport origin (0,0))
>+      (max layout viewport origin (0,120))
>+      (behavior for fixed 0)
>+      (children 2
>+        (Overflow scrolling node
>+          (scrollable area size 400 300)
>+          (contents size 400 1760)
>+          (scrollable area parameters 
>+            (horizontal scroll elasticity 1)
>+            (vertical scroll elasticity 1)
>+            (horizontal scrollbar mode 0)
>+            (vertical scrollbar mode 0))
>+          (children 1
>+            (Sticky node
>+              (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+              (top offset 10.00)
>+              (bottom offset 10.00)
>+              (containing block rect at (2,2) size 400x1760)
>+              (sticky box rect at (0,830) size 100x100)
>+              (constraining rect at (0,0) size 400x300)
>+              (sticky offset at last layout width=0 height=-640)
>+              (layer position at last layout (0,190))
>+            )
>+          )
>+        )
>+        (Sticky node
>+          (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+          (top offset 10.00)
>+          (bottom offset 10.00)
>+          (containing block rect at (8,8) size 484x404)
>+          (sticky box rect at (8,312) size 100x100)
>+          (constraining rect at (0,0) size 500x300)
>+          (sticky offset at last layout width=0 height=-122)
>+          (layer position at last layout (8,190))
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..693d3ecaebef771cf27e01cd4f5b8bf5e483b1df
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt
>@@ -0,0 +1,25 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 800 600)
>+  (contents size 800 1016)
>+  (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,416))
>+  (behavior for fixed 0)
>+  (children 1
>+    (Fixed node
>+      (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
>+      (viewport rect at last layout at (0,0) size 800x600)
>+      (layer position at last layout (8,10))
>+      (children 0
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4b34bf64bfc00b3034e664f899880ed18f3e9fb3
>--- /dev/null
>+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt
>@@ -0,0 +1,34 @@
>+
>+
>+(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
>+    (Frame scrolling node
>+      (scrollable area size 100 200)
>+      (contents size 308 416)
>+      (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 100x200)
>+      (min layout viewport origin (0,0))
>+      (max layout viewport origin (208,216))
>+      (behavior for fixed 0)
>+    )
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/platform/ios/fast/scrolling/scrolling-tree-includes-frame-expected.txt b/LayoutTests/platform/ios/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>deleted file mode 100644
>index 2b524e809a55f677a8286dd065e954ce737ffcdf..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/ios/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>+++ /dev/null
>@@ -1,20 +0,0 @@
>-
>-
>-(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))
>-  (synchronous event dispatch region for event wheel
>-    at (9,9) size 100x200)
>-  (behavior for fixed 0)
>-)
>-
>-
>diff --git a/LayoutTests/platform/mac-wk1/fast/scrolling/scrolling-tree-includes-frame-expected.txt b/LayoutTests/platform/mac-wk1/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>deleted file mode 100644
>index b28b04f643122b019e912540f228c8ed20be9eeb..0000000000000000000000000000000000000000
>--- a/LayoutTests/platform/mac-wk1/fast/scrolling/scrolling-tree-includes-frame-expected.txt
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-
>-
>-
>diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
>index 080fbeaf3f3830b65b14f2862de5a62024cca47c..8006cdac71fe8f2dfc990ff55f67157879a0d5ea 100644
>--- a/LayoutTests/platform/win/TestExpectations
>+++ b/LayoutTests/platform/win/TestExpectations
>@@ -3534,7 +3534,6 @@ fast/multicol/newmulticol/client-rects.html [ Failure ]
> fast/multicol/table-vertical-align.html [ Failure ]
> fast/parser/xml-error-unload-iframe.html [ Failure ]
> fast/replaced/table-percent-height.html [ Failure ]
>-fast/scrolling/scrolling-tree-includes-frame.html [ Failure ]
> fast/table/giantRowspan.html [ Failure ]
> fast/table/giantRowspan2.html [ Failure ]
> fast/text/emoji.html [ Failure ]
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..51c67f6ce67b8ff8b919d6487c662babf2b95363
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt
>@@ -0,0 +1,48 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 785 600)
>+  (contents size 785 1016)
>+  (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,416))
>+  (synchronous event dispatch region for event wheel
>+    at (45,47) size 404x304)
>+  (behavior for fixed 0)
>+  (children 1
>+    (Frame scrolling node
>+      (scrollable area size 485 300)
>+      (contents size 485 420)
>+      (scrollable area parameters 
>+        (horizontal scroll elasticity 0)
>+        (vertical scroll elasticity 0)
>+        (horizontal scrollbar mode 0)
>+        (vertical scrollbar mode 0)
>+        (has enabled vertical scrollbar 1))
>+      (visual viewport enabled 1)
>+      (layout viewport at (0,0) size 485x300)
>+      (min layout viewport origin (0,0))
>+      (max layout viewport origin (0,120))
>+      (behavior for fixed 0)
>+      (children 1
>+        (Sticky node
>+          (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+          (top offset 10.00)
>+          (bottom offset 10.00)
>+          (containing block rect at (8,8) size 469x404)
>+          (sticky box rect at (8,312) size 100x100)
>+          (constraining rect at (0,0) size 485x300)
>+          (sticky offset at last layout width=0 height=-122)
>+          (layer position at last layout (8,190))
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..2f4a32a0dbe0e62f8b435fa91b7d01c127d149b4
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt
>@@ -0,0 +1,54 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 785 600)
>+  (contents size 785 1016)
>+  (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,416))
>+  (synchronous event dispatch region for event wheel
>+    at (45,47) size 404x304)
>+  (behavior for fixed 0)
>+  (children 1
>+    (Fixed node
>+      (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
>+      (viewport rect at last layout at (0,0) size 785x600)
>+      (layer position at last layout (8,10))
>+      (children 1
>+        (Frame scrolling node
>+          (scrollable area size 500 300)
>+          (contents size 500 420)
>+          (scrollable area parameters 
>+            (horizontal scroll elasticity 0)
>+            (vertical scroll elasticity 0)
>+            (horizontal scrollbar mode 1)
>+            (vertical scrollbar mode 1))
>+          (visual viewport enabled 1)
>+          (layout viewport at (0,0) size 500x300)
>+          (min layout viewport origin (0,0))
>+          (max layout viewport origin (0,120))
>+          (behavior for fixed 0)
>+          (children 1
>+            (Sticky node
>+              (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+              (top offset 10.00)
>+              (bottom offset 10.00)
>+              (containing block rect at (8,8) size 484x404)
>+              (sticky box rect at (8,312) size 100x100)
>+              (constraining rect at (0,0) size 500x300)
>+              (sticky offset at last layout width=0 height=-122)
>+              (layer position at last layout (8,190))
>+            )
>+          )
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor.html b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..b9703b719e91a6df80daca503e70fae874335cf8
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor.html
>@@ -0,0 +1,64 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <style>
>+        body {
>+            height: 1000px;
>+        }
>+        
>+        iframe {
>+            display: block;
>+            margin: 10px;
>+            border: 5px solid black;
>+        }
>+        
>+        #container {
>+            position: absolute;
>+            top: 10px;
>+            border: 4px solid green;
>+            padding: 10px;
>+        }
>+        
>+        #container.fixed {
>+            position: fixed;
>+            top: 10px;
>+            border: 4px solid orange;
>+        }
>+        
>+        #tree {
>+            position: absolute;
>+            top: 375px;
>+        }
>+    </style>
>+    <script>
>+        if (window.testRunner) {
>+            testRunner.waitUntilDone();
>+            testRunner.dumpAsText();
>+            window.internals.settings.setScrollingTreeIncludesFrames(true);
>+        }
>+
>+        function startTest()
>+        {
>+            window.setTimeout(function() {
>+                document.getElementById('container').classList.toggle('fixed');
>+
>+                if (window.internals)
>+                    document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>+
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>+
>+            }, 0);
>+        }
>+        
>+        window.addEventListener('load', startTest, false);
>+    </script>
>+</head>
>+<body>
>+    
>+    <div id="container">
>+        <iframe src="resources/doc-with-sticky.html" scrolling="no" width="500" height="300"></iframe>
>+    </div>
>+<pre id="tree">Scrolling tree goes here</pre>
>+</body>
>+</html>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..b67332d9fca632dd86c832b5553a55afd1b793a4
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt
>@@ -0,0 +1,55 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 785 600)
>+  (contents size 785 1016)
>+  (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,416))
>+  (synchronous event dispatch region for event wheel
>+    at (45,37) size 404x304)
>+  (behavior for fixed 0)
>+  (children 1
>+    (Fixed node
>+      (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
>+      (viewport rect at last layout at (0,0) size 785x600)
>+      (layer position at last layout (8,0))
>+      (children 1
>+        (Frame scrolling node
>+          (scrollable area size 485 300)
>+          (contents size 485 420)
>+          (scrollable area parameters 
>+            (horizontal scroll elasticity 0)
>+            (vertical scroll elasticity 0)
>+            (horizontal scrollbar mode 0)
>+            (vertical scrollbar mode 0)
>+            (has enabled vertical scrollbar 1))
>+          (visual viewport enabled 1)
>+          (layout viewport at (0,0) size 485x300)
>+          (min layout viewport origin (0,0))
>+          (max layout viewport origin (0,120))
>+          (behavior for fixed 0)
>+          (children 1
>+            (Sticky node
>+              (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+              (top offset 10.00)
>+              (bottom offset 10.00)
>+              (containing block rect at (8,8) size 469x404)
>+              (sticky box rect at (8,312) size 100x100)
>+              (constraining rect at (0,0) size 485x300)
>+              (sticky offset at last layout width=0 height=-122)
>+              (layer position at last layout (8,190))
>+            )
>+          )
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed.html b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..e3eb73e28c95d2edfc076eaad330df22766ce98f
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed.html
>@@ -0,0 +1,55 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <style>
>+        body {
>+            height: 1000px;
>+        }
>+        
>+        iframe {
>+            display: block;
>+            margin: 10px;
>+            border: 5px solid black;
>+        }
>+        
>+        #container {
>+            position: absolute;
>+            top: 10px;
>+            border: 4px solid green;
>+            padding: 10px;
>+        }
>+        
>+        #container {
>+            position: fixed;
>+            top: 0;
>+            border: 4px solid orange;
>+        }
>+        
>+        #tree {
>+            position: absolute;
>+            top: 375px;
>+        }
>+    </style>
>+    <script>
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>+            window.internals.settings.setScrollingTreeIncludesFrames(true);
>+        }
>+
>+        function startTest()
>+        {
>+            if (window.internals)
>+                document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>+        }
>+        
>+        window.addEventListener('load', startTest, false);
>+    </script>
>+</head>
>+<body>
>+    
>+    <div id="container">
>+        <iframe src="resources/doc-with-sticky.html" width="500" height="300"></iframe>
>+    </div>
>+<pre id="tree">Scrolling tree goes here</pre>
>+</body>
>+</html>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..9a9f562b360aec5e25df70aaa37fe54dd17acefd
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt
>@@ -0,0 +1,47 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 785 600)
>+  (contents size 785 1016)
>+  (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,416))
>+  (synchronous event dispatch region for event wheel
>+    at (45,47) size 404x304)
>+  (behavior for fixed 0)
>+  (children 1
>+    (Frame scrolling node
>+      (scrollable area size 500 300)
>+      (contents size 500 420)
>+      (scrollable area parameters 
>+        (horizontal scroll elasticity 0)
>+        (vertical scroll elasticity 0)
>+        (horizontal scrollbar mode 1)
>+        (vertical scrollbar mode 1))
>+      (visual viewport enabled 1)
>+      (layout viewport at (0,0) size 500x300)
>+      (min layout viewport origin (0,0))
>+      (max layout viewport origin (0,120))
>+      (behavior for fixed 0)
>+      (children 1
>+        (Sticky node
>+          (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>+          (top offset 10.00)
>+          (bottom offset 10.00)
>+          (containing block rect at (8,8) size 484x404)
>+          (sticky box rect at (8,312) size 100x100)
>+          (constraining rect at (0,0) size 500x300)
>+          (sticky offset at last layout width=0 height=-122)
>+          (layer position at last layout (8,190))
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor.html b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..f226d06872bf07e5cc5ca6c172d6f3ce700495c9
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor.html
>@@ -0,0 +1,64 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <style>
>+        body {
>+            height: 1000px;
>+        }
>+        
>+        iframe {
>+            display: block;
>+            margin: 10px;
>+            border: 5px solid black;
>+        }
>+        
>+        #container {
>+            position: absolute;
>+            top: 10px;
>+            border: 4px solid green;
>+            padding: 10px;
>+        }
>+        
>+        #container.fixed {
>+            position: fixed;
>+            top: 10px;
>+            border: 4px solid orange;
>+        }
>+        
>+        #tree {
>+            position: absolute;
>+            top: 375px;
>+        }
>+    </style>
>+    <script>
>+        if (window.testRunner) {
>+            testRunner.waitUntilDone();
>+            testRunner.dumpAsText();
>+            window.internals.settings.setScrollingTreeIncludesFrames(true);
>+        }
>+
>+        function startTest()
>+        {
>+            window.setTimeout(function() {
>+                document.getElementById('container').classList.toggle('fixed');
>+
>+                if (window.internals)
>+                    document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>+
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>+
>+            }, 0);
>+        }
>+        
>+        window.addEventListener('load', startTest, false);
>+    </script>
>+</head>
>+<body>
>+    
>+    <div id="container" class="fixed">
>+        <iframe src="resources/doc-with-sticky.html" scrolling="no" width="500" height="300"></iframe>
>+    </div>
>+<pre id="tree">Scrolling tree goes here</pre>
>+</body>
>+</html>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame.html b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..8fd0f6de58ca9b8e0254c7f96e4a4e06b29ff159
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame.html
>@@ -0,0 +1,53 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <style>
>+        body {
>+            height: 1000px;
>+        }
>+        
>+        iframe {
>+            display: block;
>+            margin: 10px;
>+            border: 5px solid black;
>+        }
>+        
>+        #container {
>+            position: absolute;
>+            top: 10px;
>+            border: 4px solid green;
>+            padding: 10px;
>+        }
>+        
>+        #container {
>+            border: 4px solid orange;
>+        }
>+        
>+        #tree {
>+            position: absolute;
>+            top: 375px;
>+        }
>+    </style>
>+    <script>
>+        if (window.testRunner) {
>+            testRunner.dumpAsText();
>+            window.internals.settings.setScrollingTreeIncludesFrames(true);
>+        }
>+
>+        function startTest()
>+        {
>+            if (window.internals)
>+                document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>+        }
>+        
>+        window.addEventListener('load', startTest, false);
>+    </script>
>+</head>
>+<body>
>+    
>+    <div id="container">
>+        <iframe src="resources/doc-with-sticky.html" width="500" height="300"></iframe>
>+    </div>
>+<pre id="tree">Scrolling tree goes here</pre>
>+</body>
>+</html>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..82e9b4c90eee138b9f5d2c01e1d92a05eefbca2c
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt
>@@ -0,0 +1,26 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 785 600)
>+  (contents size 785 1016)
>+  (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,416))
>+  (behavior for fixed 0)
>+  (children 1
>+    (Fixed node
>+      (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
>+      (viewport rect at last layout at (0,0) size 785x600)
>+      (layer position at last layout (8,10))
>+      (children 0
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame.html b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..2c8744368c712d5e9ad2b0e9b7e3d2b6a7411866
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame.html
>@@ -0,0 +1,65 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+    <style>
>+        body {
>+            height: 1000px;
>+        }
>+        
>+        iframe {
>+            display: block;
>+            margin: 10px;
>+            border: 5px solid black;
>+        }
>+        
>+        #container {
>+            position: absolute;
>+            top: 10px;
>+            border: 4px solid green;
>+            padding: 10px;
>+        }
>+        
>+        #container.fixed {
>+            position: fixed;
>+            top: 10px;
>+            border: 4px solid orange;
>+        }
>+        
>+        #tree {
>+            position: absolute;
>+            top: 375px;
>+        }
>+    </style>
>+    <script>
>+        if (window.testRunner) {
>+            testRunner.waitUntilDone();
>+            testRunner.dumpAsText();
>+            window.internals.settings.setScrollingTreeIncludesFrames(true);
>+        }
>+
>+        function startTest()
>+        {
>+            window.setTimeout(function() {
>+                var iframe = document.getElementById('iframe');
>+                iframe.remove();
>+
>+                if (window.internals)
>+                    document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>+
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>+
>+            }, 0);
>+        }
>+        
>+        window.addEventListener('load', startTest, false);
>+    </script>
>+</head>
>+<body>
>+    
>+    <div id="container" class="fixed">
>+        <iframe id="iframe" src="resources/doc-with-sticky.html" scrolling="no" width="500" height="300"></iframe>
>+    </div>
>+<pre id="tree">Scrolling tree goes here</pre>
>+</body>
>+</html>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..276780ce9674fda8238813ca85bf34af8c07ed26
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt
>@@ -0,0 +1,27 @@
>+
>+(Frame scrolling node
>+  (scrollable area size 800 600)
>+  (contents size 800 2513)
>+  (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,1913))
>+  (behavior for fixed 0)
>+  (children 1
>+    (Overflow scrolling node
>+      (scrollable area size 300 400)
>+      (contents size 300 2000)
>+      (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/remove-scrolling-role.html b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..e01a297965000589e635e299ae2d90e9732f73bd
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role.html
>@@ -0,0 +1,63 @@
>+<!DOCTYPE html>
>+<html>
>+
>+<head>
>+    <style>
>+        body {
>+            margin: 0;
>+            height: 2500px;
>+        }
>+
>+        #fixed {
>+            position: fixed;
>+            left: 10px;
>+            top: 10px;
>+            -webkit-overflow-scrolling: touch;
>+            height: 400px;
>+            width: 300px;
>+            overflow: auto;
>+            border: 4px solid black;
>+        }
>+
>+        #fixed.changed {
>+            position: absolute;
>+            border: 4px solid green;
>+        }
>+
>+        .content {
>+            height: 2000px;
>+            background-color: silver;
>+        }
>+
>+    </style>
>+    <script>
>+        if (window.testRunner) {
>+            testRunner.waitUntilDone();
>+            testRunner.dumpAsText();
>+        }
>+
>+        function doTest()
>+        {
>+            window.setTimeout(function() {
>+                document.getElementById('fixed').classList.add('changed');
>+
>+                if (window.internals)
>+                    document.getElementById('results').innerText = internals.scrollingStateTreeAsText();
>+
>+                if (window.testRunner)
>+                    testRunner.notifyDone();
>+
>+                }, 0);
>+        }
>+
>+        window.addEventListener('load', doTest, false);
>+    </script>
>+</head>
>+<body>
>+  <pre id="results"></pre>
>+  <div id="fixed">
>+    <div class="content">
>+    </div>
>+  </div>
>+</body>
>+</html>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/resources/doc-with-sticky.html b/LayoutTests/scrollingcoordinator/scrolling-tree/resources/doc-with-sticky.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..7bbd2bb4335fc124375f9b2b56e467151181e63d
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/resources/doc-with-sticky.html
>@@ -0,0 +1,47 @@
>+<!DOCTYPE html>
>+
>+<html>
>+<head>
>+    <style>
>+        .box {
>+            height: 100px;
>+            width: 100px;
>+            background-color: blue;
>+        }
>+        
>+        .scrolling {
>+            height: 300px;
>+            width: 400px;
>+            overflow: scroll;
>+            -webkit-overflow-scrolling: touch;
>+            border: 2px solid black;
>+        }
>+        
>+        .spacer {
>+            height: 400px;
>+            margin: 10px;
>+            background-color: silver;
>+        }
>+        .sticky {
>+            position: -webkit-sticky;
>+            top: 10px;
>+            bottom: 10px;
>+        }
>+        
>+        .composited {
>+            -webkit-transform: translateZ(0);
>+        }
>+    </style>
>+</head>
>+<body>
>+    <div class="composited scrolling">
>+        <div class="spacer"></div>
>+        <div class="spacer"></div>
>+        <div class="sticky box"></div>
>+        <div class="spacer"></div>
>+        <div class="spacer"></div>
>+    </div>
>+    <div class="sticky box"></div>
>+
>+</body>
>+</html>
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..99fdd043a9722ae11ef9e381d07006a2faed0c88
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt
>@@ -0,0 +1,36 @@
>+
>+
>+(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
>+    (Frame scrolling node
>+      (scrollable area size 85 185)
>+      (contents size 308 416)
>+      (scrollable area parameters 
>+        (horizontal scroll elasticity 0)
>+        (vertical scroll elasticity 0)
>+        (horizontal scrollbar mode 0)
>+        (vertical scrollbar mode 0)
>+        (has enabled horizontal scrollbar 1)
>+        (has enabled vertical scrollbar 1))
>+      (visual viewport enabled 1)
>+      (layout viewport at (0,0) size 85x185)
>+      (min layout viewport origin (0,0))
>+      (max layout viewport origin (223,231))
>+      (behavior for fixed 0)
>+    )
>+  )
>+)
>+
>+
>diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..4bb2d1900056120e450095f4237ccd25f4fd5f91
>--- /dev/null
>+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame.html
>@@ -0,0 +1,39 @@
>+<!DOCTYPE html>
>+<html>
>+  <head>
>+    <title>Check whether scrollable iframes are included in the scrolling tree when async frame scrolling is enabled</title>
>+    <script>
>+      if (window.testRunner) {
>+          testRunner.dumpAsText();
>+          testRunner.waitUntilDone();
>+      }
>+      if (window.internals)
>+          window.internals.settings.setAsyncFrameScrollingEnabled(true);
>+      function doTest()
>+      {
>+          if (window.internals)
>+              document.getElementById('scrollingTree').innerText = window.internals.scrollingStateTreeAsText() + "\n";
>+          if (window.testRunner)
>+              testRunner.notifyDone();
>+      }
>+    </script>
>+    <style>
>+      iframe {
>+          position: absolute;
>+          left: 0;
>+          top: 0;
>+          width: 100px;
>+          height: 200px;
>+          margin: 0;
>+          border: 0;
>+          padding: 0;
>+      }
>+    </style>
>+  </head>
>+  <body>
>+    <iframe onload="doTest()" srcdoc="
>+        <div style='width: 300px; height: 400px; background: gray;'></div>">
>+    </iframe>
>+    <pre id="scrollingTree"></pre>
>+  </body>
>+</html>
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt b/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt
>deleted file mode 100644
>index 51c67f6ce67b8ff8b919d6487c662babf2b95363..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt
>+++ /dev/null
>@@ -1,48 +0,0 @@
>-
>-(Frame scrolling node
>-  (scrollable area size 785 600)
>-  (contents size 785 1016)
>-  (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,416))
>-  (synchronous event dispatch region for event wheel
>-    at (45,47) size 404x304)
>-  (behavior for fixed 0)
>-  (children 1
>-    (Frame scrolling node
>-      (scrollable area size 485 300)
>-      (contents size 485 420)
>-      (scrollable area parameters 
>-        (horizontal scroll elasticity 0)
>-        (vertical scroll elasticity 0)
>-        (horizontal scrollbar mode 0)
>-        (vertical scrollbar mode 0)
>-        (has enabled vertical scrollbar 1))
>-      (visual viewport enabled 1)
>-      (layout viewport at (0,0) size 485x300)
>-      (min layout viewport origin (0,0))
>-      (max layout viewport origin (0,120))
>-      (behavior for fixed 0)
>-      (children 1
>-        (Sticky node
>-          (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>-          (top offset 10.00)
>-          (bottom offset 10.00)
>-          (containing block rect at (8,8) size 469x404)
>-          (sticky box rect at (8,312) size 100x100)
>-          (constraining rect at (0,0) size 485x300)
>-          (sticky offset at last layout width=0 height=-122)
>-          (layer position at last layout (8,190))
>-        )
>-      )
>-    )
>-  )
>-)
>-
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt b/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt
>deleted file mode 100644
>index 2f4a32a0dbe0e62f8b435fa91b7d01c127d149b4..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt
>+++ /dev/null
>@@ -1,54 +0,0 @@
>-
>-(Frame scrolling node
>-  (scrollable area size 785 600)
>-  (contents size 785 1016)
>-  (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,416))
>-  (synchronous event dispatch region for event wheel
>-    at (45,47) size 404x304)
>-  (behavior for fixed 0)
>-  (children 1
>-    (Fixed node
>-      (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
>-      (viewport rect at last layout at (0,0) size 785x600)
>-      (layer position at last layout (8,10))
>-      (children 1
>-        (Frame scrolling node
>-          (scrollable area size 500 300)
>-          (contents size 500 420)
>-          (scrollable area parameters 
>-            (horizontal scroll elasticity 0)
>-            (vertical scroll elasticity 0)
>-            (horizontal scrollbar mode 1)
>-            (vertical scrollbar mode 1))
>-          (visual viewport enabled 1)
>-          (layout viewport at (0,0) size 500x300)
>-          (min layout viewport origin (0,0))
>-          (max layout viewport origin (0,120))
>-          (behavior for fixed 0)
>-          (children 1
>-            (Sticky node
>-              (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>-              (top offset 10.00)
>-              (bottom offset 10.00)
>-              (containing block rect at (8,8) size 484x404)
>-              (sticky box rect at (8,312) size 100x100)
>-              (constraining rect at (0,0) size 500x300)
>-              (sticky offset at last layout width=0 height=-122)
>-              (layer position at last layout (8,190))
>-            )
>-          )
>-        )
>-      )
>-    )
>-  )
>-)
>-
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor.html b/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor.html
>deleted file mode 100644
>index b9703b719e91a6df80daca503e70fae874335cf8..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor.html
>+++ /dev/null
>@@ -1,64 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-<head>
>-    <style>
>-        body {
>-            height: 1000px;
>-        }
>-        
>-        iframe {
>-            display: block;
>-            margin: 10px;
>-            border: 5px solid black;
>-        }
>-        
>-        #container {
>-            position: absolute;
>-            top: 10px;
>-            border: 4px solid green;
>-            padding: 10px;
>-        }
>-        
>-        #container.fixed {
>-            position: fixed;
>-            top: 10px;
>-            border: 4px solid orange;
>-        }
>-        
>-        #tree {
>-            position: absolute;
>-            top: 375px;
>-        }
>-    </style>
>-    <script>
>-        if (window.testRunner) {
>-            testRunner.waitUntilDone();
>-            testRunner.dumpAsText();
>-            window.internals.settings.setScrollingTreeIncludesFrames(true);
>-        }
>-
>-        function startTest()
>-        {
>-            window.setTimeout(function() {
>-                document.getElementById('container').classList.toggle('fixed');
>-
>-                if (window.internals)
>-                    document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>-
>-                if (window.testRunner)
>-                    testRunner.notifyDone();
>-
>-            }, 0);
>-        }
>-        
>-        window.addEventListener('load', startTest, false);
>-    </script>
>-</head>
>-<body>
>-    
>-    <div id="container">
>-        <iframe src="resources/doc-with-sticky.html" scrolling="no" width="500" height="300"></iframe>
>-    </div>
>-<pre id="tree">Scrolling tree goes here</pre>
>-</body>
>-</html>
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt b/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt
>deleted file mode 100644
>index b67332d9fca632dd86c832b5553a55afd1b793a4..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt
>+++ /dev/null
>@@ -1,55 +0,0 @@
>-
>-(Frame scrolling node
>-  (scrollable area size 785 600)
>-  (contents size 785 1016)
>-  (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,416))
>-  (synchronous event dispatch region for event wheel
>-    at (45,37) size 404x304)
>-  (behavior for fixed 0)
>-  (children 1
>-    (Fixed node
>-      (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
>-      (viewport rect at last layout at (0,0) size 785x600)
>-      (layer position at last layout (8,0))
>-      (children 1
>-        (Frame scrolling node
>-          (scrollable area size 485 300)
>-          (contents size 485 420)
>-          (scrollable area parameters 
>-            (horizontal scroll elasticity 0)
>-            (vertical scroll elasticity 0)
>-            (horizontal scrollbar mode 0)
>-            (vertical scrollbar mode 0)
>-            (has enabled vertical scrollbar 1))
>-          (visual viewport enabled 1)
>-          (layout viewport at (0,0) size 485x300)
>-          (min layout viewport origin (0,0))
>-          (max layout viewport origin (0,120))
>-          (behavior for fixed 0)
>-          (children 1
>-            (Sticky node
>-              (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>-              (top offset 10.00)
>-              (bottom offset 10.00)
>-              (containing block rect at (8,8) size 469x404)
>-              (sticky box rect at (8,312) size 100x100)
>-              (constraining rect at (0,0) size 485x300)
>-              (sticky offset at last layout width=0 height=-122)
>-              (layer position at last layout (8,190))
>-            )
>-          )
>-        )
>-      )
>-    )
>-  )
>-)
>-
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed.html b/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed.html
>deleted file mode 100644
>index e3eb73e28c95d2edfc076eaad330df22766ce98f..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed.html
>+++ /dev/null
>@@ -1,55 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-<head>
>-    <style>
>-        body {
>-            height: 1000px;
>-        }
>-        
>-        iframe {
>-            display: block;
>-            margin: 10px;
>-            border: 5px solid black;
>-        }
>-        
>-        #container {
>-            position: absolute;
>-            top: 10px;
>-            border: 4px solid green;
>-            padding: 10px;
>-        }
>-        
>-        #container {
>-            position: fixed;
>-            top: 0;
>-            border: 4px solid orange;
>-        }
>-        
>-        #tree {
>-            position: absolute;
>-            top: 375px;
>-        }
>-    </style>
>-    <script>
>-        if (window.testRunner) {
>-            testRunner.dumpAsText();
>-            window.internals.settings.setScrollingTreeIncludesFrames(true);
>-        }
>-
>-        function startTest()
>-        {
>-            if (window.internals)
>-                document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>-        }
>-        
>-        window.addEventListener('load', startTest, false);
>-    </script>
>-</head>
>-<body>
>-    
>-    <div id="container">
>-        <iframe src="resources/doc-with-sticky.html" width="500" height="300"></iframe>
>-    </div>
>-<pre id="tree">Scrolling tree goes here</pre>
>-</body>
>-</html>
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt b/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt
>deleted file mode 100644
>index 9a9f562b360aec5e25df70aaa37fe54dd17acefd..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt
>+++ /dev/null
>@@ -1,47 +0,0 @@
>-
>-(Frame scrolling node
>-  (scrollable area size 785 600)
>-  (contents size 785 1016)
>-  (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,416))
>-  (synchronous event dispatch region for event wheel
>-    at (45,47) size 404x304)
>-  (behavior for fixed 0)
>-  (children 1
>-    (Frame scrolling node
>-      (scrollable area size 500 300)
>-      (contents size 500 420)
>-      (scrollable area parameters 
>-        (horizontal scroll elasticity 0)
>-        (vertical scroll elasticity 0)
>-        (horizontal scrollbar mode 1)
>-        (vertical scrollbar mode 1))
>-      (visual viewport enabled 1)
>-      (layout viewport at (0,0) size 500x300)
>-      (min layout viewport origin (0,0))
>-      (max layout viewport origin (0,120))
>-      (behavior for fixed 0)
>-      (children 1
>-        (Sticky node
>-          (anchor edges: AnchorEdgeTop AnchorEdgeBottom)
>-          (top offset 10.00)
>-          (bottom offset 10.00)
>-          (containing block rect at (8,8) size 484x404)
>-          (sticky box rect at (8,312) size 100x100)
>-          (constraining rect at (0,0) size 500x300)
>-          (sticky offset at last layout width=0 height=-122)
>-          (layer position at last layout (8,190))
>-        )
>-      )
>-    )
>-  )
>-)
>-
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor.html b/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor.html
>deleted file mode 100644
>index f226d06872bf07e5cc5ca6c172d6f3ce700495c9..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor.html
>+++ /dev/null
>@@ -1,64 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-<head>
>-    <style>
>-        body {
>-            height: 1000px;
>-        }
>-        
>-        iframe {
>-            display: block;
>-            margin: 10px;
>-            border: 5px solid black;
>-        }
>-        
>-        #container {
>-            position: absolute;
>-            top: 10px;
>-            border: 4px solid green;
>-            padding: 10px;
>-        }
>-        
>-        #container.fixed {
>-            position: fixed;
>-            top: 10px;
>-            border: 4px solid orange;
>-        }
>-        
>-        #tree {
>-            position: absolute;
>-            top: 375px;
>-        }
>-    </style>
>-    <script>
>-        if (window.testRunner) {
>-            testRunner.waitUntilDone();
>-            testRunner.dumpAsText();
>-            window.internals.settings.setScrollingTreeIncludesFrames(true);
>-        }
>-
>-        function startTest()
>-        {
>-            window.setTimeout(function() {
>-                document.getElementById('container').classList.toggle('fixed');
>-
>-                if (window.internals)
>-                    document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>-
>-                if (window.testRunner)
>-                    testRunner.notifyDone();
>-
>-            }, 0);
>-        }
>-        
>-        window.addEventListener('load', startTest, false);
>-    </script>
>-</head>
>-<body>
>-    
>-    <div id="container" class="fixed">
>-        <iframe src="resources/doc-with-sticky.html" scrolling="no" width="500" height="300"></iframe>
>-    </div>
>-<pre id="tree">Scrolling tree goes here</pre>
>-</body>
>-</html>
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame.html b/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame.html
>deleted file mode 100644
>index 8fd0f6de58ca9b8e0254c7f96e4a4e06b29ff159..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame.html
>+++ /dev/null
>@@ -1,53 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-<head>
>-    <style>
>-        body {
>-            height: 1000px;
>-        }
>-        
>-        iframe {
>-            display: block;
>-            margin: 10px;
>-            border: 5px solid black;
>-        }
>-        
>-        #container {
>-            position: absolute;
>-            top: 10px;
>-            border: 4px solid green;
>-            padding: 10px;
>-        }
>-        
>-        #container {
>-            border: 4px solid orange;
>-        }
>-        
>-        #tree {
>-            position: absolute;
>-            top: 375px;
>-        }
>-    </style>
>-    <script>
>-        if (window.testRunner) {
>-            testRunner.dumpAsText();
>-            window.internals.settings.setScrollingTreeIncludesFrames(true);
>-        }
>-
>-        function startTest()
>-        {
>-            if (window.internals)
>-                document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>-        }
>-        
>-        window.addEventListener('load', startTest, false);
>-    </script>
>-</head>
>-<body>
>-    
>-    <div id="container">
>-        <iframe src="resources/doc-with-sticky.html" width="500" height="300"></iframe>
>-    </div>
>-<pre id="tree">Scrolling tree goes here</pre>
>-</body>
>-</html>
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame-expected.txt b/LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame-expected.txt
>deleted file mode 100644
>index 82e9b4c90eee138b9f5d2c01e1d92a05eefbca2c..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame-expected.txt
>+++ /dev/null
>@@ -1,26 +0,0 @@
>-
>-(Frame scrolling node
>-  (scrollable area size 785 600)
>-  (contents size 785 1016)
>-  (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,416))
>-  (behavior for fixed 0)
>-  (children 1
>-    (Fixed node
>-      (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
>-      (viewport rect at last layout at (0,0) size 785x600)
>-      (layer position at last layout (8,10))
>-      (children 0
>-      )
>-    )
>-  )
>-)
>-
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame.html b/LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame.html
>deleted file mode 100644
>index 2c8744368c712d5e9ad2b0e9b7e3d2b6a7411866..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame.html
>+++ /dev/null
>@@ -1,65 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-<head>
>-    <style>
>-        body {
>-            height: 1000px;
>-        }
>-        
>-        iframe {
>-            display: block;
>-            margin: 10px;
>-            border: 5px solid black;
>-        }
>-        
>-        #container {
>-            position: absolute;
>-            top: 10px;
>-            border: 4px solid green;
>-            padding: 10px;
>-        }
>-        
>-        #container.fixed {
>-            position: fixed;
>-            top: 10px;
>-            border: 4px solid orange;
>-        }
>-        
>-        #tree {
>-            position: absolute;
>-            top: 375px;
>-        }
>-    </style>
>-    <script>
>-        if (window.testRunner) {
>-            testRunner.waitUntilDone();
>-            testRunner.dumpAsText();
>-            window.internals.settings.setScrollingTreeIncludesFrames(true);
>-        }
>-
>-        function startTest()
>-        {
>-            window.setTimeout(function() {
>-                var iframe = document.getElementById('iframe');
>-                iframe.remove();
>-
>-                if (window.internals)
>-                    document.getElementById('tree').innerText = internals.scrollingStateTreeAsText();
>-
>-                if (window.testRunner)
>-                    testRunner.notifyDone();
>-
>-            }, 0);
>-        }
>-        
>-        window.addEventListener('load', startTest, false);
>-    </script>
>-</head>
>-<body>
>-    
>-    <div id="container" class="fixed">
>-        <iframe id="iframe" src="resources/doc-with-sticky.html" scrolling="no" width="500" height="300"></iframe>
>-    </div>
>-<pre id="tree">Scrolling tree goes here</pre>
>-</body>
>-</html>
>diff --git a/LayoutTests/tiled-drawing/scrolling/frames/resources/doc-with-sticky.html b/LayoutTests/tiled-drawing/scrolling/frames/resources/doc-with-sticky.html
>deleted file mode 100644
>index 7bbd2bb4335fc124375f9b2b56e467151181e63d..0000000000000000000000000000000000000000
>--- a/LayoutTests/tiled-drawing/scrolling/frames/resources/doc-with-sticky.html
>+++ /dev/null
>@@ -1,47 +0,0 @@
>-<!DOCTYPE html>
>-
>-<html>
>-<head>
>-    <style>
>-        .box {
>-            height: 100px;
>-            width: 100px;
>-            background-color: blue;
>-        }
>-        
>-        .scrolling {
>-            height: 300px;
>-            width: 400px;
>-            overflow: scroll;
>-            -webkit-overflow-scrolling: touch;
>-            border: 2px solid black;
>-        }
>-        
>-        .spacer {
>-            height: 400px;
>-            margin: 10px;
>-            background-color: silver;
>-        }
>-        .sticky {
>-            position: -webkit-sticky;
>-            top: 10px;
>-            bottom: 10px;
>-        }
>-        
>-        .composited {
>-            -webkit-transform: translateZ(0);
>-        }
>-    </style>
>-</head>
>-<body>
>-    <div class="composited scrolling">
>-        <div class="spacer"></div>
>-        <div class="spacer"></div>
>-        <div class="sticky box"></div>
>-        <div class="spacer"></div>
>-        <div class="spacer"></div>
>-    </div>
>-    <div class="sticky box"></div>
>-
>-</body>
>-</html>

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193845: 360159