[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dglazkov at chromium.org
dglazkov at chromium.org
Wed Dec 22 13:12:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4311ddea085cd21d3b4ac8da1ac17a136d90681d
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 8 23:20:38 2010 +0000
http/tests/navigation/anchor-frames.html should not be diffing images
https://bugs.webkit.org/show_bug.cgi?id=45307
Patch by Mihai Parparita <mihaip at chromium.org> on 2010-09-08
Reviewed by Dimitri Glazkov.
anchor-frames.html is a pretty straightforward test that makes sure that we
scroll to named anchors when they're used as frame sources. There's no need
for it to be a pixel test with per-platform expectations (which are currently
missing for Chromium Mac in any case).
* http/tests/navigation/anchor-frames-expected.txt: Added.
* http/tests/navigation/anchor-frames.html:
* http/tests/navigation/resources/frame-with-anchor.html: Added.
* platform/chromium-linux/http/tests/navigation/anchor-frames-expected.checksum: Removed.
* platform/chromium-linux/http/tests/navigation/anchor-frames-expected.png: Removed.
* platform/chromium-linux/http/tests/navigation/anchor-frames-expected.txt: Removed.
* platform/chromium-win/http/tests/navigation/anchor-frames-expected.checksum: Removed.
* platform/chromium-win/http/tests/navigation/anchor-frames-expected.png: Removed.
* platform/chromium-win/http/tests/navigation/anchor-frames-expected.txt: Removed.
* platform/chromium/test_expectations.txt:
* platform/mac/http/tests/navigation/anchor-frames-expected.checksum: Removed.
* platform/mac/http/tests/navigation/anchor-frames-expected.png: Removed.
* platform/mac/http/tests/navigation/anchor-frames-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67033 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 03558cd..7427e8e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,29 @@
+2010-09-08 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ http/tests/navigation/anchor-frames.html should not be diffing images
+ https://bugs.webkit.org/show_bug.cgi?id=45307
+
+ anchor-frames.html is a pretty straightforward test that makes sure that we
+ scroll to named anchors when they're used as frame sources. There's no need
+ for it to be a pixel test with per-platform expectations (which are currently
+ missing for Chromium Mac in any case).
+
+ * http/tests/navigation/anchor-frames-expected.txt: Added.
+ * http/tests/navigation/anchor-frames.html:
+ * http/tests/navigation/resources/frame-with-anchor.html: Added.
+ * platform/chromium-linux/http/tests/navigation/anchor-frames-expected.checksum: Removed.
+ * platform/chromium-linux/http/tests/navigation/anchor-frames-expected.png: Removed.
+ * platform/chromium-linux/http/tests/navigation/anchor-frames-expected.txt: Removed.
+ * platform/chromium-win/http/tests/navigation/anchor-frames-expected.checksum: Removed.
+ * platform/chromium-win/http/tests/navigation/anchor-frames-expected.png: Removed.
+ * platform/chromium-win/http/tests/navigation/anchor-frames-expected.txt: Removed.
+ * platform/chromium/test_expectations.txt:
+ * platform/mac/http/tests/navigation/anchor-frames-expected.checksum: Removed.
+ * platform/mac/http/tests/navigation/anchor-frames-expected.png: Removed.
+ * platform/mac/http/tests/navigation/anchor-frames-expected.txt: Removed.
+
2010-09-08 Dean Jackson <dino at apple.com>
Reviewed by Simon Fraser.
diff --git a/LayoutTests/http/tests/navigation/anchor-frames-expected.txt b/LayoutTests/http/tests/navigation/anchor-frames-expected.txt
new file mode 100644
index 0000000..fa04134
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/anchor-frames-expected.txt
@@ -0,0 +1,22 @@
+
+
+--------
+Frame: 'main'
+--------
+Tests that loading a frame with a URL that contains a fragment pointed at a named anchor actually scrolls to that anchor.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.body.offsetHeight > document.documentElement.clientHeight is true
+PASS document.body.scrollTop > 0 is true
+PASS document.body.scrollTop + document.documentElement.clientHeight > 2000 is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+This is an anchor point named "anchor1.
+
+--------
+Frame: 'footer'
+--------
+
diff --git a/LayoutTests/http/tests/navigation/anchor-frames.html b/LayoutTests/http/tests/navigation/anchor-frames.html
index fdab648..3fceb98 100644
--- a/LayoutTests/http/tests/navigation/anchor-frames.html
+++ b/LayoutTests/http/tests/navigation/anchor-frames.html
@@ -1,8 +1,11 @@
-<script type="text/javascript" src="resources/testcode.js"></script>
-<!-- %23 below is a #, which is escaped so the anchor applies to the subframe instead of the frameset. -->
-<script>
- if(window.layoutTestController) layoutTestController.dumpChildFrameScrollPositions();
- runBasicTest("resources/frameset.pl?frameURL=success200.html%23anchor1", "none");
-</script>
-This page just kicks off a test, and should not appear in the expected test output.
-The files in the resources dir have comments about the tests.
+<html>
+ <!-- See resources/frame-with-anchor.html for description of test -->
+ <script>
+ if (window.layoutTestController)
+ layoutTestController.dumpChildFramesAsText();
+ </script>
+ <frameset rows="90%,10%">
+ <frame src="resources/frame-with-anchor.html#anchor1" name="main">
+ <frame src="about:blank" name="footer">
+ </frameset>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/http/tests/navigation/resources/frame-with-anchor.html b/LayoutTests/http/tests/navigation/resources/frame-with-anchor.html
new file mode 100644
index 0000000..177b100
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/resources/frame-with-anchor.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
+ <script src="../../../js-test-resources/js-test-pre.js"></script>
+ <script>
+ function runTest() {
+ description('Tests that loading a frame with a URL that contains a fragment pointed at a named anchor actually scrolls to that anchor.');
+
+ // Make sure that the body is taller than the viewport (i.e. scrolling is
+ // required).
+ shouldBeTrue('document.body.offsetHeight > document.documentElement.clientHeight');
+
+ // We should be scrolled at least a little bit
+ shouldBeTrue('document.body.scrollTop > 0');
+
+ // And the bottom of the viewable area should be at least 2000 pixels from the top, due to the spacer element above.
+ shouldBeTrue('document.body.scrollTop + document.documentElement.clientHeight > 2000');
+
+ finishJSTest();
+ }
+
+ var successfullyParsed = true;
+ var jsTestIsAsync = true;
+ </script>
+</head>
+<body onload="runTest()">
+<p id="description"></p>
+<div id="console"></div>
+
+<div style="height: 2000px">
+ <!-- Spacer to make sure that the named anchor below requires scrolling -->
+</div>
+
+<a name="anchor1">This is an anchor point named "anchor1</a>.
+<script src="../../../js-test-resources/js-test-post.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/http/tests/navigation/anchor-frames-expected.checksum b/LayoutTests/platform/chromium-linux/http/tests/navigation/anchor-frames-expected.checksum
deleted file mode 100644
index d6c5df2..0000000
--- a/LayoutTests/platform/chromium-linux/http/tests/navigation/anchor-frames-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-8bfc628d2518ad91857c9282c8b59ba1
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/http/tests/navigation/anchor-frames-expected.png b/LayoutTests/platform/chromium-linux/http/tests/navigation/anchor-frames-expected.png
deleted file mode 100644
index dcbf83f..0000000
Binary files a/LayoutTests/platform/chromium-linux/http/tests/navigation/anchor-frames-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-linux/http/tests/navigation/anchor-frames-expected.txt b/LayoutTests/platform/chromium-linux/http/tests/navigation/anchor-frames-expected.txt
deleted file mode 100644
index 19ee4c7..0000000
--- a/LayoutTests/platform/chromium-linux/http/tests/navigation/anchor-frames-expected.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-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
- RenderFrameSet {FRAMESET} at (0,0) size 800x600
- RenderFrame {FRAME} at (0,0) size 800x534
- layer at (0,0) size 785x1553
- RenderView at (0,0) size 785x534
- layer at (0,0) size 785x1553
- RenderBlock {HTML} at (0,0) size 785x1553
- RenderBody {BODY} at (8,8) size 769x1513
- 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 769x464
- RenderButton {INPUT} at (2,2) size 123x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
- RenderBlock (anonymous) at (8,3) size 107x16
- RenderText at (0,0) size 107x16
- text run at (0,0) width 107: "Submit with POST"
- RenderBR {BR} at (127,18) size 0x0
- RenderButton {INPUT} at (2,28) size 249x22 [bgcolor=#DDDDDD] [border: (2px outset #DDDDDD)]
- RenderBlock (anonymous) at (8,3) size 233x16
- RenderText at (0,0) size 233x16
- text run at (0,0) width 233: "Submit with POST followed by a redirect"
- RenderBR {BR} at (253,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 269x18 [bgcolor=#DDDDDD]
- RenderBlock (anonymous) at (0,0) size 269x18
- RenderText at (4,1) size 67x16
- text run at (4,1) width 67: "Initial Value"
- RenderBR {BR} at (273,290) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {HR} at (0,752) size 769x2 [border: (1px inset #000000)]
- RenderBlock {P} at (0,786) size 769x37
- RenderText {#text} at (0,0) size 62x36
- text run at (0,0) width 62: "Now"
- RenderBlock {P} at (0,855) size 769x37
- RenderText {#text} at (0,0) size 64x36
- text run at (0,0) width 64: "some"
- RenderBlock {P} at (0,924) size 769x37
- RenderText {#text} at (0,0) size 62x36
- text run at (0,0) width 62: "filler"
- RenderBlock {P} at (0,993) size 769x37
- RenderText {#text} at (0,0) size 27x36
- text run at (0,0) width 27: "so"
- RenderBlock {P} at (0,1062) size 769x37
- RenderText {#text} at (0,0) size 38x36
- text run at (0,0) width 38: "the"
- RenderBlock {P} at (0,1131) size 769x37
- RenderText {#text} at (0,0) size 46x36
- text run at (0,0) width 46: "doc"
- RenderBlock {P} at (0,1200) size 769x37
- RenderText {#text} at (0,0) size 20x36
- text run at (0,0) width 20: "is"
- RenderBlock {P} at (0,1269) size 769x37
- RenderText {#text} at (0,0) size 55x36
- text run at (0,0) width 55: "long"
- RenderBlock {P} at (0,1338) size 769x37
- RenderText {#text} at (0,0) size 90x36
- text run at (0,0) width 90: "enough"
- RenderBlock {P} at (0,1407) size 769x37
- RenderText {#text} at (0,0) size 111x36
- text run at (0,0) width 111: "to scroll."
- RenderBlock {P} at (0,1476) 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,562) size 259x164 clip at (11,563) size 257x162
- RenderTextControl {TEXTAREA} at (2,298) 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."
-frame 'main' scrolled to 0,1019
-
-============== 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/LayoutTests/platform/chromium-win/http/tests/navigation/anchor-frames-expected.checksum b/LayoutTests/platform/chromium-win/http/tests/navigation/anchor-frames-expected.checksum
deleted file mode 100644
index 3f7864b..0000000
--- a/LayoutTests/platform/chromium-win/http/tests/navigation/anchor-frames-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-6ea93fe00854df3b85734f1e40a4d240
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/http/tests/navigation/anchor-frames-expected.png b/LayoutTests/platform/chromium-win/http/tests/navigation/anchor-frames-expected.png
deleted file mode 100644
index b46e5ee..0000000
Binary files a/LayoutTests/platform/chromium-win/http/tests/navigation/anchor-frames-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/http/tests/navigation/anchor-frames-expected.txt b/LayoutTests/platform/chromium-win/http/tests/navigation/anchor-frames-expected.txt
deleted file mode 100644
index 9007f07..0000000
--- a/LayoutTests/platform/chromium-win/http/tests/navigation/anchor-frames-expected.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-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
- 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 123x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,3) size 107x16
- RenderText at (0,0) size 107x16
- text run at (0,0) width 107: "Submit with POST"
- RenderBR {BR} at (127,18) size 0x0
- RenderButton {INPUT} at (2,28) size 249x22 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderBlock (anonymous) at (8,3) size 233x16
- RenderText at (0,0) size 233x16
- text run at (0,0) width 233: "Submit with POST followed by a redirect"
- RenderBR {BR} at (253,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."
-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/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 80b3ebc..fb2298d 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -1421,7 +1421,6 @@ BUG23498 MAC : fonts/fantasy.html = IMAGE
BUG23498 MAC : fonts/monospace.html = IMAGE
BUG23498 MAC : fonts/sans-serif.html = IMAGE
BUG23498 MAC : fonts/serif.html = IMAGE
-BUG23498 MAC : http/tests/navigation/anchor-frames.html = IMAGE
BUG9798 BUG23498 MAC DEBUG : http/tests/navigation/error404-frames.html = TIMEOUT IMAGE
BUG9798 BUG23498 MAC RELEASE : http/tests/navigation/error404-frames.html = IMAGE
BUG23498 MAC : http/tests/navigation/error404-subframeload.html = IMAGE
diff --git a/LayoutTests/platform/mac/http/tests/navigation/anchor-frames-expected.checksum b/LayoutTests/platform/mac/http/tests/navigation/anchor-frames-expected.checksum
deleted file mode 100644
index 69a142c..0000000
--- a/LayoutTests/platform/mac/http/tests/navigation/anchor-frames-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-0e573b26e292e031f2938232f95b8bd9
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/http/tests/navigation/anchor-frames-expected.png b/LayoutTests/platform/mac/http/tests/navigation/anchor-frames-expected.png
deleted file mode 100644
index 178e79a..0000000
Binary files a/LayoutTests/platform/mac/http/tests/navigation/anchor-frames-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/http/tests/navigation/anchor-frames-expected.txt b/LayoutTests/platform/mac/http/tests/navigation/anchor-frames-expected.txt
deleted file mode 100644
index 97657dc..0000000
--- a/LayoutTests/platform/mac/http/tests/navigation/anchor-frames-expected.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-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
- RenderFrameSet {FRAMESET} at (0,0) size 800x600
- RenderFrame {FRAME} at (0,0) size 800x534
- layer at (0,0) size 785x1554
- RenderView at (0,0) size 785x534
- layer at (0,0) size 785x1554
- RenderBlock {HTML} at (0,0) size 785x1554
- RenderBody {BODY} at (8,8) size 769x1514
- RenderBlock (anonymous) at (0,0) size 769x259
- RenderText {#text} at (0,0) size 749x185
- text run at (0,0) width 676: "This is test page that we navigate to as part of testing"
- text run at (0,37) width 333: "various navigation styles. "
- text run at (333,37) width 416: "It includes a form so that we can"
- text run at (0,74) width 717: "test saving and restoring of form data, and it needs to be"
- text run at (0,111) width 745: "long enough that we can test saving and restoring of scroll"
- text run at (0,148) width 119: "position. "
- RenderBR {BR} at (119,177) size 0x0
- RenderBR {BR} at (0,185) size 0x37
- RenderBR {BR} at (0,222) size 0x37
- RenderBlock {HR} at (0,275) size 769x2 [border: (1px inset #000000)]
- RenderBlock {FORM} at (0,293) size 769x428
- RenderButton {INPUT} at (2,2) size 111x18 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (8,2) size 95x13
- RenderText at (0,0) size 95x13
- text run at (0,0) width 95: "Submit with POST"
- RenderBR {BR} at (115,15) size 0x0
- RenderButton {INPUT} at (2,24) size 231x18 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (8,2) size 215x13
- RenderText at (0,0) size 215x13
- text run at (0,0) width 215: "Submit with POST followed by a redirect"
- RenderBR {BR} at (235,37) size 0x0
- RenderText {#text} at (0,44) size 376x37
- text run at (0,44) width 376: "Here are some form elements"
- RenderTextControl {INPUT} at (378,59) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (505,73) size 0x0
- RenderText {#text} at (0,81) size 334x37
- text run at (0,81) width 334: "that we can use for testing"
- RenderTextControl {INPUT} at (336,96) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (463,110) size 0x0
- RenderBlock {INPUT} at (3,136) size 12x13
- RenderText {#text} at (18,118) size 73x37
- text run at (18,118) width 73: " Male"
- RenderBR {BR} at (91,147) size 0x0
- RenderBlock {INPUT} at (3,173) size 12x13
- RenderText {#text} at (18,155) size 102x37
- text run at (18,155) width 102: " Female"
- RenderBR {BR} at (120,184) size 0x0
- RenderBlock {INPUT} at (3,211) size 12x12
- RenderText {#text} at (18,192) size 130x37
- text run at (18,192) width 130: " option #1"
- RenderBR {BR} at (148,221) size 0x0
- RenderBlock {INPUT} at (3,248) size 12x12
- RenderText {#text} at (18,229) size 130x37
- text run at (18,229) width 130: " option #2"
- RenderBR {BR} at (148,258) size 0x0
- RenderMenuList {SELECT} at (2,268) size 256x18 [bgcolor=#FFFFFF]
- RenderBlock (anonymous) at (0,0) size 256x18
- RenderText at (8,2) size 63x13
- text run at (8,2) width 63: "Initial Value"
- RenderBR {BR} at (260,281) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {HR} at (0,753) size 769x2 [border: (1px inset #000000)]
- RenderBlock {P} at (0,787) size 769x37
- RenderText {#text} at (0,0) size 62x37
- text run at (0,0) width 62: "Now"
- RenderBlock {P} at (0,856) size 769x37
- RenderText {#text} at (0,0) size 67x37
- text run at (0,0) width 67: "some"
- RenderBlock {P} at (0,925) size 769x37
- RenderText {#text} at (0,0) size 63x37
- text run at (0,0) width 63: "filler"
- RenderBlock {P} at (0,994) size 769x37
- RenderText {#text} at (0,0) size 28x37
- text run at (0,0) width 28: "so"
- RenderBlock {P} at (0,1063) size 769x37
- RenderText {#text} at (0,0) size 39x37
- text run at (0,0) width 39: "the"
- RenderBlock {P} at (0,1132) size 769x37
- RenderText {#text} at (0,0) size 46x37
- text run at (0,0) width 46: "doc"
- RenderBlock {P} at (0,1201) size 769x37
- RenderText {#text} at (0,0) size 21x37
- text run at (0,0) width 21: "is"
- RenderBlock {P} at (0,1270) size 769x37
- RenderText {#text} at (0,0) size 57x37
- text run at (0,0) width 57: "long"
- RenderBlock {P} at (0,1339) size 769x37
- RenderText {#text} at (0,0) size 94x37
- text run at (0,0) width 94: "enough"
- RenderBlock {P} at (0,1408) size 769x37
- RenderText {#text} at (0,0) size 112x37
- text run at (0,0) width 112: "to scroll."
- RenderBlock {P} at (0,1477) size 769x37
- RenderInline {A} at (0,0) size 531x37
- RenderText {#text} at (0,0) size 531x37
- text run at (0,0) width 531: "This is an anchor point named \"anchor1\"."
- layer at (389,363) size 119x13 scrollWidth 153
- RenderBlock {DIV} at (3,3) size 119x13
- RenderText {#text} at (1,0) size 151x13
- text run at (1,0) width 151: "Initial text before user input"
- layer at (347,400) size 119x13
- RenderBlock {DIV} at (3,3) size 119x13
- layer at (10,591) size 231x136 clip at (11,592) size 229x134
- RenderTextControl {TEXTAREA} at (2,290) size 231x136 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
- RenderBlock {DIV} at (3,3) size 225x26
- RenderText {#text} at (0,0) size 185x13
- text run at (0,0) width 185: "More initial text before user input."
- text run at (185,0) width 0: " "
- RenderBR {BR} at (0,13) size 0x13
- 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 722x74
- text run at (0,0) width 722: "This is just a minimal page that we navigate to as part of"
- text run at (0,37) width 272: "testing back/forward."
-frame 'main' scrolled to 0,1020
-
-============== 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")
-===============================================
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list