Skip to content
Permalink
Browse files
Rewrite frameset-flattening-simple to make expectation clearer
https://bugs.webkit.org/show_bug.cgi?id=183129

The description of fast/frames/flattening/frameset-flattening-simple.html says that the
iframe should be 800px wide and should not have any scrollbars. However, it is a bit
difficult to know the size when checking the test visually. Moreover, the scrollbars of the
main frame are visible, which makes things a bit confusing and may be the cause of bug 71655
on GTK.

Patch by Frederic Wang <fwang@igalia.com> on 2018-03-13
Reviewed by Javier Fernandez.

* fast/frames/flattening/frameset-flattening-simple.html: Put the frame inside a 200x300
frameset cell and set its width to 300px. The frame should be a 300x300 square when it is
flattened (test passes) and a 200x300 rectangle when it is not (test fails). That's easier
to verify visually. That also avoids scrollbars on the main frame.
* platform/gtk/TestExpectations: Attempt to remove flacky expectation.
* platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.png: Update.
* platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.
* platform/ios/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.
* platform/mac-wk2/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.
* platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.png: Ditto.
* platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.
* platform/win/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.

Canonical link: https://commits.webkit.org/199262@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229576 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
fred-wang committed Mar 13, 2018
1 parent d73ae62 commit a697a6b3b23d0ccff245142821ac35bf3fc3fa38
@@ -1,3 +1,29 @@
2018-03-13 Frederic Wang <fwang@igalia.com>

Rewrite frameset-flattening-simple to make expectation clearer
https://bugs.webkit.org/show_bug.cgi?id=183129

The description of fast/frames/flattening/frameset-flattening-simple.html says that the
iframe should be 800px wide and should not have any scrollbars. However, it is a bit
difficult to know the size when checking the test visually. Moreover, the scrollbars of the
main frame are visible, which makes things a bit confusing and may be the cause of bug 71655
on GTK.

Reviewed by Javier Fernandez.

* fast/frames/flattening/frameset-flattening-simple.html: Put the frame inside a 200x300
frameset cell and set its width to 300px. The frame should be a 300x300 square when it is
flattened (test passes) and a 200x300 rectangle when it is not (test fails). That's easier
to verify visually. That also avoids scrollbars on the main frame.
* platform/gtk/TestExpectations: Attempt to remove flacky expectation.
* platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.png: Update.
* platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.
* platform/ios/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.
* platform/mac-wk2/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.
* platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.png: Ditto.
* platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.
* platform/win/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto.

2018-03-12 Chris Dumez <cdumez@apple.com>

Load may get committed before receiving policy for the resource response
@@ -15,16 +15,16 @@
}
</script>
</head>
<frameset border=0 cols="*,200">
<frameset border=0 rows="300,*" cols="200,*">
<frame onload="test()" src="data:text/html,
<style>body { background-color: green; }</style>
<p>
Test for frameset flattening. The flattening only works inside the DRT.
</p>
<p>
This frame should be 800px wide and not be scrollable (have scrollbars).
This frame should be a square of side 300px and not be scrollable (have scrollbars).
</p>
<div style='position: absolute; width: 800px; height: 1px; left: 0; top: 100px;'></div>
<div style='position: absolute; width: 300px; height: 1px; left: 0; top: 100px;'></div>
">
<frame>
</frameset>
@@ -1335,7 +1335,6 @@ webkit.org/b/119735 [ Debug ] plugins/unavailable-plugin-indicator-obscurity.htm

webkit.org/b/71777 fast/lists/inlineBoxWrapperNullCheck.html [ Failure Pass ]

webkit.org/b/71655 fast/frames/flattening/frameset-flattening-simple.html [ Failure Pass ]
webkit.org/b/80129 fast/frames/flattening/iframe-flattening-fixed-width.html [ Failure Pass ]
webkit.org/b/80129 fast/frames/flattening/iframe-flattening-offscreen.html [ Failure Pass ]
webkit.org/b/80129 fast/frames/flattening/frameset-flattening-grid.html [ Failure Pass ]
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,25 +1,27 @@
layer at (0,0) size 1000x600
layer at (0,0) size 900x585
RenderView at (0,0) size 800x585
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderFrameSet {FRAMESET} at (0,0) size 1000x600
RenderFrame {FRAME} at (0,0) size 800x600
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 445x19
text run at (0,0) width 445: "Test for frameset flattening. The flattening only works inside the DRT."
RenderBlock {P} at (0,34) size 784x18
RenderText {#text} at (0,0) size 458x19
text run at (0,0) width 458: "This frame should be 800px wide and not be scrollable (have scrollbars)."
layer at (0,100) size 800x1
RenderBlock (positioned) {DIV} at (0,100) size 800x1
RenderFrame {FRAME} at (800,0) size 200x600
layer at (0,0) size 200x600
RenderView at (0,0) size 200x600
layer at (0,0) size 200x600
RenderBlock {HTML} at (0,0) size 200x600
RenderBody {BODY} at (8,8) size 184x584
layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderFrameSet {FRAMESET} at (0,0) size 900x300
RenderFrame {FRAME} at (0,0) size 300x300
layer at (0,0) size 300x300
RenderView at (0,0) size 300x300
layer at (0,0) size 300x300
RenderBlock {HTML} at (0,0) size 300x300
RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 284x36
RenderText {#text} at (0,0) size 265x35
text run at (0,0) width 265: "Test for frameset flattening. The flattening"
text run at (0,18) width 176: "only works inside the DRT."
RenderBlock {P} at (0,52) size 284x36
RenderText {#text} at (0,0) size 279x35
text run at (0,0) width 279: "This frame should be a square of side 300px"
text run at (0,18) width 242: "and not be scrollable (have scrollbars)."
layer at (0,100) size 300x1
RenderBlock (positioned) {DIV} at (0,100) size 300x1
RenderFrame {FRAME} at (300,0) size 600x300
layer at (0,0) size 600x300
RenderView at (0,0) size 600x300
layer at (0,0) size 600x300
RenderBlock {HTML} at (0,0) size 600x300
RenderBody {BODY} at (8,8) size 584x284
@@ -1,25 +1,27 @@
layer at (0,0) size 1000x600
layer at (0,0) size 900x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderFrameSet {FRAMESET} at (0,0) size 1000x600
RenderFrame {FRAME} at (0,0) size 800x600
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 451x19
text run at (0,0) width 451: "Test for frameset flattening. The flattening only works inside the DRT."
RenderBlock {P} at (0,36) size 784x20
RenderText {#text} at (0,0) size 467x19
text run at (0,0) width 467: "This frame should be 800px wide and not be scrollable (have scrollbars)."
layer at (0,100) size 800x1
RenderBlock (positioned) {DIV} at (0,100) size 800x1
RenderFrame {FRAME} at (800,0) size 200x600
layer at (0,0) size 200x600
RenderView at (0,0) size 200x600
layer at (0,0) size 200x600
RenderBlock {HTML} at (0,0) size 200x600
RenderBody {BODY} at (8,8) size 184x584
RenderFrameSet {FRAMESET} at (0,0) size 900x300
RenderFrame {FRAME} at (0,0) size 300x300
layer at (0,0) size 300x300
RenderView at (0,0) size 300x300
layer at (0,0) size 300x300
RenderBlock {HTML} at (0,0) size 300x300
RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 284x40
RenderText {#text} at (0,0) size 272x39
text run at (0,0) width 272: "Test for frameset flattening. The flattening"
text run at (0,20) width 176: "only works inside the DRT."
RenderBlock {P} at (0,56) size 284x40
RenderText {#text} at (0,0) size 284x39
text run at (0,0) width 284: "This frame should be a square of side 300px"
text run at (0,20) width 248: "and not be scrollable (have scrollbars)."
layer at (0,100) size 300x1
RenderBlock (positioned) {DIV} at (0,100) size 300x1
RenderFrame {FRAME} at (300,0) size 600x300
layer at (0,0) size 600x300
RenderView at (0,0) size 600x300
layer at (0,0) size 600x300
RenderBlock {HTML} at (0,0) size 600x300
RenderBody {BODY} at (8,8) size 584x284
@@ -1,25 +1,27 @@
layer at (0,0) size 1000x600
layer at (0,0) size 900x585
RenderView at (0,0) size 800x585
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderFrameSet {FRAMESET} at (0,0) size 1000x600
RenderFrame {FRAME} at (0,0) size 800x600
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 450x18
text run at (0,0) width 450: "Test for frameset flattening. The flattening only works inside the DRT."
RenderBlock {P} at (0,34) size 784x18
RenderText {#text} at (0,0) size 467x18
text run at (0,0) width 467: "This frame should be 800px wide and not be scrollable (have scrollbars)."
layer at (0,100) size 800x1
RenderBlock (positioned) {DIV} at (0,100) size 800x1
RenderFrame {FRAME} at (800,0) size 200x600
layer at (0,0) size 200x600
RenderView at (0,0) size 200x600
layer at (0,0) size 200x600
RenderBlock {HTML} at (0,0) size 200x600
RenderBody {BODY} at (8,8) size 184x584
layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderFrameSet {FRAMESET} at (0,0) size 900x300
RenderFrame {FRAME} at (0,0) size 300x300
layer at (0,0) size 300x300
RenderView at (0,0) size 300x300
layer at (0,0) size 300x300
RenderBlock {HTML} at (0,0) size 300x300
RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 284x36
RenderText {#text} at (0,0) size 270x36
text run at (0,0) width 270: "Test for frameset flattening. The flattening"
text run at (0,18) width 176: "only works inside the DRT."
RenderBlock {P} at (0,52) size 284x36
RenderText {#text} at (0,0) size 284x36
text run at (0,0) width 284: "This frame should be a square of side 300px"
text run at (0,18) width 248: "and not be scrollable (have scrollbars)."
layer at (0,100) size 300x1
RenderBlock (positioned) {DIV} at (0,100) size 300x1
RenderFrame {FRAME} at (300,0) size 600x300
layer at (0,0) size 600x300
RenderView at (0,0) size 600x300
layer at (0,0) size 600x300
RenderBlock {HTML} at (0,0) size 600x300
RenderBody {BODY} at (8,8) size 584x284
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,25 +1,27 @@
layer at (0,0) size 1000x585
RenderView at (0,0) size 785x585
layer at (0,0) size 785x585
RenderBlock {HTML} at (0,0) size 785x585
RenderFrameSet {FRAMESET} at (0,0) size 1000x585
RenderFrame {FRAME} at (0,0) size 800x585
layer at (0,0) size 800x585
RenderView at (0,0) size 800x585
layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderBody {BODY} at (8,8) size 784x561 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 450x18
text run at (0,0) width 450: "Test for frameset flattening. The flattening only works inside the DRT."
RenderBlock {P} at (0,34) size 784x18
RenderText {#text} at (0,0) size 467x18
text run at (0,0) width 467: "This frame should be 800px wide and not be scrollable (have scrollbars)."
layer at (0,100) size 800x1
RenderBlock (positioned) {DIV} at (0,100) size 800x1
RenderFrame {FRAME} at (800,0) size 200x585
layer at (0,0) size 200x585
RenderView at (0,0) size 200x585
layer at (0,0) size 200x585
RenderBlock {HTML} at (0,0) size 200x585
RenderBody {BODY} at (8,8) size 184x569
layer at (0,0) size 900x585
RenderView at (0,0) size 800x585
layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderFrameSet {FRAMESET} at (0,0) size 900x300
RenderFrame {FRAME} at (0,0) size 300x300
layer at (0,0) size 300x300
RenderView at (0,0) size 300x300
layer at (0,0) size 300x300
RenderBlock {HTML} at (0,0) size 300x300
RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 284x36
RenderText {#text} at (0,0) size 270x36
text run at (0,0) width 270: "Test for frameset flattening. The flattening"
text run at (0,18) width 176: "only works inside the DRT."
RenderBlock {P} at (0,52) size 284x36
RenderText {#text} at (0,0) size 284x36
text run at (0,0) width 284: "This frame should be a square of side 300px"
text run at (0,18) width 248: "and not be scrollable (have scrollbars)."
layer at (0,100) size 300x1
RenderBlock (positioned) {DIV} at (0,100) size 300x1
RenderFrame {FRAME} at (300,0) size 600x300
layer at (0,0) size 600x300
RenderView at (0,0) size 600x300
layer at (0,0) size 600x300
RenderBlock {HTML} at (0,0) size 600x300
RenderBody {BODY} at (8,8) size 584x284
@@ -1,25 +1,27 @@
layer at (0,0) size 1000x600
layer at (0,0) size 900x585
RenderView at (0,0) size 800x585
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderFrameSet {FRAMESET} at (0,0) size 1000x600
RenderFrame {FRAME} at (0,0) size 800x600
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 445x18
text run at (0,0) width 445: "Test for frameset flattening. The flattening only works inside the DRT."
RenderBlock {P} at (0,34) size 784x18
RenderText {#text} at (0,0) size 458x18
text run at (0,0) width 458: "This frame should be 800px wide and not be scrollable (have scrollbars)."
layer at (0,100) size 800x1
RenderBlock (positioned) {DIV} at (0,100) size 800x1
RenderFrame {FRAME} at (800,0) size 200x600
layer at (0,0) size 200x600
RenderView at (0,0) size 200x600
layer at (0,0) size 200x600
RenderBlock {HTML} at (0,0) size 200x600
RenderBody {BODY} at (8,8) size 184x584
layer at (0,0) size 800x585
RenderBlock {HTML} at (0,0) size 800x585
RenderFrameSet {FRAMESET} at (0,0) size 900x300
RenderFrame {FRAME} at (0,0) size 300x300
layer at (0,0) size 300x300
RenderView at (0,0) size 300x300
layer at (0,0) size 300x300
RenderBlock {HTML} at (0,0) size 300x300
RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000]
RenderBlock {P} at (0,0) size 284x36
RenderText {#text} at (0,0) size 265x36
text run at (0,0) width 265: "Test for frameset flattening. The flattening"
text run at (0,18) width 176: "only works inside the DRT."
RenderBlock {P} at (0,52) size 284x36
RenderText {#text} at (0,0) size 279x36
text run at (0,0) width 279: "This frame should be a square of side 300px"
text run at (0,18) width 242: "and not be scrollable (have scrollbars)."
layer at (0,100) size 300x1
RenderBlock (positioned) {DIV} at (0,100) size 300x1
RenderFrame {FRAME} at (300,0) size 600x300
layer at (0,0) size 600x300
RenderView at (0,0) size 600x300
layer at (0,0) size 600x300
RenderBlock {HTML} at (0,0) size 600x300
RenderBody {BODY} at (8,8) size 584x284

0 comments on commit a697a6b

Please sign in to comment.