Changeset 229576 in webkit
- Timestamp:
- Mar 13, 2018 6:44:28 AM (6 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 10 edited
-
ChangeLog (modified) (1 diff)
-
fast/frames/flattening/frameset-flattening-simple.html (modified) (2 diffs)
-
platform/gtk/TestExpectations (modified) (1 diff)
-
platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.png (modified) (previous)
-
platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt (modified) (1 diff)
-
platform/ios/fast/frames/flattening/frameset-flattening-simple-expected.txt (modified) (1 diff)
-
platform/mac-wk2/fast/frames/flattening/frameset-flattening-simple-expected.txt (modified) (1 diff)
-
platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.png (modified) (previous)
-
platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt (modified) (1 diff)
-
platform/win/fast/frames/flattening/frameset-flattening-simple-expected.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r229560 r229576 1 2018-03-13 Frederic Wang <fwang@igalia.com> 2 3 Rewrite frameset-flattening-simple to make expectation clearer 4 https://bugs.webkit.org/show_bug.cgi?id=183129 5 6 The description of fast/frames/flattening/frameset-flattening-simple.html says that the 7 iframe should be 800px wide and should not have any scrollbars. However, it is a bit 8 difficult to know the size when checking the test visually. Moreover, the scrollbars of the 9 main frame are visible, which makes things a bit confusing and may be the cause of bug 71655 10 on GTK. 11 12 Reviewed by Javier Fernandez. 13 14 * fast/frames/flattening/frameset-flattening-simple.html: Put the frame inside a 200x300 15 frameset cell and set its width to 300px. The frame should be a 300x300 square when it is 16 flattened (test passes) and a 200x300 rectangle when it is not (test fails). That's easier 17 to verify visually. That also avoids scrollbars on the main frame. 18 * platform/gtk/TestExpectations: Attempt to remove flacky expectation. 19 * platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.png: Update. 20 * platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto. 21 * platform/ios/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto. 22 * platform/mac-wk2/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto. 23 * platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.png: Ditto. 24 * platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto. 25 * platform/win/fast/frames/flattening/frameset-flattening-simple-expected.txt: Ditto. 26 1 27 2018-03-12 Chris Dumez <cdumez@apple.com> 2 28 -
trunk/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html
r218480 r229576 16 16 </script> 17 17 </head> 18 <frameset border=0 cols="*,200">18 <frameset border=0 rows="300,*" cols="200,*"> 19 19 <frame onload="test()" src="data:text/html, 20 20 <style>body { background-color: green; }</style> … … 23 23 </p> 24 24 <p> 25 This frame should be 800px wideand not be scrollable (have scrollbars).25 This frame should be a square of side 300px and not be scrollable (have scrollbars). 26 26 </p> 27 <div style='position: absolute; width: 800px; height: 1px; left: 0; top: 100px;'></div>27 <div style='position: absolute; width: 300px; height: 1px; left: 0; top: 100px;'></div> 28 28 "> 29 29 <frame> -
trunk/LayoutTests/platform/gtk/TestExpectations
r229463 r229576 1336 1336 webkit.org/b/71777 fast/lists/inlineBoxWrapperNullCheck.html [ Failure Pass ] 1337 1337 1338 webkit.org/b/71655 fast/frames/flattening/frameset-flattening-simple.html [ Failure Pass ]1339 1338 webkit.org/b/80129 fast/frames/flattening/iframe-flattening-fixed-width.html [ Failure Pass ] 1340 1339 webkit.org/b/80129 fast/frames/flattening/iframe-flattening-offscreen.html [ Failure Pass ] -
trunk/LayoutTests/platform/gtk/fast/frames/flattening/frameset-flattening-simple-expected.txt
r114836 r229576 1 layer at (0,0) size 1000x6001 layer at (0,0) size 900x585 2 2 RenderView at (0,0) size 800x585 3 layer at (0,0) size 800x600 4 RenderBlock {HTML} at (0,0) size 800x600 5 RenderFrameSet {FRAMESET} at (0,0) size 1000x600 6 RenderFrame {FRAME} at (0,0) size 800x600 7 layer at (0,0) size 800x600 8 RenderView at (0,0) size 800x600 9 layer at (0,0) size 800x600 10 RenderBlock {HTML} at (0,0) size 800x600 11 RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 784x18 13 RenderText {#text} at (0,0) size 445x19 14 text run at (0,0) width 445: "Test for frameset flattening. The flattening only works inside the DRT." 15 RenderBlock {P} at (0,34) size 784x18 16 RenderText {#text} at (0,0) size 458x19 17 text run at (0,0) width 458: "This frame should be 800px wide and not be scrollable (have scrollbars)." 18 layer at (0,100) size 800x1 19 RenderBlock (positioned) {DIV} at (0,100) size 800x1 20 RenderFrame {FRAME} at (800,0) size 200x600 21 layer at (0,0) size 200x600 22 RenderView at (0,0) size 200x600 23 layer at (0,0) size 200x600 24 RenderBlock {HTML} at (0,0) size 200x600 25 RenderBody {BODY} at (8,8) size 184x584 3 layer at (0,0) size 800x585 4 RenderBlock {HTML} at (0,0) size 800x585 5 RenderFrameSet {FRAMESET} at (0,0) size 900x300 6 RenderFrame {FRAME} at (0,0) size 300x300 7 layer at (0,0) size 300x300 8 RenderView at (0,0) size 300x300 9 layer at (0,0) size 300x300 10 RenderBlock {HTML} at (0,0) size 300x300 11 RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 284x36 13 RenderText {#text} at (0,0) size 265x35 14 text run at (0,0) width 265: "Test for frameset flattening. The flattening" 15 text run at (0,18) width 176: "only works inside the DRT." 16 RenderBlock {P} at (0,52) size 284x36 17 RenderText {#text} at (0,0) size 279x35 18 text run at (0,0) width 279: "This frame should be a square of side 300px" 19 text run at (0,18) width 242: "and not be scrollable (have scrollbars)." 20 layer at (0,100) size 300x1 21 RenderBlock (positioned) {DIV} at (0,100) size 300x1 22 RenderFrame {FRAME} at (300,0) size 600x300 23 layer at (0,0) size 600x300 24 RenderView at (0,0) size 600x300 25 layer at (0,0) size 600x300 26 RenderBlock {HTML} at (0,0) size 600x300 27 RenderBody {BODY} at (8,8) size 584x284 -
trunk/LayoutTests/platform/ios/fast/frames/flattening/frameset-flattening-simple-expected.txt
r179104 r229576 1 layer at (0,0) size 1000x6001 layer at (0,0) size 900x600 2 2 RenderView at (0,0) size 800x600 3 3 layer at (0,0) size 800x600 4 4 RenderBlock {HTML} at (0,0) size 800x600 5 RenderFrameSet {FRAMESET} at (0,0) size 1000x600 6 RenderFrame {FRAME} at (0,0) size 800x600 7 layer at (0,0) size 800x600 8 RenderView at (0,0) size 800x600 9 layer at (0,0) size 800x600 10 RenderBlock {HTML} at (0,0) size 800x600 11 RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 784x20 13 RenderText {#text} at (0,0) size 451x19 14 text run at (0,0) width 451: "Test for frameset flattening. The flattening only works inside the DRT." 15 RenderBlock {P} at (0,36) size 784x20 16 RenderText {#text} at (0,0) size 467x19 17 text run at (0,0) width 467: "This frame should be 800px wide and not be scrollable (have scrollbars)." 18 layer at (0,100) size 800x1 19 RenderBlock (positioned) {DIV} at (0,100) size 800x1 20 RenderFrame {FRAME} at (800,0) size 200x600 21 layer at (0,0) size 200x600 22 RenderView at (0,0) size 200x600 23 layer at (0,0) size 200x600 24 RenderBlock {HTML} at (0,0) size 200x600 25 RenderBody {BODY} at (8,8) size 184x584 5 RenderFrameSet {FRAMESET} at (0,0) size 900x300 6 RenderFrame {FRAME} at (0,0) size 300x300 7 layer at (0,0) size 300x300 8 RenderView at (0,0) size 300x300 9 layer at (0,0) size 300x300 10 RenderBlock {HTML} at (0,0) size 300x300 11 RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 284x40 13 RenderText {#text} at (0,0) size 272x39 14 text run at (0,0) width 272: "Test for frameset flattening. The flattening" 15 text run at (0,20) width 176: "only works inside the DRT." 16 RenderBlock {P} at (0,56) size 284x40 17 RenderText {#text} at (0,0) size 284x39 18 text run at (0,0) width 284: "This frame should be a square of side 300px" 19 text run at (0,20) width 248: "and not be scrollable (have scrollbars)." 20 layer at (0,100) size 300x1 21 RenderBlock (positioned) {DIV} at (0,100) size 300x1 22 RenderFrame {FRAME} at (300,0) size 600x300 23 layer at (0,0) size 600x300 24 RenderView at (0,0) size 600x300 25 layer at (0,0) size 600x300 26 RenderBlock {HTML} at (0,0) size 600x300 27 RenderBody {BODY} at (8,8) size 584x284 -
trunk/LayoutTests/platform/mac-wk2/fast/frames/flattening/frameset-flattening-simple-expected.txt
r180441 r229576 1 layer at (0,0) size 1000x6001 layer at (0,0) size 900x585 2 2 RenderView at (0,0) size 800x585 3 layer at (0,0) size 800x600 4 RenderBlock {HTML} at (0,0) size 800x600 5 RenderFrameSet {FRAMESET} at (0,0) size 1000x600 6 RenderFrame {FRAME} at (0,0) size 800x600 7 layer at (0,0) size 800x600 8 RenderView at (0,0) size 800x600 9 layer at (0,0) size 800x600 10 RenderBlock {HTML} at (0,0) size 800x600 11 RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 784x18 13 RenderText {#text} at (0,0) size 450x18 14 text run at (0,0) width 450: "Test for frameset flattening. The flattening only works inside the DRT." 15 RenderBlock {P} at (0,34) size 784x18 16 RenderText {#text} at (0,0) size 467x18 17 text run at (0,0) width 467: "This frame should be 800px wide and not be scrollable (have scrollbars)." 18 layer at (0,100) size 800x1 19 RenderBlock (positioned) {DIV} at (0,100) size 800x1 20 RenderFrame {FRAME} at (800,0) size 200x600 21 layer at (0,0) size 200x600 22 RenderView at (0,0) size 200x600 23 layer at (0,0) size 200x600 24 RenderBlock {HTML} at (0,0) size 200x600 25 RenderBody {BODY} at (8,8) size 184x584 3 layer at (0,0) size 800x585 4 RenderBlock {HTML} at (0,0) size 800x585 5 RenderFrameSet {FRAMESET} at (0,0) size 900x300 6 RenderFrame {FRAME} at (0,0) size 300x300 7 layer at (0,0) size 300x300 8 RenderView at (0,0) size 300x300 9 layer at (0,0) size 300x300 10 RenderBlock {HTML} at (0,0) size 300x300 11 RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 284x36 13 RenderText {#text} at (0,0) size 270x36 14 text run at (0,0) width 270: "Test for frameset flattening. The flattening" 15 text run at (0,18) width 176: "only works inside the DRT." 16 RenderBlock {P} at (0,52) size 284x36 17 RenderText {#text} at (0,0) size 284x36 18 text run at (0,0) width 284: "This frame should be a square of side 300px" 19 text run at (0,18) width 248: "and not be scrollable (have scrollbars)." 20 layer at (0,100) size 300x1 21 RenderBlock (positioned) {DIV} at (0,100) size 300x1 22 RenderFrame {FRAME} at (300,0) size 600x300 23 layer at (0,0) size 600x300 24 RenderView at (0,0) size 600x300 25 layer at (0,0) size 600x300 26 RenderBlock {HTML} at (0,0) size 600x300 27 RenderBody {BODY} at (8,8) size 584x284 -
trunk/LayoutTests/platform/mac/fast/frames/flattening/frameset-flattening-simple-expected.txt
r177774 r229576 1 layer at (0,0) size 1000x585 2 RenderView at (0,0) size 785x585 3 layer at (0,0) size 785x585 4 RenderBlock {HTML} at (0,0) size 785x585 5 RenderFrameSet {FRAMESET} at (0,0) size 1000x585 6 RenderFrame {FRAME} at (0,0) size 800x585 7 layer at (0,0) size 800x585 8 RenderView at (0,0) size 800x585 9 layer at (0,0) size 800x585 10 RenderBlock {HTML} at (0,0) size 800x585 11 RenderBody {BODY} at (8,8) size 784x561 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 784x18 13 RenderText {#text} at (0,0) size 450x18 14 text run at (0,0) width 450: "Test for frameset flattening. The flattening only works inside the DRT." 15 RenderBlock {P} at (0,34) size 784x18 16 RenderText {#text} at (0,0) size 467x18 17 text run at (0,0) width 467: "This frame should be 800px wide and not be scrollable (have scrollbars)." 18 layer at (0,100) size 800x1 19 RenderBlock (positioned) {DIV} at (0,100) size 800x1 20 RenderFrame {FRAME} at (800,0) size 200x585 21 layer at (0,0) size 200x585 22 RenderView at (0,0) size 200x585 23 layer at (0,0) size 200x585 24 RenderBlock {HTML} at (0,0) size 200x585 25 RenderBody {BODY} at (8,8) size 184x569 1 layer at (0,0) size 900x585 2 RenderView at (0,0) size 800x585 3 layer at (0,0) size 800x585 4 RenderBlock {HTML} at (0,0) size 800x585 5 RenderFrameSet {FRAMESET} at (0,0) size 900x300 6 RenderFrame {FRAME} at (0,0) size 300x300 7 layer at (0,0) size 300x300 8 RenderView at (0,0) size 300x300 9 layer at (0,0) size 300x300 10 RenderBlock {HTML} at (0,0) size 300x300 11 RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 284x36 13 RenderText {#text} at (0,0) size 270x36 14 text run at (0,0) width 270: "Test for frameset flattening. The flattening" 15 text run at (0,18) width 176: "only works inside the DRT." 16 RenderBlock {P} at (0,52) size 284x36 17 RenderText {#text} at (0,0) size 284x36 18 text run at (0,0) width 284: "This frame should be a square of side 300px" 19 text run at (0,18) width 248: "and not be scrollable (have scrollbars)." 20 layer at (0,100) size 300x1 21 RenderBlock (positioned) {DIV} at (0,100) size 300x1 22 RenderFrame {FRAME} at (300,0) size 600x300 23 layer at (0,0) size 600x300 24 RenderView at (0,0) size 600x300 25 layer at (0,0) size 600x300 26 RenderBlock {HTML} at (0,0) size 600x300 27 RenderBody {BODY} at (8,8) size 584x284 -
trunk/LayoutTests/platform/win/fast/frames/flattening/frameset-flattening-simple-expected.txt
r179173 r229576 1 layer at (0,0) size 1000x6001 layer at (0,0) size 900x585 2 2 RenderView at (0,0) size 800x585 3 layer at (0,0) size 800x600 4 RenderBlock {HTML} at (0,0) size 800x600 5 RenderFrameSet {FRAMESET} at (0,0) size 1000x600 6 RenderFrame {FRAME} at (0,0) size 800x600 7 layer at (0,0) size 800x600 8 RenderView at (0,0) size 800x600 9 layer at (0,0) size 800x600 10 RenderBlock {HTML} at (0,0) size 800x600 11 RenderBody {BODY} at (8,8) size 784x576 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 784x18 13 RenderText {#text} at (0,0) size 445x18 14 text run at (0,0) width 445: "Test for frameset flattening. The flattening only works inside the DRT." 15 RenderBlock {P} at (0,34) size 784x18 16 RenderText {#text} at (0,0) size 458x18 17 text run at (0,0) width 458: "This frame should be 800px wide and not be scrollable (have scrollbars)." 18 layer at (0,100) size 800x1 19 RenderBlock (positioned) {DIV} at (0,100) size 800x1 20 RenderFrame {FRAME} at (800,0) size 200x600 21 layer at (0,0) size 200x600 22 RenderView at (0,0) size 200x600 23 layer at (0,0) size 200x600 24 RenderBlock {HTML} at (0,0) size 200x600 25 RenderBody {BODY} at (8,8) size 184x584 3 layer at (0,0) size 800x585 4 RenderBlock {HTML} at (0,0) size 800x585 5 RenderFrameSet {FRAMESET} at (0,0) size 900x300 6 RenderFrame {FRAME} at (0,0) size 300x300 7 layer at (0,0) size 300x300 8 RenderView at (0,0) size 300x300 9 layer at (0,0) size 300x300 10 RenderBlock {HTML} at (0,0) size 300x300 11 RenderBody {BODY} at (8,8) size 284x276 [bgcolor=#008000] 12 RenderBlock {P} at (0,0) size 284x36 13 RenderText {#text} at (0,0) size 265x36 14 text run at (0,0) width 265: "Test for frameset flattening. The flattening" 15 text run at (0,18) width 176: "only works inside the DRT." 16 RenderBlock {P} at (0,52) size 284x36 17 RenderText {#text} at (0,0) size 279x36 18 text run at (0,0) width 279: "This frame should be a square of side 300px" 19 text run at (0,18) width 242: "and not be scrollable (have scrollbars)." 20 layer at (0,100) size 300x1 21 RenderBlock (positioned) {DIV} at (0,100) size 300x1 22 RenderFrame {FRAME} at (300,0) size 600x300 23 layer at (0,0) size 600x300 24 RenderView at (0,0) size 600x300 25 layer at (0,0) size 600x300 26 RenderBlock {HTML} at (0,0) size 600x300 27 RenderBody {BODY} at (8,8) size 584x284
Note: See TracChangeset
for help on using the changeset viewer.
