Move scrolling-tree/fixed-inside-frame.html into scrolling tree tests
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 26 Jan 2019 20:00:20 +0000 (20:00 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 26 Jan 2019 20:00:20 +0000 (20:00 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193871

Reviewed by Zalan Bujtas.

Move another test into scrollingcoordinator/scrolling-tree, and now that it runs on iOS,
add iOS results.

* platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt: Copied from LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt.
* scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt: Renamed from LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt.
* scrollingcoordinator/scrolling-tree/fixed-inside-frame.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html.
* scrollingcoordinator/scrolling-tree/resources/autoscrolling-frame-with-fixed.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240548 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt [new file with mode: 0644]
LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt [moved from LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt with 100% similarity]
LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame.html [moved from LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html with 100% similarity]
LayoutTests/scrollingcoordinator/scrolling-tree/resources/autoscrolling-frame-with-fixed.html [moved from LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html with 100% similarity]

index 9a9be58..235a687 100644 (file)
@@ -1,3 +1,18 @@
+2019-01-26  Simon Fraser  <simon.fraser@apple.com>
+
+        Move scrolling-tree/fixed-inside-frame.html into scrolling tree tests
+        https://bugs.webkit.org/show_bug.cgi?id=193871
+
+        Reviewed by Zalan Bujtas.
+
+        Move another test into scrollingcoordinator/scrolling-tree, and now that it runs on iOS,
+        add iOS results.
+
+        * platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt: Copied from LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt.
+        * scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt: Renamed from LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt.
+        * scrollingcoordinator/scrolling-tree/fixed-inside-frame.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html.
+        * scrollingcoordinator/scrolling-tree/resources/autoscrolling-frame-with-fixed.html: Renamed from LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html.
+
 2019-01-26  Zalan Bujtas  <zalan@apple.com>
 
         [LFC] The default values for top/bottom in contentHeightForFormattingContextRoot should not be 0.
diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt
new file mode 100644 (file)
index 0000000..bd1e250
--- /dev/null
@@ -0,0 +1,96 @@
+
+
+(Frame scrolling node
+  (scrollable area size 800 600)
+  (contents size 800 657)
+  (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,57))
+  (behavior for fixed 0)
+  (children 1
+    (Frame scrolling node
+      (scrollable area size 480 400)
+      (contents size 480 1016)
+      (requested scroll position 0 120)
+      (requested scroll position represents programmatic scroll 1)
+      (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,120) size 480x400)
+      (min layout viewport origin (0,0))
+      (max layout viewport origin (0,616))
+      (behavior for fixed 0)
+      (children 1
+        (Fixed node
+          (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
+          (viewport rect at last layout at (0,120) size 480x400)
+          (layer position at last layout (10,130))
+        )
+      )
+    )
+  )
+)
+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 800.00 657.00)
+  (children 1
+    (GraphicsLayer
+      (bounds 800.00 657.00)
+      (contentsOpaque 1)
+      (children 1
+        (GraphicsLayer
+          (offsetFromRenderer width=-10 height=-10)
+          (position 98.00 98.00)
+          (bounds 504.00 424.00)
+          (drawsContent 1)
+          (children 1
+            (GraphicsLayer
+              (position 12.00 12.00)
+              (children 1
+                (GraphicsLayer
+                  (anchor 0.00 0.00)
+                  (bounds 480.00 400.00)
+                  (children 1
+                    (GraphicsLayer
+                      (position 0.00 -120.00)
+                      (children 1
+                        (GraphicsLayer
+                          (anchor 0.00 0.00)
+                          (bounds 480.00 1016.00)
+                          (children 1
+                            (GraphicsLayer
+                              (bounds 480.00 1016.00)
+                              (drawsContent 1)
+                              (children 1
+                                (GraphicsLayer
+                                  (position 10.00 130.00)
+                                  (bounds 470.00 100.00)
+                                  (contentsOpaque 1)
+                                  (drawsContent 1)
+                                )
+                              )
+                            )
+                          )
+                        )
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    )
+  )
+)
+