diff options
4 files changed, 229 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.checksum new file mode 100644 index 0000000..9d16aca --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.checksum @@ -0,0 +1 @@ +238722d884287ed7b68787a5e5aa1053
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.png Binary files differnew file mode 100644 index 0000000..b5fa18b --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.txt new file mode 100644 index 0000000..07ebc34 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css1/font_properties/font-expected.txt @@ -0,0 +1,228 @@ +layer at (0,0) size 785x4467 + RenderView at (0,0) size 785x600 +layer at (0,0) size 785x4467 + RenderBlock {HTML} at (0,0) size 785x4467 + RenderBody {BODY} at (8,8) size 769x4451 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x16 + RenderText {#text} at (0,0) size 291x15 + text run at (0,0) width 291: "The style declarations which apply to the text below are:" + RenderBlock {PRE} at (0,28) size 769x180 + RenderText {#text} at (0,0) size 456x180 + text run at (0,0) width 184: "BODY {font-size: 12px;}" + text run at (184,0) width 0: " " + text run at (0,15) width 368: ".one {font: italic small-caps 13pt Helvetica;}" + text run at (368,15) width 0: " " + text run at (0,30) width 232: ".two {font: 150%/150% serif;}" + text run at (232,30) width 0: " " + text run at (0,45) width 288: ".three {font: 150%/150% sans-serif;}" + text run at (288,45) width 0: " " + text run at (0,60) width 264: ".four {font: small/200% cursive;}" + text run at (264,60) width 0: " " + text run at (0,75) width 456: ".five {font: italic small-caps 900 150%/150% sans-serif;}" + text run at (456,75) width 0: " " + text run at (0,90) width 448: ".six {font: italic small-caps 100 150%/300% sans-serif;}" + text run at (448,90) width 0: " " + text run at (0,105) width 448: ".seven {font: italic small-caps 900 150%/2em monospace;}" + text run at (448,105) width 0: " " + text run at (0,120) width 456: ".eight {font: italic small-caps 500 150%/1in sans-serif;}" + text run at (456,120) width 0: " " + text run at (0,135) width 432: ".nine {font: oblique normal 700 18px/200% sans-serif;}" + text run at (432,135) width 0: " " + text run at (0,150) width 344: ".ten {font: normal 400 80%/2.5 sans-serif;}" + text run at (344,150) width 0: " " + text run at (0,165) width 304: "SPAN.color {background-color: silver;}" + text run at (304,165) width 0: " " + RenderBlock {HR} at (0,220) size 769x2 [border: (1px inset #000000)] + RenderBlock {P} at (0,234) size 769x16 + RenderText {#text} at (0,0) size 763x15 + text run at (0,0) width 456: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " + text run at (456,0) width 307: "This is the \"base font size\" referred to in the following tests." + RenderBlock {P} at (0,267) size 769x21 + RenderText {#text} at (0,0) size 535x20 + text run at (0,0) width 535: "This element should be 13pt. Helvetica which is in small-cap italics." + RenderBlock {P} at (0,306) size 769x81 + RenderText {#text} at (0,3) size 745x74 + text run at (0,3) width 293: "This element should be in a serif font. " + text run at (293,3) width 452: "Its font-size should be 150% the base font size, and its line-" + text run at (0,30) width 484: "height should 150% of that value (18px and 27px, respectively). " + text run at (484,30) width 216: "Extra text is included for the" + text run at (0,57) width 310: "purposes of testing this more effectively." + RenderBlock {P} at (0,405) size 769x81 + RenderText {#text} at (0,3) size 749x75 + text run at (0,3) width 379: "This element should be in a sans-serif font. " + text run at (379,3) width 369: "Its font-size should be 150% the base font" + text run at (0,30) width 704: "size, and its line-height should 150% of that value (18px and 27px, respectively). " + text run at (704,30) width 45: "Extra" + text run at (0,57) width 547: "text is included for the purposes of testing this more effectively." + RenderBlock {P} at (0,504) size 769x80 + RenderText {#text} at (0,4) size 760x44 + text run at (0,4) width 760: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size." + text run at (0,30) width 230: "For example, if the font-size value " + RenderInline {CODE} at (0,0) size 35x12 + RenderText {#text} at (230,35) size 35x12 + text run at (230,35) width 35: "small" + RenderText {#text} at (265,30) size 754x46 + text run at (265,30) width 384: " is calculated at 10px, then the line-height should be 20px. " + text run at (649,30) width 105: "The actual value" + text run at (0,58) width 226: "of the font-size is UA-dependent. " + text run at (226,58) width 475: "Extra text is included for the purposes of testing this more effectively." + RenderBlock {P} at (0,602) size 769x108 + RenderText {#text} at (0,3) size 769x102 + text run at (0,3) width 769: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900." + text run at (0,30) width 731: "Its font-size should be 150% the base font size, and its line-height should be 150% of" + text run at (0,57) width 355: "that value (18px and 27px, respectively). " + text run at (355,57) width 358: "Extra text is included for the purposes of" + text run at (0,84) width 244: "testing this more effectively." + RenderBlock {P} at (0,728) size 769x216 + RenderText {#text} at (0,16) size 769x184 + text run at (0,16) width 761: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100." + text run at (0,70) width 767: "Its font-size should be 150% the base font size, and its line-height should be 300% of that" + text run at (0,124) width 311: "value (18px and 54px, respectively). " + text run at (311,124) width 458: "Extra text is included for the purposes of testing this" + text run at (0,178) width 143: "more effectively." + RenderBlock {P} at (0,962) size 769x144 + RenderText {#text} at (0,8) size 750x128 + text run at (0,8) width 750: "This element should be in a monospace font, italicized and small caps, with a weight of" + text run at (0,44) width 55: "900. " + text run at (55,44) width 687: "Its font-size should be 150% the base font size, and its line-height should be" + text run at (0,80) width 618: "2em, or twice the element's font size (18px and 36px, respectively). " + text run at (618,80) width 113: "Extra text is" + text run at (0,116) width 499: "included for the purposes of testing this more effectively." + RenderBlock {P} at (0,1124) size 769x288 + RenderText {#text} at (0,37) size 761x214 + text run at (0,37) width 761: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500." + text run at (0,133) width 761: "Its font-size should be 150% the base font size, or 18px, and its line-height should be 1in." + text run at (0,229) width 607: "Extra text is included for the purposes of testing this more effectively." + RenderBlock {P} at (0,1430) size 769x144 + RenderText {#text} at (0,7) size 746x129 + text run at (0,7) width 717: "This element should be in a sans-serif font, oblique and not small-caps, with a" + text run at (0,43) width 134: "weight of 700. " + text run at (134,43) width 612: "Its font-size should be 18 pixels, and its line-height should be 36px" + text run at (0,79) width 292: "(200% this element's font size). " + text run at (292,79) width 443: "Extra text is included for the purposes of testing" + text run at (0,115) width 195: "this more effectively." + RenderBlock {P} at (0,1592) size 769x50 + RenderText {#text} at (0,6) size 745x38 + text run at (0,6) width 310: "This element should be in a sans-serif font, with a weight of 400. " + text run at (310,6) width 435: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or" + text run at (0,31) width 29: "24px. " + text run at (29,31) width 329: "Extra text is included for the purposes of testing this more effectively." + RenderBlock {P} at (0,1660) size 769x270 + RenderInline {SPAN} at (0,0) size 767x238 [bgcolor=#C0C0C0] + RenderText {#text} at (0,16) size 767x238 + text run at (0,16) width 761: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100." + text run at (0,70) width 767: "Its font-size should be 150% the base font size, and its line-height should be 300% of that" + text run at (0,124) width 702: "value (18px and 54px, respectively). The text should have a silver background. The" + text run at (0,178) width 749: "background color has been set on an inline element and should therefore only cover the" + text run at (0,232) width 258: "text, not the interline spacing." + RenderText {#text} at (0,0) size 0x0 + RenderTable {TABLE} at (0,1948) size 769x2503 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x2501 + RenderTableRow {TR} at (0,0) size 767x28 + RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 171x19 + RenderText {#text} at (4,4) size 171x19 + text run at (4,4) width 171: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x2473 + RenderTableCell {TD} at (0,1250) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 4x19 + text run at (4,4) width 4: " " + RenderTableCell {TD} at (12,28) size 755x2473 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x40 + RenderText {#text} at (0,0) size 719x39 + text run at (0,0) width 606: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " + text run at (606,0) width 113: "This is the \"base" + text run at (0,20) width 294: "font size\" referred to in the following tests." + RenderBlock {P} at (4,61) size 747x21 + RenderText {#text} at (0,0) size 535x20 + text run at (0,0) width 535: "This element should be 13pt. Helvetica which is in small-cap italics." + RenderBlock {P} at (4,106) size 747x144 + RenderText {#text} at (0,4) size 742x135 + text run at (0,4) width 377: "This element should be in a serif font. " + text run at (377,4) width 365: "Its font-size should be 150% the base" + text run at (0,40) width 697: "font size, and its line-height should 150% of that value (18px and 27px," + text run at (0,76) width 139: "respectively). " + text run at (139,76) width 568: "Extra text is included for the purposes of testing this more" + text run at (0,112) width 111: "effectively." + RenderBlock {P} at (4,274) size 747x144 + RenderText {#text} at (0,4) size 727x135 + text run at (0,4) width 484: "This element should be in a sans-serif font. " + text run at (484,4) width 243: "Its font-size should be" + text run at (0,40) width 708: "150% the base font size, and its line-height should 150% of that" + text run at (0,76) width 406: "value (18px and 27px, respectively). " + text run at (406,76) width 309: "Extra text is included for the" + text run at (0,112) width 445: "purposes of testing this more effectively." + RenderBlock {P} at (4,442) size 747x106 + RenderText {#text} at (0,4) size 726x44 + text run at (0,4) width 726: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual" + text run at (0,30) width 34: "size. " + text run at (34,30) width 230: "For example, if the font-size value " + RenderInline {CODE} at (0,0) size 35x12 + RenderText {#text} at (264,35) size 35x12 + text run at (264,35) width 35: "small" + RenderText {#text} at (299,30) size 708x72 + text run at (299,30) width 384: " is calculated at 10px, then the line-height should be 20px. " + text run at (683,30) width 25: "The" + text run at (0,58) width 306: "actual value of the font-size is UA-dependent. " + text run at (306,58) width 393: "Extra text is included for the purposes of testing this more" + text run at (0,84) width 78: "effectively." + RenderBlock {P} at (4,572) size 747x180 + RenderText {#text} at (0,4) size 741x172 + text run at (0,4) width 698: "This element should be in a sans-serif font, italicized and small" + text run at (0,40) width 302: "caps, with a weight of 900. " + text run at (302,40) width 420: "Its font-size should be 150% the base" + text run at (0,76) width 716: "font size, and its line-height should be 150% of that value (18px" + text run at (0,112) width 271: "and 27px, respectively). " + text run at (271,112) width 470: "Extra text is included for the purposes of" + text run at (0,148) width 322: "testing this more effectively." + RenderBlock {P} at (4,776) size 747x360 + RenderText {#text} at (0,22) size 737x316 + text run at (0,22) width 687: "This element should be in a sans-serif font, italicized and small" + text run at (0,94) width 300: "caps, with a weight of 100. " + text run at (300,94) width 416: "Its font-size should be 150% the base" + text run at (0,166) width 709: "font size, and its line-height should be 300% of that value (18px" + text run at (0,238) width 269: "and 54px, respectively). " + text run at (269,238) width 468: "Extra text is included for the purposes of" + text run at (0,310) width 321: "testing this more effectively." + RenderBlock {P} at (4,1160) size 747x195 + RenderText {#text} at (0,8) size 741x179 + text run at (0,8) width 741: "This element should be in a monospace font, italicized and small caps, with a" + text run at (0,47) width 156: "weight of 900. " + text run at (156,47) width 555: "Its font-size should be 150% the base font size, and its" + text run at (0,86) width 741: "line-height should be 2em, or twice the element's font size (18px and 36px," + text run at (0,125) width 144: "respectively). " + text run at (144,125) width 573: "Extra text is included for the purposes of testing this more" + text run at (0,164) width 111: "effectively." + RenderBlock {P} at (4,1379) size 747x384 + RenderText {#text} at (0,34) size 716x316 + text run at (0,34) width 687: "This element should be in a sans-serif font, italicized and small" + text run at (0,130) width 300: "caps, with a weight of 500. " + text run at (300,130) width 416: "Its font-size should be 150% the base" + text run at (0,226) width 572: "font size, or 18px, and its line-height should be 1in. " + text run at (572,226) width 142: "Extra text is" + text run at (0,322) width 647: "included for the purposes of testing this more effectively." + RenderBlock {P} at (4,1787) size 747x144 + RenderText {#text} at (0,7) size 746x129 + text run at (0,7) width 717: "This element should be in a sans-serif font, oblique and not small-caps, with a" + text run at (0,43) width 134: "weight of 700. " + text run at (134,43) width 612: "Its font-size should be 18 pixels, and its line-height should be 36px" + text run at (0,79) width 292: "(200% this element's font size). " + text run at (292,79) width 443: "Extra text is included for the purposes of testing" + text run at (0,115) width 195: "this more effectively." + RenderBlock {P} at (4,1949) size 747x64 + RenderText {#text} at (0,8) size 741x48 + text run at (0,8) width 409: "This element should be in a sans-serif font, with a weight of 400. " + text run at (409,8) width 332: "Its font-size should be 80% of 12px, or 9.6px, and its" + text run at (0,40) width 282: "line-height shoud be 2.5 times that, or 24px. " + text run at (282,40) width 434: "Extra text is included for the purposes of testing this more effectively." + RenderBlock {P} at (4,2037) size 747x432 + RenderInline {SPAN} at (0,0) size 738x388 [bgcolor=#C0C0C0] + RenderText {#text} at (0,22) size 738x388 + text run at (0,22) width 687: "This element should be in a sans-serif font, italicized and small" + text run at (0,94) width 300: "caps, with a weight of 100. " + text run at (300,94) width 416: "Its font-size should be 150% the base" + text run at (0,166) width 709: "font size, and its line-height should be 300% of that value (18px" + text run at (0,238) width 733: "and 54px, respectively). The text should have a silver background." + text run at (0,310) width 738: "The background color has been set on an inline element and should" + text run at (0,382) width 625: "therefore only cover the text, not the interline spacing." + RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index a848712..6a80968 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -784,7 +784,6 @@ LayoutTests/http/tests/plugins/geturlnotify-from-npp-destroystream.html = FAIL P DEBUG : LayoutTests/svg/W3C-SVG-1.1/interact-dom-01-b.svg = CRASH // Tests that fail on linux but pass on windows. -LINUX : LayoutTests/css1/font_properties/font.html = FAIL LINUX : LayoutTests/css1/font_properties/font_size.html = FAIL LINUX : LayoutTests/css1/pseudo/multiple_pseudo_elements.html = FAIL LINUX : LayoutTests/css1/text_properties/line_height.html = FAIL |
