WebKit Bugzilla
Attachment 360244 Details for
Bug 193871
: Move scrolling-tree/fixed-inside-frame.html into scrolling tree tests
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-193871-20190126115454.patch (text/plain), 17.12 KB, created by
Simon Fraser (smfr)
on 2019-01-26 11:54:55 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Simon Fraser (smfr)
Created:
2019-01-26 11:54:55 PST
Size:
17.12 KB
patch
obsolete
>Subversion Revision: 240547 >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 9a9be587961add0807da8ef55d1fe2f958b9b9d8..f663bac4b74cbaf4375006355452d852f6db062e 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -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 NOBODY (OOPS!). >+ >+ 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 >index 0000000000000000000000000000000000000000..bd1e25080e1060b8663aeba19123e32240d1b127 >--- /dev/null >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >@@ -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) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >new file mode 100644 >index 0000000000000000000000000000000000000000..74da075953c82f3fefa47d71fabd592eb072adf3 >--- /dev/null >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >@@ -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) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+ ) >+) >+ >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame.html b/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame.html >new file mode 100644 >index 0000000000000000000000000000000000000000..31a1a3719dcfc5fcb3fc0be7686e2a695c580857 >--- /dev/null >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame.html >@@ -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="resources/autoscrolling-frame-with-fixed.html" height="300" scrolling="yes"></iframe> >+<pre id="result">Results</pre> >+</body> >+</html> >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/resources/autoscrolling-frame-with-fixed.html b/LayoutTests/scrollingcoordinator/scrolling-tree/resources/autoscrolling-frame-with-fixed.html >new file mode 100644 >index 0000000000000000000000000000000000000000..bf4f2e167ae532fd09bdcc8f0e94233122c1b26e >--- /dev/null >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/resources/autoscrolling-frame-with-fixed.html >@@ -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> >diff --git a/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt b/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt >deleted file mode 100644 >index 74da075953c82f3fefa47d71fabd592eb072adf3..0000000000000000000000000000000000000000 >--- a/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt >+++ /dev/null >@@ -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) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >- ) >-) >- >diff --git a/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html b/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html >deleted file mode 100644 >index 31a1a3719dcfc5fcb3fc0be7686e2a695c580857..0000000000000000000000000000000000000000 >--- a/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame.html >+++ /dev/null >@@ -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="resources/autoscrolling-frame-with-fixed.html" height="300" scrolling="yes"></iframe> >-<pre id="result">Results</pre> >-</body> >-</html> >diff --git a/LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html b/LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html >deleted file mode 100644 >index bf4f2e167ae532fd09bdcc8f0e94233122c1b26e..0000000000000000000000000000000000000000 >--- a/LayoutTests/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html >+++ /dev/null >@@ -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>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
zalan
:
review+
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193871
: 360244