Diff
Modified: trunk/LayoutTests/ChangeLog (240547 => 240548)
--- trunk/LayoutTests/ChangeLog 2019-01-26 19:24:10 UTC (rev 240547)
+++ trunk/LayoutTests/ChangeLog 2019-01-26 20:00:20 UTC (rev 240548)
@@ -1,3 +1,18 @@
+2019-01-26 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
[LFC] The default values for top/bottom in contentHeightForFormattingContextRoot should not be 0.
Copied: trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt (from rev 240547, trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt) (0 => 240548)
--- trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt 2019-01-26 20:00:20 UTC (rev 240548)
@@ -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)
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt (from rev 240547, trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt) (0 => 240548)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt 2019-01-26 20:00:20 UTC (rev 240548)
@@ -0,0 +1,98 @@
+
+
+(Frame scrolling node
+ (scrollable area size 785 600)
+ (contents size 785 657)
+ (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,57))
+ (behavior for fixed 0)
+ (children 1
+ (Frame scrolling node
+ (scrollable area size 465 400)
+ (contents size 465 1016)
+ (requested scroll position 0 120)
+ (requested scroll position represents programmatic scroll 1)
+ (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,120) size 465x400)
+ (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 465x400)
+ (layer position at last layout (10,130))
+ )
+ )
+ )
+ )
+)
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 785.00 657.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 785.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 465.00 400.00)
+ (children 1
+ (GraphicsLayer
+ (position 0.00 -120.00)
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 465.00 1016.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 465.00 1016.00)
+ (drawsContent 1)
+ (children 1
+ (GraphicsLayer
+ (position 10.00 130.00)
+ (bounds 455.00 100.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame.html (from rev 240547, trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html) (0 => 240548)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame.html (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame.html 2019-01-26 20:00:20 UTC (rev 240548)
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ iframe {
+ height: 400px;
+ width: 480px;
+ margin: 100px;
+ box-shadow: 0 0 0 10px rgba(0, 0, 0, 0.2);
+ }
+
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ window.internals.settings.setScrollingTreeIncludesFrames(true);
+ }
+
+ function frameDidChange()
+ {
+ window.setTimeout(function() {
+ if (window.testRunner) {
+ var scrollingTree = internals.scrollingStateTreeAsText();
+ var layerTree = internals.layerTreeAsText(document);
+
+ var resultElement = document.getElementById('result');
+ resultElement.textContent = scrollingTree + layerTree;
+
+ testRunner.notifyDone();
+ }
+ }, 0);
+ }
+ </script>
+</head>
+<body>
+ <iframe src="" height="300" scrolling="yes"></iframe>
+<pre id="result">Results</pre>
+</body>
+</html>
Copied: trunk/LayoutTests/scrollingcoordinator/scrolling-tree/resources/autoscrolling-frame-with-fixed.html (from rev 240547, trunk/LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html) (0 => 240548)
--- trunk/LayoutTests/scrollingcoordinator/scrolling-tree/resources/autoscrolling-frame-with-fixed.html (rev 0)
+++ trunk/LayoutTests/scrollingcoordinator/scrolling-tree/resources/autoscrolling-frame-with-fixed.html 2019-01-26 20:00:20 UTC (rev 240548)
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ height: 1000px;
+ background-image: repeating-linear-gradient(to bottom, silver, white 100px);
+ }
+
+ .fixed {
+ position: fixed;
+ left: 10px;
+ width: 600px;
+ top: 10px;
+ height: 100px;
+ background-color: gray;
+ }
+ </style>
+ <script>
+ function doScroll()
+ {
+ window.setTimeout(function() {
+ document.scrollingElement.scrollTop = 120;
+ window.parent.frameDidChange();
+ }, 0);
+ }
+ window.addEventListener('load', doScroll, false);
+ </script>
+</head>
+<body>
+
+<div class="fixed">
+ Top bar
+</div>
+
+</body>
+</html>
Deleted: trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt (240547 => 240548)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt 2019-01-26 19:24:10 UTC (rev 240547)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt 2019-01-26 20:00:20 UTC (rev 240548)
@@ -1,98 +0,0 @@
-
-
-(Frame scrolling node
- (scrollable area size 785 600)
- (contents size 785 657)
- (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,57))
- (behavior for fixed 0)
- (children 1
- (Frame scrolling node
- (scrollable area size 465 400)
- (contents size 465 1016)
- (requested scroll position 0 120)
- (requested scroll position represents programmatic scroll 1)
- (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,120) size 465x400)
- (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 465x400)
- (layer position at last layout (10,130))
- )
- )
- )
- )
-)
-(GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 785.00 657.00)
- (children 1
- (GraphicsLayer
- (bounds 785.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 465.00 400.00)
- (children 1
- (GraphicsLayer
- (position 0.00 -120.00)
- (children 1
- (GraphicsLayer
- (anchor 0.00 0.00)
- (bounds 465.00 1016.00)
- (children 1
- (GraphicsLayer
- (bounds 465.00 1016.00)
- (drawsContent 1)
- (children 1
- (GraphicsLayer
- (position 10.00 130.00)
- (bounds 455.00 100.00)
- (contentsOpaque 1)
- (drawsContent 1)
- )
- )
- )
- )
- )
- )
- )
- )
- )
- )
- )
- )
- )
- )
- )
- )
-)
-
Deleted: trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html (240547 => 240548)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html 2019-01-26 19:24:10 UTC (rev 240547)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html 2019-01-26 20:00:20 UTC (rev 240548)
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- iframe {
- height: 400px;
- width: 480px;
- margin: 100px;
- box-shadow: 0 0 0 10px rgba(0, 0, 0, 0.2);
- }
-
- </style>
- <script>
- if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
- window.internals.settings.setScrollingTreeIncludesFrames(true);
- }
-
- function frameDidChange()
- {
- window.setTimeout(function() {
- if (window.testRunner) {
- var scrollingTree = internals.scrollingStateTreeAsText();
- var layerTree = internals.layerTreeAsText(document);
-
- var resultElement = document.getElementById('result');
- resultElement.textContent = scrollingTree + layerTree;
-
- testRunner.notifyDone();
- }
- }, 0);
- }
- </script>
-</head>
-<body>
- <iframe src="" height="300" scrolling="yes"></iframe>
-<pre id="result">Results</pre>
-</body>
-</html>
Deleted: trunk/LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html (240547 => 240548)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html 2019-01-26 19:24:10 UTC (rev 240547)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html 2019-01-26 20:00:20 UTC (rev 240548)
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- body {
- height: 1000px;
- background-image: repeating-linear-gradient(to bottom, silver, white 100px);
- }
-
- .fixed {
- position: fixed;
- left: 10px;
- width: 600px;
- top: 10px;
- height: 100px;
- background-color: gray;
- }
- </style>
- <script>
- function doScroll()
- {
- window.setTimeout(function() {
- document.scrollingElement.scrollTop = 120;
- window.parent.frameDidChange();
- }, 0);
- }
- window.addEventListener('load', doScroll, false);
- </script>
-</head>
-<body>
-
-<div class="fixed">
- Top bar
-</div>
-
-</body>
-</html>
