diff options
Diffstat (limited to 'webkit')
7 files changed, 251 insertions, 21 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.checksum index 25bae9d..321f916 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.checksum @@ -1 +1 @@ -bbf51ed65bd909b6c12dffc59a4829f7
\ No newline at end of file +fd81c5bb0a5048224a9fc78a82580618
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.png Binary files differindex 7bbf3de..703f5d4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.txt index ca88db8..ea502fb 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.txt @@ -1,13 +1,132 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x79 - RenderBlock {HTML} at (0,0) size 800x79 - RenderBody {BODY} at (8,21) size 784x37 - RenderBlock {H1} at (0,0) size 784x37 - RenderText {#text} at (0,0) size 371x36 - text run at (0,0) width 371: "500 - Internal Server Error" +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderFrameSet {FRAMESET} at (0,0) size 800x600 + RenderFrame {FRAME} at (0,0) size 800x534 + layer at (0,0) size 785x1555 + RenderView at (0,0) size 785x534 + layer at (0,0) size 785x1555 + RenderBlock {HTML} at (0,0) size 785x1555 + RenderBody {BODY} at (8,8) size 769x1515 + RenderBlock (anonymous) at (0,0) size 769x222 + RenderText {#text} at (0,0) size 769x147 + text run at (0,0) width 760: "This is test page that we navigate to as part of testing various" + text run at (0,37) width 224: "navigation styles. " + text run at (224,37) width 545: "It includes a form so that we can test saving" + text run at (0,74) width 724: "and restoring of form data, and it needs to be long enough" + text run at (0,111) width 690: "that we can test saving and restoring of scroll position. " + RenderBR {BR} at (690,139) size 0x0 + RenderBR {BR} at (0,148) size 0x36 + RenderBR {BR} at (0,185) size 0x36 + RenderBlock {HR} at (0,238) size 769x2 [border: (1px inset #000000)] + RenderBlock {FORM} at (0,256) size 769x466 + RenderButton {INPUT} at (2,2) size 129x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] + RenderBlock (anonymous) at (8,2) size 113x18 + RenderText at (3,1) size 107x16 + text run at (3,1) width 107: "Submit with POST" + RenderBR {BR} at (133,18) size 0x0 + RenderButton {INPUT} at (2,28) size 255x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] + RenderBlock (anonymous) at (8,2) size 239x18 + RenderText at (3,1) size 233x16 + text run at (3,1) width 233: "Submit with POST followed by a redirect" + RenderBR {BR} at (259,44) size 0x0 + RenderText {#text} at (0,52) size 366x36 + text run at (0,52) width 366: "Here are some form elements" + RenderTextControl {INPUT} at (368,64) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderBR {BR} at (525,80) size 0x0 + RenderText {#text} at (0,89) size 326x36 + text run at (0,89) width 326: "that we can use for testing" + RenderTextControl {INPUT} at (328,101) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderBR {BR} at (485,117) size 0x0 + RenderBlock {INPUT} at (5,141) size 13x13 + RenderText {#text} at (21,126) size 73x36 + text run at (21,126) width 73: " Male" + RenderBR {BR} at (94,154) size 0x0 + RenderBlock {INPUT} at (5,178) size 13x13 + RenderText {#text} at (21,163) size 100x36 + text run at (21,163) width 100: " Female" + RenderBR {BR} at (121,191) size 0x0 + RenderBlock {INPUT} at (4,215) size 13x13 + RenderText {#text} at (20,200) size 129x36 + text run at (20,200) width 129: " option #1" + RenderBR {BR} at (149,228) size 0x0 + RenderBlock {INPUT} at (4,252) size 13x13 + RenderText {#text} at (20,237) size 129x36 + text run at (20,237) width 129: " option #2" + RenderBR {BR} at (149,265) size 0x0 + RenderMenuList {SELECT} at (2,276) size 271x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)] + RenderBlock (anonymous) at (1,1) size 269x18 + RenderText at (4,1) size 67x16 + text run at (4,1) width 67: "Initial Value" + RenderBR {BR} at (275,291) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderBlock {HR} at (0,754) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,788) size 769x37 + RenderText {#text} at (0,0) size 62x36 + text run at (0,0) width 62: "Now" + RenderBlock {P} at (0,857) size 769x37 + RenderText {#text} at (0,0) size 64x36 + text run at (0,0) width 64: "some" + RenderBlock {P} at (0,926) size 769x37 + RenderText {#text} at (0,0) size 62x36 + text run at (0,0) width 62: "filler" + RenderBlock {P} at (0,995) size 769x37 + RenderText {#text} at (0,0) size 27x36 + text run at (0,0) width 27: "so" + RenderBlock {P} at (0,1064) size 769x37 + RenderText {#text} at (0,0) size 38x36 + text run at (0,0) width 38: "the" + RenderBlock {P} at (0,1133) size 769x37 + RenderText {#text} at (0,0) size 46x36 + text run at (0,0) width 46: "doc" + RenderBlock {P} at (0,1202) size 769x37 + RenderText {#text} at (0,0) size 20x36 + text run at (0,0) width 20: "is" + RenderBlock {P} at (0,1271) size 769x37 + RenderText {#text} at (0,0) size 55x36 + text run at (0,0) width 55: "long" + RenderBlock {P} at (0,1340) size 769x37 + RenderText {#text} at (0,0) size 90x36 + text run at (0,0) width 90: "enough" + RenderBlock {P} at (0,1409) size 769x37 + RenderText {#text} at (0,0) size 111x36 + text run at (0,0) width 111: "to scroll." + RenderBlock {P} at (0,1478) size 769x37 + RenderInline {A} at (0,0) size 518x36 + RenderText {#text} at (0,0) size 518x36 + text run at (0,0) width 518: "This is an anchor point named \"anchor1\"." + layer at (378,331) size 151x16 scrollWidth 158 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 156x16 + text run at (1,0) width 156: "Initial text before user input" + layer at (338,368) size 151x16 + RenderBlock {DIV} at (2,3) size 151x16 + layer at (10,564) size 259x164 clip at (11,565) size 257x162 + RenderTextControl {TEXTAREA} at (2,300) size 259x164 [bgcolor=#FFFFFF] [border: (1px solid #000000)] + RenderBlock {DIV} at (3,3) size 255x48 + RenderText {#text} at (0,0) size 240x32 + text run at (0,0) width 232: "More initial text before user" + text run at (232,0) width 8: " " + text run at (0,16) width 48: "input." + text run at (48,16) width 0: " " + RenderBR {BR} at (0,32) size 0x16 + RenderFrame {FRAME} at (0,540) size 800x60 + layer at (0,0) size 785x90 + RenderView at (0,0) size 785x60 + layer at (0,0) size 785x90 + RenderBlock {HTML} at (0,0) size 785x90 + RenderBody {BODY} at (8,8) size 769x74 + RenderText {#text} at (0,0) size 704x73 + text run at (0,0) width 704: "This is just a minimal page that we navigate to as part of" + text run at (0,37) width 268: "testing back/forward." + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 +frame 'main' scrolled to 0,1021 ============== Back Forward List ============== http://127.0.0.1:8000/navigation/anchor-frames.html **nav target** curr-> http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=success200.html%23anchor1 **nav target** + http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer") + http://127.0.0.1:8000/navigation/resources/success200.html#anchor1 (in frame "main") =============================================== diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.checksum index 25bae9d..fcb53ed 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.checksum @@ -1 +1 @@ -bbf51ed65bd909b6c12dffc59a4829f7
\ No newline at end of file +b0414d95f484d5e5127c3e27476639dc
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.png Binary files differindex 7bbf3de..8734d97 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.txt index 8ed1f21..5c0121b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/javascriptlink-frames-expected.txt @@ -1,13 +1,131 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x79 - RenderBlock {HTML} at (0,0) size 800x79 - RenderBody {BODY} at (8,21) size 784x37 - RenderBlock {H1} at (0,0) size 784x37 - RenderText {#text} at (0,0) size 371x36 - text run at (0,0) width 371: "500 - Internal Server Error" +layer at (0,0) size 800x600 + RenderBlock {HTML} at (0,0) size 800x600 + RenderFrameSet {FRAMESET} at (0,0) size 800x600 + RenderFrame {FRAME} at (0,0) size 800x534 + layer at (0,0) size 785x1555 + RenderView at (0,0) size 785x534 + layer at (0,0) size 785x1555 + RenderBlock {HTML} at (0,0) size 785x1555 + RenderBody {BODY} at (8,8) size 769x1515 + RenderBlock (anonymous) at (0,0) size 769x222 + RenderText {#text} at (0,0) size 769x147 + text run at (0,0) width 760: "This is test page that we navigate to as part of testing various" + text run at (0,37) width 224: "navigation styles. " + text run at (224,37) width 545: "It includes a form so that we can test saving" + text run at (0,74) width 724: "and restoring of form data, and it needs to be long enough" + text run at (0,111) width 690: "that we can test saving and restoring of scroll position. " + RenderBR {BR} at (690,139) size 0x0 + RenderBR {BR} at (0,148) size 0x36 + RenderBR {BR} at (0,185) size 0x36 + RenderBlock {HR} at (0,238) size 769x2 [border: (1px inset #000000)] + RenderBlock {FORM} at (0,256) size 769x466 + RenderButton {INPUT} at (2,2) size 129x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] + RenderBlock (anonymous) at (8,2) size 113x18 + RenderText at (3,1) size 107x16 + text run at (3,1) width 107: "Submit with POST" + RenderBR {BR} at (133,18) size 0x0 + RenderButton {INPUT} at (2,28) size 255x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)] + RenderBlock (anonymous) at (8,2) size 239x18 + RenderText at (3,1) size 233x16 + text run at (3,1) width 233: "Submit with POST followed by a redirect" + RenderBR {BR} at (259,44) size 0x0 + RenderText {#text} at (0,52) size 366x36 + text run at (0,52) width 366: "Here are some form elements" + RenderTextControl {INPUT} at (368,64) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderBR {BR} at (525,80) size 0x0 + RenderText {#text} at (0,89) size 326x36 + text run at (0,89) width 326: "that we can use for testing" + RenderTextControl {INPUT} at (328,101) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderBR {BR} at (485,117) size 0x0 + RenderBlock {INPUT} at (5,141) size 13x13 + RenderText {#text} at (21,126) size 73x36 + text run at (21,126) width 73: " Male" + RenderBR {BR} at (94,154) size 0x0 + RenderBlock {INPUT} at (5,178) size 13x13 + RenderText {#text} at (21,163) size 100x36 + text run at (21,163) width 100: " Female" + RenderBR {BR} at (121,191) size 0x0 + RenderBlock {INPUT} at (4,215) size 13x13 + RenderText {#text} at (20,200) size 129x36 + text run at (20,200) width 129: " option #1" + RenderBR {BR} at (149,228) size 0x0 + RenderBlock {INPUT} at (4,252) size 13x13 + RenderText {#text} at (20,237) size 129x36 + text run at (20,237) width 129: " option #2" + RenderBR {BR} at (149,265) size 0x0 + RenderMenuList {SELECT} at (2,276) size 271x20 [bgcolor=#FFFFFF] [border: (1px solid #000000)] + RenderBlock (anonymous) at (1,1) size 269x18 + RenderText at (4,1) size 67x16 + text run at (4,1) width 67: "Initial Value" + RenderBR {BR} at (275,291) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderBlock {HR} at (0,754) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,788) size 769x37 + RenderText {#text} at (0,0) size 62x36 + text run at (0,0) width 62: "Now" + RenderBlock {P} at (0,857) size 769x37 + RenderText {#text} at (0,0) size 64x36 + text run at (0,0) width 64: "some" + RenderBlock {P} at (0,926) size 769x37 + RenderText {#text} at (0,0) size 62x36 + text run at (0,0) width 62: "filler" + RenderBlock {P} at (0,995) size 769x37 + RenderText {#text} at (0,0) size 27x36 + text run at (0,0) width 27: "so" + RenderBlock {P} at (0,1064) size 769x37 + RenderText {#text} at (0,0) size 38x36 + text run at (0,0) width 38: "the" + RenderBlock {P} at (0,1133) size 769x37 + RenderText {#text} at (0,0) size 46x36 + text run at (0,0) width 46: "doc" + RenderBlock {P} at (0,1202) size 769x37 + RenderText {#text} at (0,0) size 20x36 + text run at (0,0) width 20: "is" + RenderBlock {P} at (0,1271) size 769x37 + RenderText {#text} at (0,0) size 55x36 + text run at (0,0) width 55: "long" + RenderBlock {P} at (0,1340) size 769x37 + RenderText {#text} at (0,0) size 90x36 + text run at (0,0) width 90: "enough" + RenderBlock {P} at (0,1409) size 769x37 + RenderText {#text} at (0,0) size 111x36 + text run at (0,0) width 111: "to scroll." + RenderBlock {P} at (0,1478) size 769x37 + RenderInline {A} at (0,0) size 518x36 + RenderText {#text} at (0,0) size 518x36 + text run at (0,0) width 518: "This is an anchor point named \"anchor1\"." + layer at (378,331) size 151x16 scrollWidth 158 + RenderBlock {DIV} at (2,3) size 151x16 + RenderText {#text} at (1,0) size 156x16 + text run at (1,0) width 156: "Initial text before user input" + layer at (338,368) size 151x16 + RenderBlock {DIV} at (2,3) size 151x16 + layer at (10,564) size 259x164 clip at (11,565) size 257x162 + RenderTextControl {TEXTAREA} at (2,300) size 259x164 [bgcolor=#FFFFFF] [border: (1px solid #000000)] + RenderBlock {DIV} at (3,3) size 255x48 + RenderText {#text} at (0,0) size 240x32 + text run at (0,0) width 232: "More initial text before user" + text run at (232,0) width 8: " " + text run at (0,16) width 48: "input." + text run at (48,16) width 0: " " + RenderBR {BR} at (0,32) size 0x16 + RenderFrame {FRAME} at (0,540) size 800x60 + layer at (0,0) size 785x90 + RenderView at (0,0) size 785x60 + layer at (0,0) size 785x90 + RenderBlock {HTML} at (0,0) size 785x90 + RenderBody {BODY} at (8,8) size 769x74 + RenderText {#text} at (0,0) size 704x73 + text run at (0,0) width 704: "This is just a minimal page that we navigate to as part of" + text run at (0,37) width 268: "testing back/forward." + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 ============== Back Forward List ============== http://127.0.0.1:8000/navigation/javascriptlink-frames.html **nav target** curr-> http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=javascriptlink.html **nav target** + http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer") + http://127.0.0.1:8000/navigation/resources/success200.html (in frame "main") =============================================== diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 083e634..fed70e9 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1916,13 +1916,6 @@ BUG_DARIN LINUX : LayoutTests/svg/transforms/text-with-pattern-with-svg-transfor // Regressions from WebKit merge 43242:43321. BUG_DARIN LINUX DEBUG : LayoutTests/transitions/mask-transitions.html = FAIL PASS -// Need rebaselines from http://trac.webkit.org/changeset/43355 - -// Caused by WebKit merge 43346:43361. These likely just need re-baselining. -// Most likely caused by http://trac.webkit.org/changeset/43355 -BUG11613 WIN : LayoutTests/http/tests/navigation/anchor-frames.html = FAIL -BUG11613 WIN : LayoutTests/http/tests/navigation/javascriptlink-frames.html = FAIL - // TODO(erg): Attempted to rebaseline these tests as part of the above // 43346:43361 rebaseling from http://trac.webkit.org/changeset/43355. Turned // tree red. May be more involved then just rebaselining. |
