diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 23:27:15 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-22 23:27:15 +0000 |
| commit | 5a7362fefe60518a51593ddbf4649bc48493d459 (patch) | |
| tree | 4a4d6029d59e25e2dacc96c588c156007288175b /webkit | |
| parent | 85a335194de26a289376e7322818540d7aa617f1 (diff) | |
| download | chromium_src-5a7362fefe60518a51593ddbf4649bc48493d459.zip chromium_src-5a7362fefe60518a51593ddbf4649bc48493d459.tar.gz chromium_src-5a7362fefe60518a51593ddbf4649bc48493d459.tar.bz2 | |
Rebaseline tests where sizes are off by 1 due to font differences.
For fast/forms/input-baseline.html, RenderTextControl::calcHeight() uses the
value from m_innerText->renderer()->lineHeight(true, true), but
RenderFlow::lineHeight() returns s->font().lineSpacing(), which is off by 1.
For fast/forms/textfield-outline.html, it comes down to
RenderTextControlSingleLine::preferredContentWidth() calling
style()->font().primaryFont()->maxCharWidth() which returns a value that's off
by 1.
Review URL: http://codereview.chromium.org/18693
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
3 files changed, 40 insertions, 2 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-baseline-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-baseline-expected.txt new file mode 100644 index 0000000..13fb2d7 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/input-baseline-expected.txt @@ -0,0 +1,21 @@ +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 + RenderText {#text} at (0,0) size 277x19 + text run at (0,0) width 277: "This tests that text fields get the right baseline. " + RenderBR {BR} at (277,15) size 0x0 + RenderBR {BR} at (0,20) size 0x19 + RenderTextControl {INPUT} at (0,40) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderText {#text} at (155,41) size 398x19 + text run at (155,41) width 398: "This text should line up with the bottom of the text in the text field. " + RenderBR {BR} at (553,56) size 0x0 + RenderBR {BR} at (0,62) size 0x19 + RenderTextControl {INPUT} at (0,82) size 155x128 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderText {#text} at (155,167) size 394x19 + text run at (155,167) width 394: "This text should line up with the bottom of the text in the text field." +layer at (10,51) size 151x16 + RenderBlock {DIV} at (2,3) size 151x16 +layer at (10,93) size 151x122 + RenderBlock {DIV} at (2,3) size 151x122 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/textfield-outline-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/textfield-outline-expected.txt new file mode 100644 index 0000000..6adef01 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/forms/textfield-outline-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 784x584 + RenderText {#text} at (0,0) size 522x19 + text run at (0,0) width 522: "This tests that a negative outline-offset won't get in the way of a cursor in a text control." + RenderBR {BR} at (522,15) size 0x0 + RenderTextControl {INPUT} at (0,20) size 229x28 [bgcolor=#FFFFFF] [border: (1px solid #000000)] + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 +layer at (9,30) size 227x24 + RenderBlock {DIV} at (1,2) size 227x24 + RenderText {#text} at (1,0) size 32x23 + text run at (1,0) width 32: "abc" +caret: position 3 of child 0 {#text} of child 0 {DIV} of child 3 {INPUT} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 36860fd..5c91289 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -946,9 +946,9 @@ LINUX : LayoutTests/fast/encoding/denormalised-voiced-japanese-chars.html = FAIL LINUX MAC : LayoutTests/fast/events/updateLayoutForHitTest.html = FAIL // Off-by-one in form controls -- font metrics? -LINUX MAC : LayoutTests/fast/forms/input-baseline.html = FAIL +MAC : LayoutTests/fast/forms/input-baseline.html = FAIL LINUX MAC : LayoutTests/fast/forms/searchfield-heights.html = FAIL -LINUX MAC : LayoutTests/fast/forms/textfield-outline.html = FAIL +MAC : LayoutTests/fast/forms/textfield-outline.html = FAIL // Hebrew font metrics. LINUX : LayoutTests/fast/forms/select-visual-hebrew.html = FAIL |