summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 23:58:34 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 23:58:34 +0000
commitfd26e207fdea97c98a8b6709a863583fa68f66c2 (patch)
tree0618908f65ff047b7cbe481766bc637ee7f91cc6 /webkit
parent45c6af27a2c6d95c72a8908472460aa244a9051c (diff)
downloadchromium_src-fd26e207fdea97c98a8b6709a863583fa68f66c2.zip
chromium_src-fd26e207fdea97c98a8b6709a863583fa68f66c2.tar.gz
chromium_src-fd26e207fdea97c98a8b6709a863583fa68f66c2.tar.bz2
Rebaseline more tests after verifying their output is ok.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/19089-expected.txt2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5057506-expected.txt30
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.pngbin18879 -> 18881 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.txt57
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/listbox-clip-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/listbox-clip-expected.pngbin0 -> 3196 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/cg-fallback-bolding-expected.txt17
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt9
9 files changed, 108 insertions, 10 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/19089-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/19089-expected.txt
new file mode 100644
index 0000000..f9215ae
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/execCommand/19089-expected.txt
@@ -0,0 +1,2 @@
+This tests to make sure an ASSERT doesn't fire when performing a FormatBlock operation on a selection that ends just after a horizontal rule that is the last element in the document. The test should not assert.
+<pre><span class="Apple-style-span" style="font-family: Times; font-size: 16px; white-space: normal; "><hr></span></pre>
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5057506-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5057506-expected.txt
new file mode 100644
index 0000000..a92aca9
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/selection/5057506-expected.txt
@@ -0,0 +1,30 @@
+ALERT: 33
+ALERT: 116.5
+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 784x584
+ RenderBlock {P} at (0,0) size 784x80
+ RenderText {#text} at (0,0) size 771x79
+ text run at (0,0) width 477: "This tests double clicking after the last character in the last cell of a block table. "
+ text run at (477,0) width 294: "The paragraph break (the space between the last"
+ text run at (0,20) width 448: "character and the first character in the next paragraph) should be selected. "
+ text run at (448,20) width 272: "Selection painting problems might prevent the"
+ text run at (0,40) width 373: "paragraph break from appearing as selected even though it is. "
+ text run at (373,40) width 377: "To test manually, double click inside the table cell, after the last"
+ text run at (0,60) width 152: "character, and hit delete. "
+ text run at (152,60) width 265: "Afterward, the table should contain 'foobar'."
+ RenderBlock {DIV} at (0,96) size 784x50
+ RenderTable {TABLE} at (0,0) size 110x30 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 108x28
+ RenderTableRow {TR} at (0,2) size 108x24
+ RenderTableCell {TD} at (2,2) size 104x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderInline {SPAN} at (0,0) size 20x19
+ RenderText {#text} at (2,2) size 20x19
+ text run at (2,2) width 20: "foo"
+ RenderBlock {DIV} at (0,30) size 784x20
+ RenderText {#text} at (0,0) size 20x19
+ text run at (0,0) width 20: "bar"
+selection start: position 3 of child 0 {#text} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+selection end: position 0 of child 3 {DIV} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.checksum
index b536ec4..23d77fd 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.checksum
@@ -1 +1 @@
-446d305da93fe90945f290eb95a47a4c \ No newline at end of file
+7d79779848bcd2300ace85ad798a301d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.png
index 21fccfb..de742d5 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.txt
new file mode 100644
index 0000000..dba68eb
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/block/positioning/047-expected.txt
@@ -0,0 +1,57 @@
+layer at (0,0) size 785x810
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x810
+ RenderBlock {HTML} at (0,0) size 785x810
+ RenderBody {BODY} at (8,8) size 769x781
+layer at (8,8) size 512x781
+ RenderBlock (relative positioned) {DIV} at (0,0) size 512x781
+ RenderBlock {H2} at (0,0) size 512x29
+ RenderText {#text} at (0,-3) size 80x36
+ text run at (0,-3) width 80: "Bug 1"
+ RenderBlock {P} at (0,55) size 512x203
+ RenderText {#text} at (0,3) size 503x139
+ text run at (0,3) width 503: "Safari public beta does not support CSS absolute positioning"
+ text run at (0,32) width 489: "correctly (if at all). Immediately following the text position"
+ text run at (0,61) width 450: "marked by the dagger, there is a <span> element that is"
+ text run at (0,90) width 487: "positioned to the right of the <div> block that contains this"
+ text run at (0,119) width 92: "paragraph\x{2020}"
+ RenderText {#text} at (92,119) size 506x81
+ text run at (92,119) width 382: ". In IE 5.x, Mozilla 1.2, and Chimera 0.6+, the"
+ text run at (0,148) width 506: "contents of the <span> element appears in the margin directly"
+ text run at (0,177) width 209: "to the right of the dagger."
+ RenderBlock {P} at (0,279) size 512x87
+ RenderText {#text} at (0,3) size 504x81
+ text run at (0,3) width 469: "I should note that Chimera 0.6 rendered this test with the"
+ text run at (0,32) width 504: "marginal note shifted down by one line; this has been fixed in"
+ text run at (0,61) width 153: "subsequent builds."
+ RenderBlock {H2} at (0,392) size 512x29
+ RenderText {#text} at (0,-3) size 80x36
+ text run at (0,-3) width 80: "Bug 2"
+ RenderBlock {P} at (0,447) size 512x58
+ RenderText {#text} at (0,7) size 489x44
+ text run at (0,7) width 489: "Fonts also render substantially smaller than other browsers, which is not a good thing when"
+ text run at (0,36) width 409: "you consider that most sites specify fonts that are too small in the first place."
+ RenderBlock {P} at (0,526) size 512x58
+ RenderText {#text} at (0,3) size 487x52
+ text run at (0,3) width 487: "At the very least, the preferences panel needs a default text-"
+ text run at (0,32) width 477: "zoom setting to enable compatibility with other browsers."
+ RenderBlock {H2} at (0,610) size 512x29
+ RenderText {#text} at (0,-3) size 80x36
+ text run at (0,-3) width 80: "Bug 3"
+ RenderBlock {P} at (0,665) size 512x116
+ RenderText {#text} at (0,3) size 64x23
+ text run at (0,3) width 64: "Worse, "
+ RenderInline {I} at (0,0) size 484x52
+ RenderText {#text} at (64,3) size 484x52
+ text run at (64,3) width 420: "the \"make text bigger\" button does not scale line-"
+ text run at (0,32) width 254: "height when it scales font-size"
+ RenderText {#text} at (254,32) size 506x81
+ text run at (254,32) width 212: " (hit it a few times on this"
+ text run at (0,61) width 506: "page). This is a crippling flaw for people who need to enlarge"
+ text run at (0,90) width 245: "the fonts to read comfortably."
+layer at (546,179) size 200x49
+ RenderBlock (positioned) {SPAN} at (538,171) size 200x48
+ RenderText {#text} at (0,-1) size 196x50
+ text run at (0,-1) width 191: "\x{2190} this should be to the right of"
+ text run at (0,15) width 196: "the paragraph, lining up with the"
+ text run at (0,31) width 42: "dagger"
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/listbox-clip-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/listbox-clip-expected.checksum
new file mode 100644
index 0000000..1349ce5
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/listbox-clip-expected.checksum
@@ -0,0 +1 @@
+27ae70ff8f81279bbba21c4611ae1c4c \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/listbox-clip-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/listbox-clip-expected.png
new file mode 100644
index 0000000..461f7a0
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/listbox-clip-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/cg-fallback-bolding-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/cg-fallback-bolding-expected.txt
new file mode 100644
index 0000000..fbf7ac0
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/cg-fallback-bolding-expected.txt
@@ -0,0 +1,17 @@
+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 784x464
+ RenderBlock {P} at (0,0) size 784x80
+ RenderText {#text} at (0,0) size 784x79
+ text run at (0,0) width 417: "The single Hebrew glyph below should be in the Lucida Grande font. "
+ text run at (417,0) width 360: "It should not be a synthetic bold, because the first font in the"
+ text run at (0,20) width 220: "list (Ahem) does not have the glyph. "
+ text run at (220,20) width 534: "Therefore we fall back to the second font in the list (Lucida Grande), which does support"
+ text run at (0,40) width 35: "bold. "
+ text run at (35,40) width 749: "This test is making sure we don't make incorrect assumptions based off the fact that we would have to synthesize bold for the"
+ text run at (0,60) width 109: "first font in the list."
+ RenderBlock {P} at (0,208) size 784x128
+ RenderText {#text} at (0,0) size 62x128
+ text run at (0,0) width 62 RTL: "\x{5D0}"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 42763eb..401bde9 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1134,9 +1134,6 @@ MAC : LayoutTests/fast/forms/placeholder-pseudo-style.html = FAIL
MAC : LayoutTests/fast/forms/search-placeholder-value-changed.html = FAIL
MAC : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL
-// Linux pixeltest failure: Form control incorrect size
-LINUX : LayoutTests/fast/forms/listbox-clip.html = FAIL
-
// Linux pixeltest failure: Failing to apply style
LINUX : LayoutTests/fast/forms/select-style.html = FAIL
@@ -1342,13 +1339,7 @@ LayoutTests/fast/events/key-events-in-input-button.html = FAIL
LayoutTests/fast/css/computed-style.html = FAIL
LINUX WIN : LayoutTests/fast/repaint/change-transform.html = FAIL
-// MERGE 38653:38729: Expectations changed upstream
-// Flaky on Linux, maybe on Windows too?
-LINUX : LayoutTests/editing/selection/5057506.html = PASS FAIL
LINUX WIN : LayoutTests/editing/inserting/insert-before-link-1.html = FAIL
-LINUX : LayoutTests/editing/execCommand/19089.html = FAIL
-LINUX : LayoutTests/fast/block/positioning/047.html = FAIL
-LINUX : LayoutTests/fast/text/cg-fallback-bolding.html = FAIL
// MERGE 38653:38729: New tests
LINUX WIN : LayoutTests/fast/repaint/outline-child-repaint.html = FAIL