diff options
| author | Walter Korman <wkorman@google.com> | 2016-01-11 02:14:46 -0800 |
|---|---|---|
| committer | Walter Korman <wkorman@google.com> | 2016-01-11 10:18:04 +0000 |
| commit | 7fdccee949335fe31c65e24e47c4bd6da69b99d2 (patch) | |
| tree | 0d915de3cd2cbd19a0e95f7fa793d674f5dedf80 /third_party | |
| parent | 7bf4f642b2b3305b86efe163c61f6b04eda319ed (diff) | |
| download | chromium_src-7fdccee949335fe31c65e24e47c4bd6da69b99d2.zip chromium_src-7fdccee949335fe31c65e24e47c4bd6da69b99d2.tar.gz chromium_src-7fdccee949335fe31c65e24e47c4bd6da69b99d2.tar.bz2 | |
Auto-rebaseline for r368535
https://chromium.googlesource.com/chromium/src/+/5c404a9b3
BUG=176309
TBR=nainar@chromium.org
Review URL: https://codereview.chromium.org/1574993002 .
Cr-Commit-Position: refs/heads/master@{#368553}
Diffstat (limited to 'third_party')
46 files changed, 1003 insertions, 495 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index b03c00d..8604850 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations @@ -215,12 +215,6 @@ crbug.com/248938 [ Win Debug ] virtual/threaded/transitions/transition-end-event crbug.com/248938 [ Win Debug ] virtual/threaded/transitions/transition-end-event-multiple-04.html [ Pass Failure ] crbug.com/352405 virtual/threaded/animations/transition-and-animation-1.html [ Pass Timeout ] -crbug.com/176309 css1/font_properties/font.html [ NeedsRebaseline ] -crbug.com/176309 css2.1/t100801-c544-valgn-02-d-agi.html [ NeedsRebaseline ] -crbug.com/176309 css2.1/t100801-c544-valgn-04-d-agi.html [ NeedsRebaseline ] -crbug.com/176309 css2.1/t1508-c527-font-09-b.html [ NeedsRebaseline ] -crbug.com/176309 svg/custom/svg-fonts-in-html.html [ NeedsRebaseline ] - crbug.com/461179 virtual/spv2/paint/invalidation/invalidate-when-receiving-paint-layer.html [ Failure ] crbug.com/542541 [ Debug ] fast/events/click-count.html [ Pass Failure ] diff --git a/third_party/WebKit/LayoutTests/platform/android/css1/font_properties/font-expected.txt b/third_party/WebKit/LayoutTests/platform/android/css1/font_properties/font-expected.txt new file mode 100644 index 0000000..b1fd1c4 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/css1/font_properties/font-expected.txt @@ -0,0 +1,230 @@ +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4402 + LayoutView at (0,0) size 800x600 +layer at (0,0) size 785x4402 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 + LayoutBlockFlow {HTML} at (0,0) size 785x4402.33 + LayoutBlockFlow {BODY} at (8,8) size 769x4386.33 [bgcolor=#CCCCCC] + LayoutBlockFlow {P} at (0,0) size 769x16 + LayoutText {#text} at (0,0) size 274x15 + text run at (0,0) width 274: "The style declarations which apply to the text below are:" + LayoutBlockFlow {PRE} at (0,28) size 769x180 + LayoutText {#text} at (0,0) size 399x180 + text run at (0,0) width 161: "BODY {font-size: 12px;}" + text run at (161,0) width 0: " " + text run at (0,15) width 322: ".one {font: italic small-caps 13pt Helvetica;}" + text run at (322,15) width 0: " " + text run at (0,30) width 203: ".two {font: 150%/150% serif;}" + text run at (203,30) width 0: " " + text run at (0,45) width 252: ".three {font: 150%/150% sans-serif;}" + text run at (252,45) width 0: " " + text run at (0,60) width 231: ".four {font: small/200% cursive;}" + text run at (231,60) width 0: " " + text run at (0,75) width 399: ".five {font: italic small-caps 900 150%/150% sans-serif;}" + text run at (399,75) width 0: " " + text run at (0,90) width 392: ".six {font: italic small-caps 100 150%/300% sans-serif;}" + text run at (392,90) width 0: " " + text run at (0,105) width 392: ".seven {font: italic small-caps 900 150%/2em monospace;}" + text run at (392,105) width 0: " " + text run at (0,120) width 399: ".eight {font: italic small-caps 500 150%/1in sans-serif;}" + text run at (399,120) width 0: " " + text run at (0,135) width 378: ".nine {font: oblique normal 700 18px/200% sans-serif;}" + text run at (378,135) width 0: " " + text run at (0,150) width 301: ".ten {font: normal 400 80%/2.5 sans-serif;}" + text run at (301,150) width 0: " " + text run at (0,165) width 266: "SPAN.color {background-color: silver;}" + text run at (266,165) width 0: " " + LayoutBlockFlow {HR} at (0,220) size 769x2 [border: (1px inset #EEEEEE)] + LayoutBlockFlow {P} at (0,234) size 769x16 + LayoutText {#text} at (0,0) size 721x15 + text run at (0,0) width 431: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " + text run at (431,0) width 290: "This is the \"base font size\" referred to in the following tests." + LayoutBlockFlow {P} at (0,267.33) size 769x21 + LayoutText {#text} at (0,0) size 501x20 + text run at (0,0) width 501: "This element should be 13pt. Helvetica which is in small-cap italics." + LayoutBlockFlow {P} at (0,306.33) size 769x81 + LayoutText {#text} at (0,3) size 760x74 + text run at (0,3) width 278: "This element should be in a serif font. " + text run at (278,3) width 472: "Its font-size should be 150% the base font size, and its line-height" + text run at (0,30) width 417: "should 150% of that value (18px and 27px, respectively). " + text run at (417,30) width 343: "Extra text is included for the purposes of testing" + text run at (0,57) width 151: "this more effectively." + LayoutBlockFlow {P} at (0,405.33) size 769x81 + LayoutText {#text} at (0,3) size 757x75 + text run at (0,3) width 348: "This element should be in a sans-serif font. " + text run at (348,3) width 409: "Its font-size should be 150% the base font size, and" + text run at (0,30) width 566: "its line-height should 150% of that value (18px and 27px, respectively). " + text run at (566,30) width 190: "Extra text is included for" + text run at (0,57) width 349: "the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,504.33) size 769x80 + LayoutText {#text} at (0,4) size 726x44 + text run at (0,4) width 705: "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 (705,4) width 21: "For" + text run at (0,30) width 189: "example, if the font-size value " + LayoutInline {CODE} at (0,0) size 30x12 + LayoutText {#text} at (189,35) size 30x12 + text run at (189,35) width 30: "small" + LayoutText {#text} at (219,30) size 753x46 + text run at (219,30) width 359: " is calculated at 10px, then the line-height should be 20px. " + text run at (578,30) width 175: "The actual value of the font-" + text run at (0,58) width 136: "size is UA-dependent. " + text run at (136,58) width 434: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,602.33) size 769x108 + LayoutText {#text} at (0,3) size 753x102 + text run at (0,3) width 731: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900. " + text run at (730,3) width 23: "Its" + text run at (0,30) width 748: "font-size should be 150% the base font size, and its line-height should be 150% of that value" + text run at (0,57) width 244: "(18px and 27px, respectively). " + text run at (243,57) width 477: "Extra text is included for the purposes of testing this more" + text run at (0,84) width 94: "effectively." + LayoutBlockFlow {P} at (0,728.33) size 769x216 + LayoutText {#text} at (0,16) size 745x184 + text run at (0,16) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " + text run at (722,16) width 23: "Its" + text run at (0,70) width 743: "font-size should be 150% the base font size, and its line-height should be 300% of that value" + text run at (0,124) width 244: "(18px and 54px, respectively). " + text run at (243,124) width 479: "Extra text is included for the purposes of testing this more" + text run at (0,178) width 93: "effectively." + LayoutBlockFlow {P} at (0,962.33) size 769x144 + LayoutText {#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." + LayoutBlockFlow {P} at (0,1124.33) size 769x288 + LayoutText {#text} at (0,37) size 745x214 + text run at (0,37) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. " + text run at (722,37) width 23: "Its" + text run at (0,133) width 693: "font-size should be 150% the base font size, or 18px, and its line-height should be 1in. " + text run at (693,133) width 47: "Extra" + text run at (0,229) width 524: "text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,1430.33) size 769x144 + LayoutText {#text} at (0,7) size 752x129 + text run at (0,7) width 752: "This element should be in a sans-serif font, oblique and not small-caps, with a weight of" + text run at (0,43) width 40: "700. " + text run at (40,43) width 663: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" + text run at (0,79) width 177: "element's font size). " + text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" + text run at (0,115) width 91: "effectively." + LayoutBlockFlow {P} at (0,1592.33) size 769x50 + LayoutText {#text} at (0,6) size 760x38 + text run at (0,6) width 305: "This element should be in a sans-serif font, with a weight of 400. " + text run at (305,6) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." + text run at (0,31) width 323: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,1660.33) size 769x270 + LayoutInline {SPAN} at (0,0) size 759x238 [bgcolor=#C0C0C0] + LayoutText {#text} at (0,16) size 759x238 + text run at (0,16) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " + text run at (722,16) width 23: "Its" + text run at (0,70) width 743: "font-size should be 150% the base font size, and its line-height should be 300% of that value" + text run at (0,124) width 759: "(18px and 54px, respectively). The text should have a silver background. The background color" + text run at (0,178) width 735: "has been set on an inline element and should therefore only cover the text, not the interline" + text run at (0,232) width 64: "spacing." + LayoutText {#text} at (0,0) size 0x0 + LayoutTable {TABLE} at (0,1948.33) size 769x2438 [border: (1px outset #808080)] + LayoutTableSection {TBODY} at (1,1) size 767x2436 + LayoutTableRow {TR} at (0,0) size 767x28 + LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + LayoutInline {STRONG} at (0,0) size 157x19 + LayoutText {#text} at (4,4) size 157x19 + text run at (4,4) width 157: "TABLE Testing Section" + LayoutTableRow {TR} at (0,28) size 767x2408 + LayoutTableCell {TD} at (0,1218) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + LayoutText {#text} at (4,4) size 4x19 + text run at (4,4) width 4: " " + LayoutTableCell {TD} at (12,28) size 755x2408.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + LayoutBlockFlow {P} at (4,4) size 747x40 + LayoutText {#text} at (0,0) size 738x39 + text run at (0,0) width 531: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " + text run at (531,0) width 207: "This is the \"base font size\" referred" + text run at (0,20) width 141: "to in the following tests." + LayoutBlockFlow {P} at (4,61.33) size 747x21 + LayoutText {#text} at (0,0) size 501x20 + text run at (0,0) width 501: "This element should be 13pt. Helvetica which is in small-cap italics." + LayoutBlockFlow {P} at (4,106.33) size 747x144 + LayoutText {#text} at (0,4) size 725x135 + text run at (0,4) width 367: "This element should be in a serif font. " + text run at (367,4) width 358: "Its font-size should be 150% the base" + text run at (0,40) width 685: "font size, and its line-height should 150% of that value (18px and 27px," + text run at (0,76) width 136: "respectively). " + text run at (136,76) width 556: "Extra text is included for the purposes of testing this more" + text run at (0,112) width 107: "effectively." + LayoutBlockFlow {P} at (4,274.33) size 747x144 + LayoutText {#text} at (0,4) size 708x135 + text run at (0,4) width 471: "This element should be in a sans-serif font. " + text run at (471,4) width 237: "Its font-size should be" + text run at (0,40) width 685: "150% the base font size, and its line-height should 150% of that" + text run at (0,76) width 391: "value (18px and 27px, respectively). " + text run at (391,76) width 299: "Extra text is included for the" + text run at (0,112) width 430: "purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,442.33) size 747x80 + LayoutText {#text} at (0,4) size 726x44 + text run at (0,4) width 705: "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 (705,4) width 21: "For" + text run at (0,30) width 189: "example, if the font-size value " + LayoutInline {CODE} at (0,0) size 30x12 + LayoutText {#text} at (189,35) size 30x12 + text run at (189,35) width 30: "small" + LayoutText {#text} at (219,30) size 718x46 + text run at (219,30) width 359: " is calculated at 10px, then the line-height should be 20px. " + text run at (578,30) width 140: "The actual value of the" + text run at (0,58) width 167: "font-size is UA-dependent. " + text run at (167,58) width 434: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,546.33) size 747x180 + LayoutText {#text} at (0,4) size 719x172 + text run at (0,4) width 715: "This element should be in a sans-serif font, italicized and small caps," + text run at (0,40) width 226: "with a weight of 900. " + text run at (226,40) width 493: "Its font-size should be 150% the base font size," + text run at (0,76) width 668: "and its line-height should be 150% of that value (18px and 27px," + text run at (0,112) width 147: "respectively). " + text run at (146,112) width 562: "Extra text is included for the purposes of testing this" + text run at (0,148) width 176: "more effectively." + LayoutBlockFlow {P} at (4,750.33) size 747x360 + LayoutText {#text} at (0,22) size 717x316 + text run at (0,22) width 701: "This element should be in a sans-serif font, italicized and small caps," + text run at (0,94) width 227: "with a weight of 100. " + text run at (227,94) width 490: "Its font-size should be 150% the base font size," + text run at (0,166) width 661: "and its line-height should be 300% of that value (18px and 54px," + text run at (0,238) width 146: "respectively). " + text run at (145,238) width 560: "Extra text is included for the purposes of testing this" + text run at (0,310) width 174: "more effectively." + LayoutBlockFlow {P} at (4,1134.33) size 747x156 + LayoutText {#text} at (0,8) size 740x140 + text run at (0,8) width 740: "This element should be in a monospace font, italicized and small caps, with a weight" + text run at (0,47) width 88: "of 900. " + text run at (88,47) width 620: "Its font-size should be 150% the base font size, and its line-height" + text run at (0,86) width 716: "should be 2em, or twice the element's font size (18px and 36px, respectively)." + text run at (0,125) width 636: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,1314.33) size 747x384 + LayoutText {#text} at (0,34) size 739x316 + text run at (0,34) width 701: "This element should be in a sans-serif font, italicized and small caps," + text run at (0,130) width 227: "with a weight of 500. " + text run at (227,130) width 490: "Its font-size should be 150% the base font size," + text run at (0,226) width 433: "or 18px, and its line-height should be 1in. " + text run at (433,226) width 306: "Extra text is included for the" + text run at (0,322) width 427: "purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,1722.33) size 747x144 + LayoutText {#text} at (0,7) size 730x129 + text run at (0,7) width 730: "This element should be in a sans-serif font, oblique and not small-caps, with a weight" + text run at (0,43) width 62: "of 700. " + text run at (62,43) width 663: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" + text run at (0,79) width 177: "element's font size). " + text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" + text run at (0,115) width 91: "effectively." + LayoutBlockFlow {P} at (4,1884.33) size 747x64 + LayoutText {#text} at (0,8) size 742x48 + text run at (0,8) width 374: "This element should be in a sans-serif font, with a weight of 400. " + text run at (374,8) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" + text run at (0,40) width 196: "shoud be 2.5 times that, or 24px. " + text run at (196,40) width 398: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,1972.33) size 747x432 + LayoutInline {SPAN} at (0,0) size 747x388 [bgcolor=#C0C0C0] + LayoutText {#text} at (0,22) size 747x388 + text run at (0,22) width 701: "This element should be in a sans-serif font, italicized and small caps," + text run at (0,94) width 227: "with a weight of 100. " + text run at (227,94) width 490: "Its font-size should be 150% the base font size," + text run at (0,166) width 661: "and its line-height should be 300% of that value (18px and 54px," + text run at (0,238) width 747: "respectively). The text should have a silver background. The background" + text run at (0,310) width 743: "color has been set on an inline element and should therefore only cover" + text run at (0,382) width 353: "the text, not the interline spacing." + LayoutText {#text} at (0,0) size 0x0 diff --git a/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-02-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-02-d-agi-expected.png Binary files differnew file mode 100644 index 0000000..760dc79 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-02-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-02-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-02-d-agi-expected.txt new file mode 100644 index 0000000..9809d01 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-02-d-agi-expected.txt @@ -0,0 +1,84 @@ +layer at (0,0) size 800x600 + LayoutView at (0,0) size 800x600 +layer at (0,0) size 800x360 + LayoutBlockFlow {HTML} at (0,0) size 800x360 + LayoutBlockFlow {BODY} at (8,16) size 784x329 + LayoutBlockFlow {P} at (0,0) size 784x40 + LayoutText {#text} at (0,0) size 765x39 + text run at (0,0) width 365: "Change your window size. However the lines wrap, the blue " + text run at (365,0) width 400: "rectanglues should always have their tops on the same alignment as" + text run at (0,20) width 193: "other blue rectangles on the line." + LayoutBlockFlow {P} at (15,56) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] + LayoutText {#text} at (8,26) size 61x16 + text run at (8,26) width 61: "xxx " + LayoutImage {IMG} at (68.50,26.50) size 30x30 + LayoutText {#text} at (98,26) size 16x16 + text run at (98,26) width 16: " " + LayoutInline {SPAN} at (0,0) size 115x39 [color=#C0C0C0] + LayoutText {#text} at (113,8) size 115x39 + text run at (113,8) width 115: "xxx" + LayoutText {#text} at (227,26) size 16x16 + text run at (227,26) width 16: " " + LayoutImage {IMG} at (242.50,26.50) size 50x50 + LayoutText {#text} at (292,26) size 16x16 + text run at (292,26) width 16: " " + LayoutInline {BIG} at (0,0) size 61x21 [color=#C0C0C0] + LayoutText {#text} at (307,22) size 61x21 + text run at (307,22) width 61: "xxx" + LayoutText {#text} at (367,26) size 16x16 + text run at (367,26) width 16: " " + LayoutImage {IMG} at (382.50,26.50) size 10x10 + LayoutText {#text} at (392,26) size 16x16 + text run at (392,26) width 16: " " + LayoutInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0] + LayoutText {#text} at (407,30) size 31x11 + text run at (407,30) width 31: "xxx" + LayoutText {#text} at (437,26) size 16x16 + text run at (437,26) width 16: " " + LayoutImage {IMG} at (452.50,26.50) size 20x20 + LayoutText {#text} at (472,26) size 76x16 + text run at (472,26) width 16: " " + text run at (487,26) width 61: "xxx " + LayoutImage {IMG} at (547.50,26.50) size 65x65 + LayoutText {#text} at (612,26) size 16x16 + text run at (612,26) width 16: " " + LayoutInline {SPAN} at (0,0) size 91x31 [color=#C0C0C0] + LayoutText {#text} at (627,14) size 91x31 + text run at (627,14) width 91: "xxx" + LayoutText {#text} at (0,0) size 0x0 + LayoutImage {IMG} at (8.50,124.50) size 35x35 + LayoutText {#text} at (43,124) size 76x16 + text run at (43,124) width 16: " " + text run at (58,124) width 61: "xxx " + LayoutImage {IMG} at (118.50,124.50) size 30x30 + LayoutText {#text} at (148,124) size 16x16 + text run at (148,124) width 16: " " + LayoutInline {SPAN} at (0,0) size 353x24 [color=#C0C0C0] + LayoutText {#text} at (163,118) size 93x24 + text run at (163,118) width 93: "xxx " + LayoutInline {SPAN} at (0,0) size 169x57 + LayoutText {#text} at (255,91) size 169x57 + text run at (255,91) width 169: "xxx" + LayoutText {#text} at (423,118) size 93x24 + text run at (423,118) width 93: " xxx" + LayoutText {#text} at (515,124) size 16x16 + text run at (515,124) width 16: " " + LayoutImage {IMG} at (530.50,124.50) size 50x50 + LayoutText {#text} at (580,124) size 16x16 + text run at (580,124) width 16: " " + LayoutInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0] + LayoutText {#text} at (595,128) size 31x11 + text run at (595,128) width 31: "xxx" + LayoutText {#text} at (625,124) size 16x16 + text run at (625,124) width 16: " " + LayoutImage {IMG} at (640.50,124.50) size 15x15 + LayoutText {#text} at (655,124) size 16x16 + text run at (655,124) width 16: " " + LayoutInline {BIG} at (0,0) size 61x21 [color=#C0C0C0] + LayoutText {#text} at (670,120) size 61x21 + text run at (670,120) width 61: "xxx" + LayoutText {#text} at (0,0) size 0x0 + LayoutImage {IMG} at (8.50,174.50) size 90x90 + LayoutText {#text} at (98,174) size 61x16 + text run at (98,174) width 16: " " + text run at (113,174) width 46: "xxx" diff --git a/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-04-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-04-d-agi-expected.png Binary files differnew file mode 100644 index 0000000..4370037 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-04-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-04-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-04-d-agi-expected.txt new file mode 100644 index 0000000..cdd5edf --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/css2.1/t100801-c544-valgn-04-d-agi-expected.txt @@ -0,0 +1,89 @@ +layer at (0,0) size 800x600 + LayoutView at (0,0) size 800x600 +layer at (0,0) size 800x259 + LayoutBlockFlow {HTML} at (0,0) size 800x259 + LayoutBlockFlow {BODY} at (8,16) size 784x228 + LayoutBlockFlow {P} at (0,0) size 784x40 + LayoutText {#text} at (0,0) size 765x39 + text run at (0,0) width 365: "Change your window size. However the lines wrap, the blue " + text run at (365,0) width 400: "rectanglues should always have their tops on the same alignment as" + text run at (0,20) width 193: "other blue rectangles on the line." + LayoutBlockFlow {P} at (15,56) size 754x172 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] + LayoutInline {SPAN} at (0,0) size 46x16 + LayoutText {#text} at (8,8) size 46x16 + text run at (8,8) width 46: "xxx" + LayoutText {#text} at (53,8) size 16x16 + text run at (53,8) width 16: " " + LayoutImage {IMG} at (68.50,8.50) size 10x10 + LayoutText {#text} at (78,8) size 16x16 + text run at (78,8) width 16: " " + LayoutInline {SPAN} at (0,0) size 115x39 + LayoutText {#text} at (93,8) size 115x39 + text run at (93,8) width 115: "xxx" + LayoutText {#text} at (207,8) size 16x16 + text run at (207,8) width 16: " " + LayoutImage {IMG} at (222.50,8.50) size 10x10 + LayoutText {#text} at (232,8) size 16x16 + text run at (232,8) width 16: " " + LayoutInline {SPAN} at (0,0) size 46x16 + LayoutText {#text} at (247,8) size 46x16 + text run at (247,8) width 46: "xxx" + LayoutText {#text} at (292,8) size 16x16 + text run at (292,8) width 16: " " + LayoutImage {IMG} at (307.50,8.50) size 10x10 + LayoutText {#text} at (317,8) size 16x16 + text run at (317,8) width 16: " " + LayoutInline {SPAN} at (0,0) size 46x16 + LayoutText {#text} at (332,8) size 46x16 + text run at (332,8) width 46: "xxx" + LayoutText {#text} at (377,8) size 16x16 + text run at (377,8) width 16: " " + LayoutImage {IMG} at (392.50,8.50) size 10x10 + LayoutText {#text} at (402,8) size 16x16 + text run at (402,8) width 16: " " + LayoutInline {BIG} at (0,0) size 61x21 + LayoutText {#text} at (417,8) size 61x21 + text run at (417,8) width 61: "xxx" + LayoutText {#text} at (477,8) size 16x16 + text run at (477,8) width 16: " " + LayoutImage {IMG} at (492.50,8.50) size 20x20 + LayoutText {#text} at (512,8) size 16x16 + text run at (512,8) width 16: " " + LayoutInline {SPAN} at (0,0) size 46x16 + LayoutText {#text} at (527,8) size 46x16 + text run at (527,8) width 46: "xxx" + LayoutText {#text} at (572,8) size 16x16 + text run at (572,8) width 16: " " + LayoutImage {IMG} at (587.50,8.50) size 65x65 + LayoutText {#text} at (652,8) size 16x16 + text run at (652,8) width 16: " " + LayoutInline {SPAN} at (0,0) size 46x16 + LayoutText {#text} at (667,8) size 46x16 + text run at (667,8) width 46: "xxx" + LayoutText {#text} at (0,0) size 0x0 + LayoutImage {IMG} at (8.50,73.50) size 35x35 + LayoutText {#text} at (43,73) size 16x16 + text run at (43,73) width 16: " " + LayoutInline {SPAN} at (0,0) size 91x31 + LayoutText {#text} at (58,73) size 91x31 + text run at (58,73) width 91: "xxx" + LayoutText {#text} at (148,73) size 16x16 + text run at (148,73) width 16: " " + LayoutImage {IMG} at (163.50,73.50) size 50x50 + LayoutText {#text} at (213,73) size 16x16 + text run at (213,73) width 16: " " + LayoutInline {SPAN} at (0,0) size 46x16 + LayoutText {#text} at (228,73) size 46x16 + text run at (228,73) width 46: "xxx" + LayoutText {#text} at (273,73) size 16x16 + text run at (273,73) width 16: " " + LayoutImage {IMG} at (288.50,73.50) size 15x15 + LayoutText {#text} at (303,73) size 16x16 + text run at (303,73) width 16: " " + LayoutInline {BIG} at (0,0) size 61x21 + LayoutText {#text} at (318,73) size 61x21 + text run at (318,73) width 61: "xxx" + LayoutText {#text} at (378,73) size 16x16 + text run at (378,73) width 16: " " + LayoutImage {IMG} at (393.50,73.50) size 90x90 + LayoutText {#text} at (0,0) size 0x0 diff --git a/third_party/WebKit/LayoutTests/platform/android/css2.1/t1508-c527-font-09-b-expected.png b/third_party/WebKit/LayoutTests/platform/android/css2.1/t1508-c527-font-09-b-expected.png Binary files differnew file mode 100644 index 0000000..6b58503 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/css2.1/t1508-c527-font-09-b-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/android/css2.1/t1508-c527-font-09-b-expected.txt b/third_party/WebKit/LayoutTests/platform/android/css2.1/t1508-c527-font-09-b-expected.txt new file mode 100644 index 0000000..3d858b8 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/css2.1/t1508-c527-font-09-b-expected.txt @@ -0,0 +1,23 @@ +layer at (0,0) size 800x600 + LayoutView at (0,0) size 800x600 +layer at (0,0) size 800x144 + LayoutBlockFlow {HTML} at (0,0) size 800x144.19 + LayoutBlockFlow {BODY} at (8,9.59) size 784x125 [color=#000080] + LayoutBlockFlow {P} at (0,0) size 784x125 + LayoutText {#text} at (0,6) size 476x13 + text run at (0,6) width 476: "This test should be about 10px, sans-serif, and light. There should be about 15px between each line. " + LayoutInline {SPAN} at (0,0) size 763x113 [color=#C0C0C0] + LayoutText {#text} at (476,6) size 763x113 + text run at (476,6) width 287: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,31) width 38: "dummy " + text run at (38,31) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (386,31) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (734,31) width 17: "text" + text run at (0,56) width 328: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (328,56) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (676,56) width 75: "text dummy text" + text run at (0,81) width 270: "dummy text dummy text dummy text dummy text dummy " + text run at (270,81) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (618,81) width 133: "text dummy text dummy text" + text run at (0,106) width 171: "dummy text dummy text dummy text" + LayoutText {#text} at (0,0) size 0x0 diff --git a/third_party/WebKit/LayoutTests/platform/android/svg/custom/svg-fonts-in-html-expected.txt b/third_party/WebKit/LayoutTests/platform/android/svg/custom/svg-fonts-in-html-expected.txt new file mode 100644 index 0000000..925096d --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/svg/custom/svg-fonts-in-html-expected.txt @@ -0,0 +1,88 @@ +layer at (0,0) size 800x600 + LayoutView at (0,0) size 800x600 +layer at (0,0) size 800x518 + LayoutBlockFlow {HTML} at (0,0) size 800x517.53 +layer at (173,32) size 454x454 + LayoutBlockFlow (relative positioned) {BODY} at (173.23,32) size 453.53x453.53 [color=#FFFFFF] [bgcolor=#DD6600] + LayoutBlockFlow {DIV} at (0,0) size 453.53x0 + LayoutBlockFlow {DIV} at (0,0) size 453.53x0 + LayoutBlockFlow {DIV} at (0,0) size 453.53x0 + LayoutBlockFlow {DIV} at (0,0) size 453.53x0 + LayoutInline {SPAN} at (0,0) size 0x0 + LayoutBlockFlow {DIV} at (0,0) size 453.53x0 + LayoutInline {SPAN} at (0,0) size 0x0 + LayoutBlockFlow {DIV} at (0,0) size 453.53x0 + LayoutInline {SPAN} at (0,0) size 0x0 + LayoutBlockFlow {DIV} at (0,0) size 453.53x0 + LayoutInline {SPAN} at (0,0) size 0x0 + LayoutBlockFlow {DIV} at (0,0) size 453.53x0 + LayoutInline {SPAN} at (0,0) size 0x0 + LayoutBlockFlow {DIV} at (0,0) size 453.53x0 + LayoutInline {SPAN} at (0,0) size 0x0 +layer at (173,47) size 454x188 + LayoutBlockFlow (positioned) {H1} at (0,15.11) size 453.53x188 [color=#DD9955] + LayoutInline {SPAN} at (0,0) size 341x189 + LayoutText {#text} at (64,-1) size 341x189 + text run at (64,-1) width 326: "CSS ZEN" + text run at (56,93) width 341: "GARDEN" +layer at (173,119) size 454x22 + LayoutBlockFlow (positioned) {H2} at (0,87.47) size 453.53x22 [color=#EEFF00] + LayoutInline {SPAN} at (0,0) size 203x21 + LayoutText {#text} at (125,0) size 112x21 + text run at (125,0) width 112: "The Beauty of " + LayoutInline {ACRONYM} at (0,0) size 36x21 + LayoutText {#text} at (236,0) size 36x21 + text run at (236,0) width 36: "CSS" + LayoutText {#text} at (271,0) size 57x21 + text run at (271,0) width 57: " Design" +layer at (173,351) size 454x135 + LayoutBlockFlow (positioned) {DIV} at (0,319.34) size 453.53x134.19 + LayoutInline {P} at (0,0) size 431x28 + LayoutInline {SPAN} at (0,0) size 431x28 + LayoutText {#text} at (11,0) size 431x28 + text run at (11,0) width 431: "Littering a dark and dreary road lay the past relics of browser-" + text run at (11,14) width 197: "specific tags, incompatible " + LayoutInline {ACRONYM} at (0,0) size 33x14 + LayoutText {#text} at (207,14) size 33x14 + text run at (207,14) width 33: "DOM" + LayoutText {#text} at (239,14) size 112x14 + text run at (239,14) width 112: "s, and broken " + LayoutInline {ACRONYM} at (0,0) size 28x14 + LayoutText {#text} at (350,14) size 28x14 + text run at (350,14) width 28: "CSS" + LayoutText {#text} at (377,14) size 65x14 + text run at (377,14) width 65: " support." + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {P} at (0,0) size 431x42 + LayoutInline {SPAN} at (0,0) size 431x42 + LayoutText {#text} at (11,28) size 431x42 + text run at (11,28) width 431: "Today, we must clear the mind of past practices. Web" + text run at (11,42) width 431: "enlightenment has been achieved thanks to the tireless efforts of" + text run at (11,56) width 89: "folk like the " + LayoutInline {ACRONYM} at (0,0) size 33x14 + LayoutText {#text} at (99,56) size 33x14 + text run at (99,56) width 33: "W3C" + LayoutText {#text} at (131,56) size 11x14 + text run at (131,56) width 11: ", " + LayoutInline {ACRONYM} at (0,0) size 41x14 + LayoutText {#text} at (141,56) size 41x14 + text run at (141,56) width 41: "WaSP" + LayoutText {#text} at (181,56) size 230x14 + text run at (181,56) width 230: " and the major browser creators." + LayoutText {#text} at (410,56) size 8x14 + text run at (410,56) width 8: " " + LayoutInline {P} at (0,0) size 431x70 + LayoutInline {SPAN} at (0,0) size 431x70 + LayoutText {#text} at (417,56) size 431x70 + text run at (417,56) width 25: "The" + text run at (11,70) width 431: "css Zen Garden invites you to relax and meditate on the" + text run at (11,84) width 431: "important lessons of the masters. Begin to see with clarity. Learn" + text run at (11,98) width 431: "to use the (yet to be) time-honored techniques in new and" + text run at (11,112) width 314: "invigorating fashion. Become one with the web." + LayoutText {#text} at (0,0) size 0x0 +layer at (321,235) size 306x80 + LayoutBlockFlow (positioned) {H3} at (148.19,-115.88) size 305.34x80 [color=#CCCC77] [bgcolor=#888811] [border: (3px solid #888811) none (3px solid #888811)] + LayoutInline {SPAN} at (0,0) size 277x83 + LayoutText {#text} at (45,-2) size 277x83 + text run at (45,-2) width 231: "The Road to" + text run at (3,35) width 277: "Enlightenment" diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font-expected.txt index b1fd1c4..930ee76 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4402 +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4396 LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4402 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4402.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4386.33 [bgcolor=#CCCCCC] +layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 + LayoutBlockFlow {HTML} at (0,0) size 785x4396.33 + LayoutBlockFlow {BODY} at (8,8) size 769x4380.33 [bgcolor=#CCCCCC] LayoutBlockFlow {P} at (0,0) size 769x16 LayoutText {#text} at (0,0) size 274x15 text run at (0,0) width 274: "The style declarations which apply to the text below are:" @@ -106,12 +106,12 @@ layer at (0,0) size 785x4402 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,79) width 177: "element's font size). " text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" text run at (0,115) width 91: "effectively." - LayoutBlockFlow {P} at (0,1592.33) size 769x50 - LayoutText {#text} at (0,6) size 760x38 - text run at (0,6) width 305: "This element should be in a sans-serif font, with a weight of 400. " - text run at (305,6) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." - text run at (0,31) width 323: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1660.33) size 769x270 + LayoutBlockFlow {P} at (0,1592.33) size 769x46 + LayoutText {#text} at (0,5) size 760x36 + text run at (0,5) width 305: "This element should be in a sans-serif font, with a weight of 400. " + text run at (305,5) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." + text run at (0,28) width 323: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,1656.33) size 769x270 LayoutInline {SPAN} at (0,0) size 759x238 [bgcolor=#C0C0C0] LayoutText {#text} at (0,16) size 759x238 text run at (0,16) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " @@ -121,18 +121,18 @@ layer at (0,0) size 785x4402 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,178) width 735: "has been set on an inline element and should therefore only cover the text, not the interline" text run at (0,232) width 64: "spacing." LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1948.33) size 769x2438 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2436 + LayoutTable {TABLE} at (0,1944.33) size 769x2436 [border: (1px outset #808080)] + LayoutTableSection {TBODY} at (1,1) size 767x2434 LayoutTableRow {TR} at (0,0) size 767x28 LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] LayoutInline {STRONG} at (0,0) size 157x19 LayoutText {#text} at (4,4) size 157x19 text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x2408 - LayoutTableCell {TD} at (0,1218) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + LayoutTableRow {TR} at (0,28) size 767x2406 + LayoutTableCell {TD} at (0,1217) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x2408.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + LayoutTableCell {TD} at (12,28) size 755x2406.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] LayoutBlockFlow {P} at (4,4) size 747x40 LayoutText {#text} at (0,0) size 738x39 text run at (0,0) width 531: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " @@ -211,13 +211,13 @@ layer at (0,0) size 785x4402 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,79) width 177: "element's font size). " text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" text run at (0,115) width 91: "effectively." - LayoutBlockFlow {P} at (4,1884.33) size 747x64 - LayoutText {#text} at (0,8) size 742x48 - text run at (0,8) width 374: "This element should be in a sans-serif font, with a weight of 400. " - text run at (374,8) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,40) width 196: "shoud be 2.5 times that, or 24px. " - text run at (196,40) width 398: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1972.33) size 747x432 + LayoutBlockFlow {P} at (4,1884.33) size 747x62 + LayoutText {#text} at (0,7) size 742x47 + text run at (0,7) width 374: "This element should be in a sans-serif font, with a weight of 400. " + text run at (374,7) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" + text run at (0,38) width 196: "shoud be 2.5 times that, or 24px. " + text run at (196,38) width 398: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,1970.33) size 747x432 LayoutInline {SPAN} at (0,0) size 747x388 [bgcolor=#C0C0C0] LayoutText {#text} at (0,22) size 747x388 text run at (0,22) width 701: "This element should be in a sans-serif font, italicized and small caps," diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-02-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-02-d-agi-expected.png Binary files differindex 760dc79..e530f65 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-02-d-agi-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-02-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-02-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-02-d-agi-expected.txt index 9809d01..f11f6ce 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-02-d-agi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-02-d-agi-expected.txt @@ -1,84 +1,84 @@ layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x360 - LayoutBlockFlow {HTML} at (0,0) size 800x360 - LayoutBlockFlow {BODY} at (8,16) size 784x329 +layer at (0,0) size 800x359 + LayoutBlockFlow {HTML} at (0,0) size 800x359 + LayoutBlockFlow {BODY} at (8,16) size 784x328 LayoutBlockFlow {P} at (0,0) size 784x40 LayoutText {#text} at (0,0) size 765x39 text run at (0,0) width 365: "Change your window size. However the lines wrap, the blue " text run at (365,0) width 400: "rectanglues should always have their tops on the same alignment as" text run at (0,20) width 193: "other blue rectangles on the line." - LayoutBlockFlow {P} at (15,56) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] - LayoutText {#text} at (8,26) size 61x16 - text run at (8,26) width 61: "xxx " - LayoutImage {IMG} at (68.50,26.50) size 30x30 - LayoutText {#text} at (98,26) size 16x16 - text run at (98,26) width 16: " " + LayoutBlockFlow {P} at (15,56) size 754x272 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] + LayoutText {#text} at (8,25) size 61x16 + text run at (8,25) width 61: "xxx " + LayoutImage {IMG} at (68.50,25.50) size 30x30 + LayoutText {#text} at (98,25) size 16x16 + text run at (98,25) width 16: " " LayoutInline {SPAN} at (0,0) size 115x39 [color=#C0C0C0] - LayoutText {#text} at (113,8) size 115x39 - text run at (113,8) width 115: "xxx" - LayoutText {#text} at (227,26) size 16x16 - text run at (227,26) width 16: " " - LayoutImage {IMG} at (242.50,26.50) size 50x50 - LayoutText {#text} at (292,26) size 16x16 - text run at (292,26) width 16: " " + LayoutText {#text} at (113,7) size 115x39 + text run at (113,7) width 115: "xxx" + LayoutText {#text} at (227,25) size 16x16 + text run at (227,25) width 16: " " + LayoutImage {IMG} at (242.50,25.50) size 50x50 + LayoutText {#text} at (292,25) size 16x16 + text run at (292,25) width 16: " " LayoutInline {BIG} at (0,0) size 61x21 [color=#C0C0C0] - LayoutText {#text} at (307,22) size 61x21 - text run at (307,22) width 61: "xxx" - LayoutText {#text} at (367,26) size 16x16 - text run at (367,26) width 16: " " - LayoutImage {IMG} at (382.50,26.50) size 10x10 - LayoutText {#text} at (392,26) size 16x16 - text run at (392,26) width 16: " " + LayoutText {#text} at (307,21) size 61x21 + text run at (307,21) width 61: "xxx" + LayoutText {#text} at (367,25) size 16x16 + text run at (367,25) width 16: " " + LayoutImage {IMG} at (382.50,25.50) size 10x10 + LayoutText {#text} at (392,25) size 16x16 + text run at (392,25) width 16: " " LayoutInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0] - LayoutText {#text} at (407,30) size 31x11 - text run at (407,30) width 31: "xxx" - LayoutText {#text} at (437,26) size 16x16 - text run at (437,26) width 16: " " - LayoutImage {IMG} at (452.50,26.50) size 20x20 - LayoutText {#text} at (472,26) size 76x16 - text run at (472,26) width 16: " " - text run at (487,26) width 61: "xxx " - LayoutImage {IMG} at (547.50,26.50) size 65x65 - LayoutText {#text} at (612,26) size 16x16 - text run at (612,26) width 16: " " + LayoutText {#text} at (407,29) size 31x11 + text run at (407,29) width 31: "xxx" + LayoutText {#text} at (437,25) size 16x16 + text run at (437,25) width 16: " " + LayoutImage {IMG} at (452.50,25.50) size 20x20 + LayoutText {#text} at (472,25) size 76x16 + text run at (472,25) width 16: " " + text run at (487,25) width 61: "xxx " + LayoutImage {IMG} at (547.50,25.50) size 65x65 + LayoutText {#text} at (612,25) size 16x16 + text run at (612,25) width 16: " " LayoutInline {SPAN} at (0,0) size 91x31 [color=#C0C0C0] - LayoutText {#text} at (627,14) size 91x31 - text run at (627,14) width 91: "xxx" + LayoutText {#text} at (627,13) size 91x31 + text run at (627,13) width 91: "xxx" LayoutText {#text} at (0,0) size 0x0 - LayoutImage {IMG} at (8.50,124.50) size 35x35 - LayoutText {#text} at (43,124) size 76x16 - text run at (43,124) width 16: " " - text run at (58,124) width 61: "xxx " - LayoutImage {IMG} at (118.50,124.50) size 30x30 - LayoutText {#text} at (148,124) size 16x16 - text run at (148,124) width 16: " " + LayoutImage {IMG} at (8.50,123.50) size 35x35 + LayoutText {#text} at (43,123) size 76x16 + text run at (43,123) width 16: " " + text run at (58,123) width 61: "xxx " + LayoutImage {IMG} at (118.50,123.50) size 30x30 + LayoutText {#text} at (148,123) size 16x16 + text run at (148,123) width 16: " " LayoutInline {SPAN} at (0,0) size 353x24 [color=#C0C0C0] - LayoutText {#text} at (163,118) size 93x24 - text run at (163,118) width 93: "xxx " + LayoutText {#text} at (163,117) size 93x24 + text run at (163,117) width 93: "xxx " LayoutInline {SPAN} at (0,0) size 169x57 - LayoutText {#text} at (255,91) size 169x57 - text run at (255,91) width 169: "xxx" - LayoutText {#text} at (423,118) size 93x24 - text run at (423,118) width 93: " xxx" - LayoutText {#text} at (515,124) size 16x16 - text run at (515,124) width 16: " " - LayoutImage {IMG} at (530.50,124.50) size 50x50 - LayoutText {#text} at (580,124) size 16x16 - text run at (580,124) width 16: " " + LayoutText {#text} at (255,90) size 169x57 + text run at (255,90) width 169: "xxx" + LayoutText {#text} at (423,117) size 93x24 + text run at (423,117) width 93: " xxx" + LayoutText {#text} at (515,123) size 16x16 + text run at (515,123) width 16: " " + LayoutImage {IMG} at (530.50,123.50) size 50x50 + LayoutText {#text} at (580,123) size 16x16 + text run at (580,123) width 16: " " LayoutInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0] - LayoutText {#text} at (595,128) size 31x11 - text run at (595,128) width 31: "xxx" - LayoutText {#text} at (625,124) size 16x16 - text run at (625,124) width 16: " " - LayoutImage {IMG} at (640.50,124.50) size 15x15 - LayoutText {#text} at (655,124) size 16x16 - text run at (655,124) width 16: " " + LayoutText {#text} at (595,127) size 31x11 + text run at (595,127) width 31: "xxx" + LayoutText {#text} at (625,123) size 16x16 + text run at (625,123) width 16: " " + LayoutImage {IMG} at (640.50,123.50) size 15x15 + LayoutText {#text} at (655,123) size 16x16 + text run at (655,123) width 16: " " LayoutInline {BIG} at (0,0) size 61x21 [color=#C0C0C0] - LayoutText {#text} at (670,120) size 61x21 - text run at (670,120) width 61: "xxx" + LayoutText {#text} at (670,119) size 61x21 + text run at (670,119) width 61: "xxx" LayoutText {#text} at (0,0) size 0x0 - LayoutImage {IMG} at (8.50,174.50) size 90x90 - LayoutText {#text} at (98,174) size 61x16 - text run at (98,174) width 16: " " - text run at (113,174) width 46: "xxx" + LayoutImage {IMG} at (8.50,173.50) size 90x90 + LayoutText {#text} at (98,173) size 61x16 + text run at (98,173) width 16: " " + text run at (113,173) width 46: "xxx" diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-04-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-04-d-agi-expected.png Binary files differindex 4370037..0e97ef8 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-04-d-agi-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-04-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-04-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-04-d-agi-expected.txt index cdd5edf..3edb3d1 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-04-d-agi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t100801-c544-valgn-04-d-agi-expected.txt @@ -18,8 +18,8 @@ layer at (0,0) size 800x259 LayoutText {#text} at (78,8) size 16x16 text run at (78,8) width 16: " " LayoutInline {SPAN} at (0,0) size 115x39 - LayoutText {#text} at (93,8) size 115x39 - text run at (93,8) width 115: "xxx" + LayoutText {#text} at (93,7) size 115x39 + text run at (93,7) width 115: "xxx" LayoutText {#text} at (207,8) size 16x16 text run at (207,8) width 16: " " LayoutImage {IMG} at (222.50,8.50) size 10x10 diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1508-c527-font-09-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1508-c527-font-09-b-expected.png Binary files differindex 6b58503..22ba0d5 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1508-c527-font-09-b-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1508-c527-font-09-b-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1508-c527-font-09-b-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1508-c527-font-09-b-expected.txt index 3d858b8..caf444f 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1508-c527-font-09-b-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1508-c527-font-09-b-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x144 - LayoutBlockFlow {HTML} at (0,0) size 800x144.19 - LayoutBlockFlow {BODY} at (8,9.59) size 784x125 [color=#000080] - LayoutBlockFlow {P} at (0,0) size 784x125 - LayoutText {#text} at (0,6) size 476x13 - text run at (0,6) width 476: "This test should be about 10px, sans-serif, and light. There should be about 15px between each line. " - LayoutInline {SPAN} at (0,0) size 763x113 [color=#C0C0C0] - LayoutText {#text} at (476,6) size 763x113 - text run at (476,6) width 287: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,31) width 38: "dummy " - text run at (38,31) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (386,31) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (734,31) width 17: "text" - text run at (0,56) width 328: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (328,56) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (676,56) width 75: "text dummy text" - text run at (0,81) width 270: "dummy text dummy text dummy text dummy text dummy " - text run at (270,81) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (618,81) width 133: "text dummy text dummy text" - text run at (0,106) width 171: "dummy text dummy text dummy text" +layer at (0,0) size 800x134 + LayoutBlockFlow {HTML} at (0,0) size 800x134.19 + LayoutBlockFlow {BODY} at (8,9.59) size 784x115 [color=#000080] + LayoutBlockFlow {P} at (0,0) size 784x115 + LayoutText {#text} at (0,5) size 476x13 + text run at (0,5) width 476: "This test should be about 10px, sans-serif, and light. There should be about 15px between each line. " + LayoutInline {SPAN} at (0,0) size 763x105 [color=#C0C0C0] + LayoutText {#text} at (476,5) size 763x105 + text run at (476,5) width 287: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,28) width 38: "dummy " + text run at (38,28) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (386,28) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (734,28) width 17: "text" + text run at (0,51) width 328: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (328,51) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (676,51) width 75: "text dummy text" + text run at (0,74) width 270: "dummy text dummy text dummy text dummy text dummy " + text run at (270,74) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (618,74) width 133: "text dummy text dummy text" + text run at (0,97) width 171: "dummy text dummy text dummy text" LayoutText {#text} at (0,0) size 0x0 diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.png Binary files differindex 8788167..751ddce 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.txt index 925096d..e5e93fe 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.txt @@ -19,12 +19,12 @@ layer at (173,32) size 454x454 LayoutInline {SPAN} at (0,0) size 0x0 LayoutBlockFlow {DIV} at (0,0) size 453.53x0 LayoutInline {SPAN} at (0,0) size 0x0 -layer at (173,47) size 454x188 - LayoutBlockFlow (positioned) {H1} at (0,15.11) size 453.53x188 [color=#DD9955] - LayoutInline {SPAN} at (0,0) size 341x189 - LayoutText {#text} at (64,-1) size 341x189 - text run at (64,-1) width 326: "CSS ZEN" - text run at (56,93) width 341: "GARDEN" +layer at (173,47) size 454x190 + LayoutBlockFlow (positioned) {H1} at (0,15.11) size 453.53x190 [color=#DD9955] + LayoutInline {SPAN} at (0,0) size 341x190 + LayoutText {#text} at (64,0) size 341x190 + text run at (64,0) width 326: "CSS ZEN" + text run at (56,95) width 341: "GARDEN" layer at (173,119) size 454x22 LayoutBlockFlow (positioned) {H2} at (0,87.47) size 453.53x22 [color=#EEFF00] LayoutInline {SPAN} at (0,0) size 203x21 diff --git a/third_party/WebKit/LayoutTests/platform/mac-snowleopard/css1/font_properties/font-expected.png b/third_party/WebKit/LayoutTests/platform/mac-snowleopard/css1/font_properties/font-expected.png Binary files differindex 934e537..a881496 100644 --- a/third_party/WebKit/LayoutTests/platform/mac-snowleopard/css1/font_properties/font-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac-snowleopard/css1/font_properties/font-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/mac-snowleopard/css1/font_properties/font-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-snowleopard/css1/font_properties/font-expected.txt index a1670db..4263b7f 100644 --- a/third_party/WebKit/LayoutTests/platform/mac-snowleopard/css1/font_properties/font-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac-snowleopard/css1/font_properties/font-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4413 +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4407 LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4413 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4413.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4397.33 [bgcolor=#CCCCCC] +layer at (0,0) size 785x4407 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 + LayoutBlockFlow {HTML} at (0,0) size 785x4407.33 + LayoutBlockFlow {BODY} at (8,8) size 769x4391.33 [bgcolor=#CCCCCC] LayoutBlockFlow {P} at (0,0) size 769x14 LayoutText {#text} at (0,0) size 272x14 text run at (0,0) width 272: "The style declarations which apply to the text below are:" @@ -106,13 +106,13 @@ layer at (0,0) size 785x4413 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,79) width 177: "element's font size). " text run at (176,79) width 501: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (0,1573.33) size 769x50 - LayoutText {#text} at (0,7) size 742x35 - text run at (0,7) width 276: "This element should be in a sans-serif font, with a weight of 400. " - text run at (275,7) width 417: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px. " - text run at (691,7) width 51: "Extra text is" - text run at (0,32) width 239: "included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1641.33) size 769x270 + LayoutBlockFlow {P} at (0,1573.33) size 769x46 + LayoutText {#text} at (0,6) size 742x33 + text run at (0,6) width 276: "This element should be in a sans-serif font, with a weight of 400. " + text run at (275,6) width 417: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px. " + text run at (691,6) width 51: "Extra text is" + text run at (0,29) width 239: "included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,1637.33) size 769x270 LayoutInline {SPAN} at (0,0) size 758x237 [bgcolor=#C0C0C0] LayoutText {#text} at (0,16) size 758x237 text run at (0,16) width 719: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " @@ -122,18 +122,18 @@ layer at (0,0) size 785x4413 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,178) width 737: "has been set on an inline element and should therefore only cover the text, not the interline" text run at (0,232) width 63: "spacing." LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1929.33) size 769x2468 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2466 + LayoutTable {TABLE} at (0,1925.33) size 769x2466 [border: (1px outset #808080)] + LayoutTableSection {TBODY} at (1,1) size 767x2464 LayoutTableRow {TR} at (0,0) size 767x26 LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] LayoutInline {STRONG} at (0,0) size 161x18 LayoutText {#text} at (4,4) size 161x18 text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x2440 - LayoutTableCell {TD} at (0,1233) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + LayoutTableRow {TR} at (0,26) size 767x2438 + LayoutTableCell {TD} at (0,1232) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (4,4) size 4x18 text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x2440.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + LayoutTableCell {TD} at (12,26) size 755x2438.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] LayoutBlockFlow {P} at (4,4) size 747x36 LayoutText {#text} at (0,0) size 746x36 text run at (0,0) width 575: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " @@ -214,13 +214,13 @@ layer at (0,0) size 785x4413 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,79) width 177: "element's font size). " text run at (176,79) width 501: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (4,1916.33) size 747x64 - LayoutText {#text} at (0,8) size 728x47 + LayoutBlockFlow {P} at (4,1916.33) size 747x62 + LayoutText {#text} at (0,8) size 728x46 text run at (0,8) width 368: "This element should be in a sans-serif font, with a weight of 400. " text run at (367,8) width 361: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,40) width 190: "shoud be 2.5 times that, or 24px. " - text run at (189,40) width 390: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,2004.33) size 747x432 + text run at (0,39) width 190: "shoud be 2.5 times that, or 24px. " + text run at (189,39) width 390: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,2002.33) size 747x432 LayoutInline {SPAN} at (0,0) size 726x388 [bgcolor=#C0C0C0] LayoutText {#text} at (0,22) size 726x388 text run at (0,22) width 711: "This element should be in a sans-serif font, italicized and small caps," diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font-expected.txt index 6dfee50..63da452 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4233 +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4227 LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4233 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4233.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4217.33 [bgcolor=#CCCCCC] +layer at (0,0) size 785x4227 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 + LayoutBlockFlow {HTML} at (0,0) size 785x4227.33 + LayoutBlockFlow {BODY} at (8,8) size 769x4211.33 [bgcolor=#CCCCCC] LayoutBlockFlow {P} at (0,0) size 769x14 LayoutText {#text} at (0,0) size 272x14 text run at (0,0) width 272: "The style declarations which apply to the text below are:" @@ -105,13 +105,13 @@ layer at (0,0) size 785x4233 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,79) width 177: "element's font size). " text run at (176,79) width 501: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (0,1519.33) size 769x50 - LayoutText {#text} at (0,7) size 742x35 - text run at (0,7) width 276: "This element should be in a sans-serif font, with a weight of 400. " - text run at (275,7) width 417: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px. " - text run at (691,7) width 51: "Extra text is" - text run at (0,32) width 239: "included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1587.33) size 769x216 + LayoutBlockFlow {P} at (0,1519.33) size 769x46 + LayoutText {#text} at (0,6) size 742x33 + text run at (0,6) width 276: "This element should be in a sans-serif font, with a weight of 400. " + text run at (275,6) width 417: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px. " + text run at (691,6) width 51: "Extra text is" + text run at (0,29) width 239: "included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,1583.33) size 769x216 LayoutInline {SPAN} at (0,0) size 765x183 [bgcolor=#C0C0C0] LayoutText {#text} at (0,16) size 765x183 text run at (0,16) width 699: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " @@ -120,18 +120,18 @@ layer at (0,0) size 785x4233 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,124) width 753: "54px, respectively). The text should have a silver background. The background color has been set" text run at (0,178) width 678: "on an inline element and should therefore only cover the text, not the interline spacing." LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1821.33) size 769x2396 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2394 + LayoutTable {TABLE} at (0,1817.33) size 769x2394 [border: (1px outset #808080)] + LayoutTableSection {TBODY} at (1,1) size 767x2392 LayoutTableRow {TR} at (0,0) size 767x26 LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] LayoutInline {STRONG} at (0,0) size 161x18 LayoutText {#text} at (4,4) size 161x18 text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x2368 - LayoutTableCell {TD} at (0,1197) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + LayoutTableRow {TR} at (0,26) size 767x2366 + LayoutTableCell {TD} at (0,1196) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (4,4) size 4x18 text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x2368.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + LayoutTableCell {TD} at (12,26) size 755x2366.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] LayoutBlockFlow {P} at (4,4) size 747x36 LayoutText {#text} at (0,0) size 746x36 text run at (0,0) width 575: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " @@ -210,13 +210,13 @@ layer at (0,0) size 785x4233 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,79) width 177: "element's font size). " text run at (176,79) width 501: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (4,1844.33) size 747x64 - LayoutText {#text} at (0,8) size 728x47 + LayoutBlockFlow {P} at (4,1844.33) size 747x62 + LayoutText {#text} at (0,8) size 728x46 text run at (0,8) width 368: "This element should be in a sans-serif font, with a weight of 400. " text run at (367,8) width 361: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,40) width 190: "shoud be 2.5 times that, or 24px. " - text run at (189,40) width 390: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1932.33) size 747x432 + text run at (0,39) width 190: "shoud be 2.5 times that, or 24px. " + text run at (189,39) width 390: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,1930.33) size 747x432 LayoutInline {SPAN} at (0,0) size 739x388 [bgcolor=#C0C0C0] LayoutText {#text} at (0,22) size 739x388 text run at (0,22) width 739: "This element should be in a sans-serif font, italicized and small caps, with" diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-02-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-02-d-agi-expected.png Binary files differindex 7f7303f..f0a3d35 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-02-d-agi-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-02-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-02-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-02-d-agi-expected.txt index a7dc106..b9a103a 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-02-d-agi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-02-d-agi-expected.txt @@ -1,85 +1,85 @@ layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x356 - LayoutBlockFlow {HTML} at (0,0) size 800x356 - LayoutBlockFlow {BODY} at (8,16) size 784x325 +layer at (0,0) size 800x355 + LayoutBlockFlow {HTML} at (0,0) size 800x355 + LayoutBlockFlow {BODY} at (8,16) size 784x324 LayoutBlockFlow {P} at (0,0) size 784x36 LayoutText {#text} at (0,0) size 737x36 text run at (0,0) width 391: "Change your window size. However the lines wrap, the blue " text run at (390,0) width 347: "rectanglues should always have their tops on the same" text run at (0,18) width 86: "alignment as " text run at (85,18) width 210: "other blue rectangles on the line." - LayoutBlockFlow {P} at (15,52) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] - LayoutText {#text} at (8,26) size 61x16 - text run at (8,26) width 61: "xxx " - LayoutImage {IMG} at (68.50,26.50) size 30x30 - LayoutText {#text} at (98,26) size 16x16 - text run at (98,26) width 16: " " + LayoutBlockFlow {P} at (15,52) size 754x272 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] + LayoutText {#text} at (8,25) size 61x16 + text run at (8,25) width 61: "xxx " + LayoutImage {IMG} at (68.50,25.50) size 30x30 + LayoutText {#text} at (98,25) size 16x16 + text run at (98,25) width 16: " " LayoutInline {SPAN} at (0,0) size 113x39 [color=#C0C0C0] - LayoutText {#text} at (113,8) size 113x39 - text run at (113,8) width 113: "xxx" - LayoutText {#text} at (226,26) size 15x16 - text run at (226,26) width 15: " " - LayoutImage {IMG} at (241,26.50) size 50x50 - LayoutText {#text} at (291,26) size 15x16 - text run at (291,26) width 15: " " + LayoutText {#text} at (113,7) size 113x39 + text run at (113,7) width 113: "xxx" + LayoutText {#text} at (226,25) size 15x16 + text run at (226,25) width 15: " " + LayoutImage {IMG} at (241,25.50) size 50x50 + LayoutText {#text} at (291,25) size 15x16 + text run at (291,25) width 15: " " LayoutInline {BIG} at (0,0) size 60x21 [color=#C0C0C0] - LayoutText {#text} at (306,22) size 60x21 - text run at (306,22) width 60: "xxx" - LayoutText {#text} at (366,26) size 15x16 - text run at (366,26) width 15: " " - LayoutImage {IMG} at (381,26.50) size 10x10 - LayoutText {#text} at (391,26) size 15x16 - text run at (391,26) width 15: " " + LayoutText {#text} at (306,21) size 60x21 + text run at (306,21) width 60: "xxx" + LayoutText {#text} at (366,25) size 15x16 + text run at (366,25) width 15: " " + LayoutImage {IMG} at (381,25.50) size 10x10 + LayoutText {#text} at (391,25) size 15x16 + text run at (391,25) width 15: " " LayoutInline {SMALL} at (0,0) size 30x11 [color=#C0C0C0] - LayoutText {#text} at (406,30) size 30x11 - text run at (406,30) width 30: "xxx" - LayoutText {#text} at (436,26) size 15x16 - text run at (436,26) width 15: " " - LayoutImage {IMG} at (451,26.50) size 20x20 - LayoutText {#text} at (471,26) size 75x16 - text run at (471,26) width 15: " " - text run at (486,26) width 60: "xxx " - LayoutImage {IMG} at (546,26.50) size 65x65 - LayoutText {#text} at (611,26) size 15x16 - text run at (611,26) width 15: " " + LayoutText {#text} at (406,29) size 30x11 + text run at (406,29) width 30: "xxx" + LayoutText {#text} at (436,25) size 15x16 + text run at (436,25) width 15: " " + LayoutImage {IMG} at (451,25.50) size 20x20 + LayoutText {#text} at (471,25) size 75x16 + text run at (471,25) width 15: " " + text run at (486,25) width 60: "xxx " + LayoutImage {IMG} at (546,25.50) size 65x65 + LayoutText {#text} at (611,25) size 15x16 + text run at (611,25) width 15: " " LayoutInline {SPAN} at (0,0) size 90x31 [color=#C0C0C0] - LayoutText {#text} at (626,14) size 90x31 - text run at (626,14) width 90: "xxx" + LayoutText {#text} at (626,13) size 90x31 + text run at (626,13) width 90: "xxx" LayoutText {#text} at (0,0) size 0x0 - LayoutImage {IMG} at (8.50,124.50) size 35x35 - LayoutText {#text} at (43,124) size 76x16 - text run at (43,124) width 16: " " - text run at (58,124) width 61: "xxx " - LayoutImage {IMG} at (118.50,124.50) size 30x30 - LayoutText {#text} at (148,124) size 16x16 - text run at (148,124) width 16: " " + LayoutImage {IMG} at (8.50,123.50) size 35x35 + LayoutText {#text} at (43,123) size 76x16 + text run at (43,123) width 16: " " + text run at (58,123) width 61: "xxx " + LayoutImage {IMG} at (118.50,123.50) size 30x30 + LayoutText {#text} at (148,123) size 16x16 + text run at (148,123) width 16: " " LayoutInline {SPAN} at (0,0) size 350x24 [color=#C0C0C0] - LayoutText {#text} at (163,118) size 91x24 - text run at (163,118) width 91: "xxx " + LayoutText {#text} at (163,117) size 91x24 + text run at (163,117) width 91: "xxx " LayoutInline {SPAN} at (0,0) size 170x57 - LayoutText {#text} at (253,91) size 170x57 - text run at (253,91) width 170: "xxx" - LayoutText {#text} at (422,118) size 91x24 - text run at (422,118) width 91: " xxx" - LayoutText {#text} at (512,124) size 16x16 - text run at (512,124) width 16: " " - LayoutImage {IMG} at (527.25,124.50) size 50x50 - LayoutText {#text} at (577,124) size 16x16 - text run at (577,124) width 16: " " + LayoutText {#text} at (253,90) size 170x57 + text run at (253,90) width 170: "xxx" + LayoutText {#text} at (422,117) size 91x24 + text run at (422,117) width 91: " xxx" + LayoutText {#text} at (512,123) size 16x16 + text run at (512,123) width 16: " " + LayoutImage {IMG} at (527.25,123.50) size 50x50 + LayoutText {#text} at (577,123) size 16x16 + text run at (577,123) width 16: " " LayoutInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0] - LayoutText {#text} at (592,128) size 31x11 - text run at (592,128) width 31: "xxx" - LayoutText {#text} at (622,124) size 16x16 - text run at (622,124) width 16: " " - LayoutImage {IMG} at (637.25,124.50) size 15x15 - LayoutText {#text} at (652,124) size 16x16 - text run at (652,124) width 16: " " + LayoutText {#text} at (592,127) size 31x11 + text run at (592,127) width 31: "xxx" + LayoutText {#text} at (622,123) size 16x16 + text run at (622,123) width 16: " " + LayoutImage {IMG} at (637.25,123.50) size 15x15 + LayoutText {#text} at (652,123) size 16x16 + text run at (652,123) width 16: " " LayoutInline {BIG} at (0,0) size 61x21 [color=#C0C0C0] - LayoutText {#text} at (667,120) size 61x21 - text run at (667,120) width 61: "xxx" + LayoutText {#text} at (667,119) size 61x21 + text run at (667,119) width 61: "xxx" LayoutText {#text} at (0,0) size 0x0 - LayoutImage {IMG} at (8.50,174.50) size 90x90 - LayoutText {#text} at (98,174) size 61x16 - text run at (98,174) width 16: " " - text run at (113,174) width 46: "xxx" + LayoutImage {IMG} at (8.50,173.50) size 90x90 + LayoutText {#text} at (98,173) size 61x16 + text run at (98,173) width 16: " " + text run at (113,173) width 46: "xxx" diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-04-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-04-d-agi-expected.png Binary files differindex a6ff0bc..b0418b6 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-04-d-agi-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-04-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-04-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-04-d-agi-expected.txt index 96f9def..e53f5d2 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-04-d-agi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t100801-c544-valgn-04-d-agi-expected.txt @@ -19,8 +19,8 @@ layer at (0,0) size 800x255 LayoutText {#text} at (78,8) size 16x16 text run at (78,8) width 16: " " LayoutInline {SPAN} at (0,0) size 113x39 - LayoutText {#text} at (93,8) size 113x39 - text run at (93,8) width 113: "xxx" + LayoutText {#text} at (93,7) size 113x39 + text run at (93,7) width 113: "xxx" LayoutText {#text} at (206,8) size 15x16 text run at (206,8) width 15: " " LayoutImage {IMG} at (221,8.50) size 10x10 diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1508-c527-font-09-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1508-c527-font-09-b-expected.png Binary files differindex c487f09..012b69f 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1508-c527-font-09-b-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1508-c527-font-09-b-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1508-c527-font-09-b-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1508-c527-font-09-b-expected.txt index b372751..c690a30 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1508-c527-font-09-b-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1508-c527-font-09-b-expected.txt @@ -1,22 +1,22 @@ layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x119 - LayoutBlockFlow {HTML} at (0,0) size 800x119.19 - LayoutBlockFlow {BODY} at (8,9.59) size 784x100 [color=#000080] - LayoutBlockFlow {P} at (0,0) size 784x100 - LayoutText {#text} at (0,7) size 430x10 - text run at (0,7) width 430: "This test should be about 10px, sans-serif, and light. There should be about 15px between each line. " - LayoutInline {SPAN} at (0,0) size 782x85 [color=#C0C0C0] - LayoutText {#text} at (429,7) size 782x85 - text run at (429,7) width 297: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (725,7) width 50: "text dummy" - text run at (0,32) width 262: "text dummy text dummy text dummy text dummy text dummy " - text run at (261,32) width 315: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (575,32) width 207: "text dummy text dummy text dummy text dummy" - text run at (0,57) width 105: "text dummy text dummy " - text run at (104,57) width 315: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (418,57) width 314: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (731,57) width 51: "text dummy" - text run at (0,82) width 262: "text dummy text dummy text dummy text dummy text dummy " - text run at (261,82) width 278: "text dummy text dummy text dummy text dummy text dummy text" +layer at (0,0) size 800x111 + LayoutBlockFlow {HTML} at (0,0) size 800x111.19 + LayoutBlockFlow {BODY} at (8,9.59) size 784x92 [color=#000080] + LayoutBlockFlow {P} at (0,0) size 784x92 + LayoutText {#text} at (0,6) size 430x10 + text run at (0,6) width 430: "This test should be about 10px, sans-serif, and light. There should be about 15px between each line. " + LayoutInline {SPAN} at (0,0) size 782x79 [color=#C0C0C0] + LayoutText {#text} at (429,6) size 782x79 + text run at (429,6) width 297: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (725,6) width 50: "text dummy" + text run at (0,29) width 262: "text dummy text dummy text dummy text dummy text dummy " + text run at (261,29) width 315: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (575,29) width 207: "text dummy text dummy text dummy text dummy" + text run at (0,52) width 105: "text dummy text dummy " + text run at (104,52) width 315: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (418,52) width 314: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (731,52) width 51: "text dummy" + text run at (0,75) width 262: "text dummy text dummy text dummy text dummy text dummy " + text run at (261,75) width 278: "text dummy text dummy text dummy text dummy text dummy text" LayoutText {#text} at (0,0) size 0x0 diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.png Binary files differindex 9e68af4..ea70468 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt index 5f789fa..4580b1a 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt @@ -19,12 +19,12 @@ layer at (173,32) size 454x454 LayoutInline {SPAN} at (0,0) size 0x0 LayoutBlockFlow {DIV} at (0,0) size 453.53x0 LayoutInline {SPAN} at (0,0) size 0x0 -layer at (173,47) size 454x188 - LayoutBlockFlow (positioned) {H1} at (0,15.11) size 453.53x188 [color=#DD9955] - LayoutInline {SPAN} at (0,0) size 343x191 - LayoutText {#text} at (62,-2) size 343x191 - text run at (62,-2) width 329: "CSS ZEN" - text run at (55,92) width 343: "GARDEN" +layer at (173,47) size 454x190 + LayoutBlockFlow (positioned) {H1} at (0,15.11) size 453.53x190 [color=#DD9955] + LayoutInline {SPAN} at (0,0) size 343x192 + LayoutText {#text} at (62,-1) size 343x192 + text run at (62,-1) width 329: "CSS ZEN" + text run at (55,94) width 343: "GARDEN" layer at (173,119) size 454x22 LayoutBlockFlow (positioned) {H2} at (0,87.47) size 453.53x22 [color=#EEFF00] LayoutInline {SPAN} at (0,0) size 206x22 diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/css1/font_properties/font-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/css1/font_properties/font-expected.txt index c82c3e1..ccc961b 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/css1/font_properties/font-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win-xp/css1/font_properties/font-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4402 +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4396 LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4402 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4402.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4386.33 [bgcolor=#CCCCCC] +layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 + LayoutBlockFlow {HTML} at (0,0) size 785x4396.33 + LayoutBlockFlow {BODY} at (8,8) size 769x4380.33 [bgcolor=#CCCCCC] LayoutBlockFlow {P} at (0,0) size 769x16 LayoutText {#text} at (0,0) size 274x15 text run at (0,0) width 274: "The style declarations which apply to the text below are:" @@ -106,12 +106,12 @@ layer at (0,0) size 785x4402 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,79) width 177: "element's font size). " text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (0,1592.33) size 769x50 - LayoutText {#text} at (0,6) size 760x38 - text run at (0,6) width 305: "This element should be in a sans-serif font, with a weight of 400. " - text run at (305,6) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." - text run at (0,31) width 321: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1660.33) size 769x270 + LayoutBlockFlow {P} at (0,1592.33) size 769x46 + LayoutText {#text} at (0,5) size 760x36 + text run at (0,5) width 305: "This element should be in a sans-serif font, with a weight of 400. " + text run at (305,5) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." + text run at (0,28) width 321: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,1656.33) size 769x270 LayoutInline {SPAN} at (0,0) size 761x238 [bgcolor=#C0C0C0] LayoutText {#text} at (0,16) size 761x238 text run at (0,16) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " @@ -121,18 +121,18 @@ layer at (0,0) size 785x4402 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,178) width 736: "has been set on an inline element and should therefore only cover the text, not the interline" text run at (0,232) width 64: "spacing." LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1948.33) size 769x2438 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2436 + LayoutTable {TABLE} at (0,1944.33) size 769x2436 [border: (1px outset #808080)] + LayoutTableSection {TBODY} at (1,1) size 767x2434 LayoutTableRow {TR} at (0,0) size 767x28 LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] LayoutInline {STRONG} at (0,0) size 159x19 LayoutText {#text} at (4,4) size 159x19 text run at (4,4) width 159: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x2408 - LayoutTableCell {TD} at (0,1218) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + LayoutTableRow {TR} at (0,28) size 767x2406 + LayoutTableCell {TD} at (0,1217) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x2408.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + LayoutTableCell {TD} at (12,28) size 755x2406.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] LayoutBlockFlow {P} at (4,4) size 747x40 LayoutText {#text} at (0,0) size 738x39 text run at (0,0) width 531: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " @@ -211,13 +211,13 @@ layer at (0,0) size 785x4402 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,79) width 177: "element's font size). " text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (4,1884.33) size 747x64 - LayoutText {#text} at (0,8) size 742x48 - text run at (0,8) width 374: "This element should be in a sans-serif font, with a weight of 400. " - text run at (374,8) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,40) width 196: "shoud be 2.5 times that, or 24px. " - text run at (196,40) width 399: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1972.33) size 747x432 + LayoutBlockFlow {P} at (4,1884.33) size 747x62 + LayoutText {#text} at (0,7) size 742x47 + text run at (0,7) width 374: "This element should be in a sans-serif font, with a weight of 400. " + text run at (374,7) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" + text run at (0,38) width 196: "shoud be 2.5 times that, or 24px. " + text run at (196,38) width 399: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,1970.33) size 747x432 LayoutInline {SPAN} at (0,0) size 717x388 [bgcolor=#C0C0C0] LayoutText {#text} at (0,22) size 717x388 text run at (0,22) width 702: "This element should be in a sans-serif font, italicized and small caps," diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-02-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-02-d-agi-expected.png Binary files differindex b5d62b1..b702fae 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-02-d-agi-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-02-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-02-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-02-d-agi-expected.txt index 9809d01..f11f6ce 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-02-d-agi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-02-d-agi-expected.txt @@ -1,84 +1,84 @@ layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x360 - LayoutBlockFlow {HTML} at (0,0) size 800x360 - LayoutBlockFlow {BODY} at (8,16) size 784x329 +layer at (0,0) size 800x359 + LayoutBlockFlow {HTML} at (0,0) size 800x359 + LayoutBlockFlow {BODY} at (8,16) size 784x328 LayoutBlockFlow {P} at (0,0) size 784x40 LayoutText {#text} at (0,0) size 765x39 text run at (0,0) width 365: "Change your window size. However the lines wrap, the blue " text run at (365,0) width 400: "rectanglues should always have their tops on the same alignment as" text run at (0,20) width 193: "other blue rectangles on the line." - LayoutBlockFlow {P} at (15,56) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] - LayoutText {#text} at (8,26) size 61x16 - text run at (8,26) width 61: "xxx " - LayoutImage {IMG} at (68.50,26.50) size 30x30 - LayoutText {#text} at (98,26) size 16x16 - text run at (98,26) width 16: " " + LayoutBlockFlow {P} at (15,56) size 754x272 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] + LayoutText {#text} at (8,25) size 61x16 + text run at (8,25) width 61: "xxx " + LayoutImage {IMG} at (68.50,25.50) size 30x30 + LayoutText {#text} at (98,25) size 16x16 + text run at (98,25) width 16: " " LayoutInline {SPAN} at (0,0) size 115x39 [color=#C0C0C0] - LayoutText {#text} at (113,8) size 115x39 - text run at (113,8) width 115: "xxx" - LayoutText {#text} at (227,26) size 16x16 - text run at (227,26) width 16: " " - LayoutImage {IMG} at (242.50,26.50) size 50x50 - LayoutText {#text} at (292,26) size 16x16 - text run at (292,26) width 16: " " + LayoutText {#text} at (113,7) size 115x39 + text run at (113,7) width 115: "xxx" + LayoutText {#text} at (227,25) size 16x16 + text run at (227,25) width 16: " " + LayoutImage {IMG} at (242.50,25.50) size 50x50 + LayoutText {#text} at (292,25) size 16x16 + text run at (292,25) width 16: " " LayoutInline {BIG} at (0,0) size 61x21 [color=#C0C0C0] - LayoutText {#text} at (307,22) size 61x21 - text run at (307,22) width 61: "xxx" - LayoutText {#text} at (367,26) size 16x16 - text run at (367,26) width 16: " " - LayoutImage {IMG} at (382.50,26.50) size 10x10 - LayoutText {#text} at (392,26) size 16x16 - text run at (392,26) width 16: " " + LayoutText {#text} at (307,21) size 61x21 + text run at (307,21) width 61: "xxx" + LayoutText {#text} at (367,25) size 16x16 + text run at (367,25) width 16: " " + LayoutImage {IMG} at (382.50,25.50) size 10x10 + LayoutText {#text} at (392,25) size 16x16 + text run at (392,25) width 16: " " LayoutInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0] - LayoutText {#text} at (407,30) size 31x11 - text run at (407,30) width 31: "xxx" - LayoutText {#text} at (437,26) size 16x16 - text run at (437,26) width 16: " " - LayoutImage {IMG} at (452.50,26.50) size 20x20 - LayoutText {#text} at (472,26) size 76x16 - text run at (472,26) width 16: " " - text run at (487,26) width 61: "xxx " - LayoutImage {IMG} at (547.50,26.50) size 65x65 - LayoutText {#text} at (612,26) size 16x16 - text run at (612,26) width 16: " " + LayoutText {#text} at (407,29) size 31x11 + text run at (407,29) width 31: "xxx" + LayoutText {#text} at (437,25) size 16x16 + text run at (437,25) width 16: " " + LayoutImage {IMG} at (452.50,25.50) size 20x20 + LayoutText {#text} at (472,25) size 76x16 + text run at (472,25) width 16: " " + text run at (487,25) width 61: "xxx " + LayoutImage {IMG} at (547.50,25.50) size 65x65 + LayoutText {#text} at (612,25) size 16x16 + text run at (612,25) width 16: " " LayoutInline {SPAN} at (0,0) size 91x31 [color=#C0C0C0] - LayoutText {#text} at (627,14) size 91x31 - text run at (627,14) width 91: "xxx" + LayoutText {#text} at (627,13) size 91x31 + text run at (627,13) width 91: "xxx" LayoutText {#text} at (0,0) size 0x0 - LayoutImage {IMG} at (8.50,124.50) size 35x35 - LayoutText {#text} at (43,124) size 76x16 - text run at (43,124) width 16: " " - text run at (58,124) width 61: "xxx " - LayoutImage {IMG} at (118.50,124.50) size 30x30 - LayoutText {#text} at (148,124) size 16x16 - text run at (148,124) width 16: " " + LayoutImage {IMG} at (8.50,123.50) size 35x35 + LayoutText {#text} at (43,123) size 76x16 + text run at (43,123) width 16: " " + text run at (58,123) width 61: "xxx " + LayoutImage {IMG} at (118.50,123.50) size 30x30 + LayoutText {#text} at (148,123) size 16x16 + text run at (148,123) width 16: " " LayoutInline {SPAN} at (0,0) size 353x24 [color=#C0C0C0] - LayoutText {#text} at (163,118) size 93x24 - text run at (163,118) width 93: "xxx " + LayoutText {#text} at (163,117) size 93x24 + text run at (163,117) width 93: "xxx " LayoutInline {SPAN} at (0,0) size 169x57 - LayoutText {#text} at (255,91) size 169x57 - text run at (255,91) width 169: "xxx" - LayoutText {#text} at (423,118) size 93x24 - text run at (423,118) width 93: " xxx" - LayoutText {#text} at (515,124) size 16x16 - text run at (515,124) width 16: " " - LayoutImage {IMG} at (530.50,124.50) size 50x50 - LayoutText {#text} at (580,124) size 16x16 - text run at (580,124) width 16: " " + LayoutText {#text} at (255,90) size 169x57 + text run at (255,90) width 169: "xxx" + LayoutText {#text} at (423,117) size 93x24 + text run at (423,117) width 93: " xxx" + LayoutText {#text} at (515,123) size 16x16 + text run at (515,123) width 16: " " + LayoutImage {IMG} at (530.50,123.50) size 50x50 + LayoutText {#text} at (580,123) size 16x16 + text run at (580,123) width 16: " " LayoutInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0] - LayoutText {#text} at (595,128) size 31x11 - text run at (595,128) width 31: "xxx" - LayoutText {#text} at (625,124) size 16x16 - text run at (625,124) width 16: " " - LayoutImage {IMG} at (640.50,124.50) size 15x15 - LayoutText {#text} at (655,124) size 16x16 - text run at (655,124) width 16: " " + LayoutText {#text} at (595,127) size 31x11 + text run at (595,127) width 31: "xxx" + LayoutText {#text} at (625,123) size 16x16 + text run at (625,123) width 16: " " + LayoutImage {IMG} at (640.50,123.50) size 15x15 + LayoutText {#text} at (655,123) size 16x16 + text run at (655,123) width 16: " " LayoutInline {BIG} at (0,0) size 61x21 [color=#C0C0C0] - LayoutText {#text} at (670,120) size 61x21 - text run at (670,120) width 61: "xxx" + LayoutText {#text} at (670,119) size 61x21 + text run at (670,119) width 61: "xxx" LayoutText {#text} at (0,0) size 0x0 - LayoutImage {IMG} at (8.50,174.50) size 90x90 - LayoutText {#text} at (98,174) size 61x16 - text run at (98,174) width 16: " " - text run at (113,174) width 46: "xxx" + LayoutImage {IMG} at (8.50,173.50) size 90x90 + LayoutText {#text} at (98,173) size 61x16 + text run at (98,173) width 16: " " + text run at (113,173) width 46: "xxx" diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-04-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-04-d-agi-expected.png Binary files differindex b9c94fd..23c3549 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-04-d-agi-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-04-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-04-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-04-d-agi-expected.txt index cdd5edf..3edb3d1 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-04-d-agi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win-xp/css2.1/t100801-c544-valgn-04-d-agi-expected.txt @@ -18,8 +18,8 @@ layer at (0,0) size 800x259 LayoutText {#text} at (78,8) size 16x16 text run at (78,8) width 16: " " LayoutInline {SPAN} at (0,0) size 115x39 - LayoutText {#text} at (93,8) size 115x39 - text run at (93,8) width 115: "xxx" + LayoutText {#text} at (93,7) size 115x39 + text run at (93,7) width 115: "xxx" LayoutText {#text} at (207,8) size 16x16 text run at (207,8) width 16: " " LayoutImage {IMG} at (222.50,8.50) size 10x10 diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font-expected.txt b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font-expected.txt index 30d4d03..c49d4e0 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4396 +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4390 LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4396.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4380.33 [bgcolor=#CCCCCC] +layer at (0,0) size 785x4390 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 + LayoutBlockFlow {HTML} at (0,0) size 785x4390.33 + LayoutBlockFlow {BODY} at (8,8) size 769x4374.33 [bgcolor=#CCCCCC] LayoutBlockFlow {P} at (0,0) size 769x16 LayoutText {#text} at (0,0) size 274x15 text run at (0,0) width 274: "The style declarations which apply to the text below are:" @@ -106,12 +106,12 @@ layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,80) width 177: "element's font size). " text run at (176,80) width 501: "Extra text is included for the purposes of testing this more" text run at (0,116) width 92: "effectively." - LayoutBlockFlow {P} at (0,1592.33) size 769x50 - LayoutText {#text} at (0,6) size 760x38 - text run at (0,6) width 305: "This element should be in a sans-serif font, with a weight of 400. " - text run at (305,6) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." - text run at (0,31) width 321: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1660.33) size 769x270 + LayoutBlockFlow {P} at (0,1592.33) size 769x46 + LayoutText {#text} at (0,5) size 760x36 + text run at (0,5) width 305: "This element should be in a sans-serif font, with a weight of 400. " + text run at (305,5) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." + text run at (0,28) width 321: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,1656.33) size 769x270 LayoutInline {SPAN} at (0,0) size 759x236 [bgcolor=#C0C0C0] LayoutText {#text} at (0,17) size 759x236 text run at (0,17) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " @@ -121,18 +121,18 @@ layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,179) width 735: "has been set on an inline element and should therefore only cover the text, not the interline" text run at (0,233) width 64: "spacing." LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1948.33) size 769x2432 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2430 + LayoutTable {TABLE} at (0,1944.33) size 769x2430 [border: (1px outset #808080)] + LayoutTableSection {TBODY} at (1,1) size 767x2428 LayoutTableRow {TR} at (0,0) size 767x26 LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] LayoutInline {STRONG} at (0,0) size 161x17 LayoutText {#text} at (4,4) size 161x17 text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x2404 - LayoutTableCell {TD} at (0,1215) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + LayoutTableRow {TR} at (0,26) size 767x2402 + LayoutTableCell {TD} at (0,1214) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x2404.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + LayoutTableCell {TD} at (12,26) size 755x2402.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] LayoutBlockFlow {P} at (4,4) size 747x36 LayoutText {#text} at (0,0) size 746x35 text run at (0,0) width 575: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " @@ -211,13 +211,13 @@ layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,80) width 177: "element's font size). " text run at (176,80) width 501: "Extra text is included for the purposes of testing this more" text run at (0,116) width 92: "effectively." - LayoutBlockFlow {P} at (4,1880.33) size 747x64 - LayoutText {#text} at (0,8) size 742x48 - text run at (0,8) width 374: "This element should be in a sans-serif font, with a weight of 400. " - text run at (374,8) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,40) width 196: "shoud be 2.5 times that, or 24px. " - text run at (196,40) width 398: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1968.33) size 747x432 + LayoutBlockFlow {P} at (4,1880.33) size 747x62 + LayoutText {#text} at (0,7) size 742x47 + text run at (0,7) width 374: "This element should be in a sans-serif font, with a weight of 400. " + text run at (374,7) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" + text run at (0,38) width 196: "shoud be 2.5 times that, or 24px. " + text run at (196,38) width 398: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,1966.33) size 747x432 LayoutInline {SPAN} at (0,0) size 726x387 [bgcolor=#C0C0C0] LayoutText {#text} at (0,22) size 726x387 text run at (0,22) width 711: "This element should be in a sans-serif font, italicized and small caps," diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-02-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-02-d-agi-expected.png Binary files differindex 7048368..07220f5 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-02-d-agi-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-02-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-02-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-02-d-agi-expected.txt index 34d9fb0..c50ddb8 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-02-d-agi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-02-d-agi-expected.txt @@ -1,85 +1,85 @@ layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x356 - LayoutBlockFlow {HTML} at (0,0) size 800x356 - LayoutBlockFlow {BODY} at (8,16) size 784x325 +layer at (0,0) size 800x355 + LayoutBlockFlow {HTML} at (0,0) size 800x355 + LayoutBlockFlow {BODY} at (8,16) size 784x324 LayoutBlockFlow {P} at (0,0) size 784x36 LayoutText {#text} at (0,0) size 737x35 text run at (0,0) width 391: "Change your window size. However the lines wrap, the blue " text run at (390,0) width 347: "rectanglues should always have their tops on the same" text run at (0,18) width 86: "alignment as " text run at (85,18) width 210: "other blue rectangles on the line." - LayoutBlockFlow {P} at (15,52) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] - LayoutText {#text} at (8,26) size 61x16 - text run at (8,26) width 61: "xxx " - LayoutImage {IMG} at (68.50,26.50) size 30x30 - LayoutText {#text} at (98,26) size 16x16 - text run at (98,26) width 16: " " + LayoutBlockFlow {P} at (15,52) size 754x272 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] + LayoutText {#text} at (8,25) size 61x16 + text run at (8,25) width 61: "xxx " + LayoutImage {IMG} at (68.50,25.50) size 30x30 + LayoutText {#text} at (98,25) size 16x16 + text run at (98,25) width 16: " " LayoutInline {SPAN} at (0,0) size 113x39 [color=#C0C0C0] - LayoutText {#text} at (113,8) size 113x39 - text run at (113,8) width 113: "xxx" - LayoutText {#text} at (226,26) size 15x16 - text run at (226,26) width 15: " " - LayoutImage {IMG} at (241,26.50) size 50x50 - LayoutText {#text} at (291,26) size 15x16 - text run at (291,26) width 15: " " + LayoutText {#text} at (113,7) size 113x39 + text run at (113,7) width 113: "xxx" + LayoutText {#text} at (226,25) size 15x16 + text run at (226,25) width 15: " " + LayoutImage {IMG} at (241,25.50) size 50x50 + LayoutText {#text} at (291,25) size 15x16 + text run at (291,25) width 15: " " LayoutInline {BIG} at (0,0) size 60x21 [color=#C0C0C0] - LayoutText {#text} at (306,22) size 60x21 - text run at (306,22) width 60: "xxx" - LayoutText {#text} at (366,26) size 15x16 - text run at (366,26) width 15: " " - LayoutImage {IMG} at (381,26.50) size 10x10 - LayoutText {#text} at (391,26) size 15x16 - text run at (391,26) width 15: " " + LayoutText {#text} at (306,21) size 60x21 + text run at (306,21) width 60: "xxx" + LayoutText {#text} at (366,25) size 15x16 + text run at (366,25) width 15: " " + LayoutImage {IMG} at (381,25.50) size 10x10 + LayoutText {#text} at (391,25) size 15x16 + text run at (391,25) width 15: " " LayoutInline {SMALL} at (0,0) size 30x11 [color=#C0C0C0] - LayoutText {#text} at (406,30) size 30x11 - text run at (406,30) width 30: "xxx" - LayoutText {#text} at (436,26) size 15x16 - text run at (436,26) width 15: " " - LayoutImage {IMG} at (451,26.50) size 20x20 - LayoutText {#text} at (471,26) size 75x16 - text run at (471,26) width 15: " " - text run at (486,26) width 60: "xxx " - LayoutImage {IMG} at (546,26.50) size 65x65 - LayoutText {#text} at (611,26) size 15x16 - text run at (611,26) width 15: " " + LayoutText {#text} at (406,29) size 30x11 + text run at (406,29) width 30: "xxx" + LayoutText {#text} at (436,25) size 15x16 + text run at (436,25) width 15: " " + LayoutImage {IMG} at (451,25.50) size 20x20 + LayoutText {#text} at (471,25) size 75x16 + text run at (471,25) width 15: " " + text run at (486,25) width 60: "xxx " + LayoutImage {IMG} at (546,25.50) size 65x65 + LayoutText {#text} at (611,25) size 15x16 + text run at (611,25) width 15: " " LayoutInline {SPAN} at (0,0) size 90x31 [color=#C0C0C0] - LayoutText {#text} at (626,14) size 90x31 - text run at (626,14) width 90: "xxx" + LayoutText {#text} at (626,13) size 90x31 + text run at (626,13) width 90: "xxx" LayoutText {#text} at (0,0) size 0x0 - LayoutImage {IMG} at (8.50,124.50) size 35x35 - LayoutText {#text} at (43,124) size 76x16 - text run at (43,124) width 16: " " - text run at (58,124) width 61: "xxx " - LayoutImage {IMG} at (118.50,124.50) size 30x30 - LayoutText {#text} at (148,124) size 16x16 - text run at (148,124) width 16: " " + LayoutImage {IMG} at (8.50,123.50) size 35x35 + LayoutText {#text} at (43,123) size 76x16 + text run at (43,123) width 16: " " + text run at (58,123) width 61: "xxx " + LayoutImage {IMG} at (118.50,123.50) size 30x30 + LayoutText {#text} at (148,123) size 16x16 + text run at (148,123) width 16: " " LayoutInline {SPAN} at (0,0) size 350x24 [color=#C0C0C0] - LayoutText {#text} at (163,118) size 91x24 - text run at (163,118) width 91: "xxx " + LayoutText {#text} at (163,117) size 91x24 + text run at (163,117) width 91: "xxx " LayoutInline {SPAN} at (0,0) size 170x57 - LayoutText {#text} at (253,91) size 170x57 - text run at (253,91) width 170: "xxx" - LayoutText {#text} at (422,118) size 91x24 - text run at (422,118) width 91: " xxx" - LayoutText {#text} at (512,124) size 16x16 - text run at (512,124) width 16: " " - LayoutImage {IMG} at (527.25,124.50) size 50x50 - LayoutText {#text} at (577,124) size 16x16 - text run at (577,124) width 16: " " + LayoutText {#text} at (253,90) size 170x57 + text run at (253,90) width 170: "xxx" + LayoutText {#text} at (422,117) size 91x24 + text run at (422,117) width 91: " xxx" + LayoutText {#text} at (512,123) size 16x16 + text run at (512,123) width 16: " " + LayoutImage {IMG} at (527.25,123.50) size 50x50 + LayoutText {#text} at (577,123) size 16x16 + text run at (577,123) width 16: " " LayoutInline {SMALL} at (0,0) size 31x11 [color=#C0C0C0] - LayoutText {#text} at (592,128) size 31x11 - text run at (592,128) width 31: "xxx" - LayoutText {#text} at (622,124) size 16x16 - text run at (622,124) width 16: " " - LayoutImage {IMG} at (637.25,124.50) size 15x15 - LayoutText {#text} at (652,124) size 16x16 - text run at (652,124) width 16: " " + LayoutText {#text} at (592,127) size 31x11 + text run at (592,127) width 31: "xxx" + LayoutText {#text} at (622,123) size 16x16 + text run at (622,123) width 16: " " + LayoutImage {IMG} at (637.25,123.50) size 15x15 + LayoutText {#text} at (652,123) size 16x16 + text run at (652,123) width 16: " " LayoutInline {BIG} at (0,0) size 61x21 [color=#C0C0C0] - LayoutText {#text} at (667,120) size 61x21 - text run at (667,120) width 61: "xxx" + LayoutText {#text} at (667,119) size 61x21 + text run at (667,119) width 61: "xxx" LayoutText {#text} at (0,0) size 0x0 - LayoutImage {IMG} at (8.50,174.50) size 90x90 - LayoutText {#text} at (98,174) size 61x16 - text run at (98,174) width 16: " " - text run at (113,174) width 46: "xxx" + LayoutImage {IMG} at (8.50,173.50) size 90x90 + LayoutText {#text} at (98,173) size 61x16 + text run at (98,173) width 16: " " + text run at (113,173) width 46: "xxx" diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-04-d-agi-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-04-d-agi-expected.png Binary files differindex cf5cca8..526b04e 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-04-d-agi-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-04-d-agi-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-04-d-agi-expected.txt b/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-04-d-agi-expected.txt index b097655..0c51b7b 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-04-d-agi-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t100801-c544-valgn-04-d-agi-expected.txt @@ -19,8 +19,8 @@ layer at (0,0) size 800x255 LayoutText {#text} at (78,8) size 16x16 text run at (78,8) width 16: " " LayoutInline {SPAN} at (0,0) size 113x39 - LayoutText {#text} at (93,8) size 113x39 - text run at (93,8) width 113: "xxx" + LayoutText {#text} at (93,7) size 113x39 + text run at (93,7) width 113: "xxx" LayoutText {#text} at (206,8) size 15x16 text run at (206,8) width 15: " " LayoutImage {IMG} at (221,8.50) size 10x10 diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1508-c527-font-09-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1508-c527-font-09-b-expected.png Binary files differindex f20ab9d..250df0f 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1508-c527-font-09-b-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1508-c527-font-09-b-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1508-c527-font-09-b-expected.txt b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1508-c527-font-09-b-expected.txt index 319792a..9ac7b6e 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1508-c527-font-09-b-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1508-c527-font-09-b-expected.txt @@ -1,23 +1,23 @@ layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x144 - LayoutBlockFlow {HTML} at (0,0) size 800x144.19 - LayoutBlockFlow {BODY} at (8,9.59) size 784x125 [color=#000080] - LayoutBlockFlow {P} at (0,0) size 784x125 - LayoutText {#text} at (0,6) size 475x13 - text run at (0,6) width 475: "This test should be about 10px, sans-serif, and light. There should be about 15px between each line. " - LayoutInline {SPAN} at (0,0) size 762x113 [color=#C0C0C0] - LayoutText {#text} at (475,6) size 762x113 - text run at (475,6) width 287: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,31) width 38: "dummy " - text run at (38,31) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (386,31) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (734,31) width 17: "text" - text run at (0,56) width 328: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (328,56) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (676,56) width 75: "text dummy text" - text run at (0,81) width 270: "dummy text dummy text dummy text dummy text dummy " - text run at (270,81) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (618,81) width 133: "text dummy text dummy text" - text run at (0,106) width 171: "dummy text dummy text dummy text" +layer at (0,0) size 800x134 + LayoutBlockFlow {HTML} at (0,0) size 800x134.19 + LayoutBlockFlow {BODY} at (8,9.59) size 784x115 [color=#000080] + LayoutBlockFlow {P} at (0,0) size 784x115 + LayoutText {#text} at (0,5) size 475x13 + text run at (0,5) width 475: "This test should be about 10px, sans-serif, and light. There should be about 15px between each line. " + LayoutInline {SPAN} at (0,0) size 762x105 [color=#C0C0C0] + LayoutText {#text} at (475,5) size 762x105 + text run at (475,5) width 287: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,28) width 38: "dummy " + text run at (38,28) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (386,28) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (734,28) width 17: "text" + text run at (0,51) width 328: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (328,51) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (676,51) width 75: "text dummy text" + text run at (0,74) width 270: "dummy text dummy text dummy text dummy text dummy " + text run at (270,74) width 348: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (618,74) width 133: "text dummy text dummy text" + text run at (0,97) width 171: "dummy text dummy text dummy text" LayoutText {#text} at (0,0) size 0x0 diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.png Binary files differindex c094bb0..d98a708 100644 --- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.txt b/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.txt index 9d2b3c6..364764b 100644 --- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.txt @@ -19,12 +19,12 @@ layer at (173,32) size 454x454 LayoutInline {SPAN} at (0,0) size 0x0 LayoutBlockFlow {DIV} at (0,0) size 453.53x0 LayoutInline {SPAN} at (0,0) size 0x0 -layer at (173,47) size 454x188 - LayoutBlockFlow (positioned) {H1} at (0,15.11) size 453.53x188 [color=#DD9955] - LayoutInline {SPAN} at (0,0) size 343x191 - LayoutText {#text} at (63,-2) size 343x191 - text run at (63,-2) width 328: "CSS ZEN" - text run at (55,92) width 343: "GARDEN" +layer at (173,47) size 454x190 + LayoutBlockFlow (positioned) {H1} at (0,15.11) size 453.53x190 [color=#DD9955] + LayoutInline {SPAN} at (0,0) size 343x192 + LayoutText {#text} at (63,-1) size 343x192 + text run at (63,-1) width 328: "CSS ZEN" + text run at (55,94) width 343: "GARDEN" layer at (173,119) size 454x22 LayoutBlockFlow (positioned) {H2} at (0,87.47) size 453.53x22 [color=#EEFF00] LayoutInline {SPAN} at (0,0) size 206x21 diff --git a/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font-expected.txt b/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font-expected.txt index 2fb605f..77d6a82 100644 --- a/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font-expected.txt @@ -1,8 +1,8 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4396 +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4390 LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4396.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4380.33 [bgcolor=#CCCCCC] +layer at (0,0) size 785x4390 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 + LayoutBlockFlow {HTML} at (0,0) size 785x4390.33 + LayoutBlockFlow {BODY} at (8,8) size 769x4374.33 [bgcolor=#CCCCCC] LayoutBlockFlow {P} at (0,0) size 769x16 LayoutText {#text} at (0,0) size 274x15 text run at (0,0) width 274: "The style declarations which apply to the text below are:" @@ -106,12 +106,12 @@ layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,80) width 177: "element's font size). " text run at (176,80) width 501: "Extra text is included for the purposes of testing this more" text run at (0,116) width 92: "effectively." - LayoutBlockFlow {P} at (0,1592.33) size 769x50 - LayoutText {#text} at (0,6) size 760x38 - text run at (0,6) width 305: "This element should be in a sans-serif font, with a weight of 400. " - text run at (305,6) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." - text run at (0,31) width 321: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1660.33) size 769x270 + LayoutBlockFlow {P} at (0,1592.33) size 769x46 + LayoutText {#text} at (0,5) size 760x36 + text run at (0,5) width 305: "This element should be in a sans-serif font, with a weight of 400. " + text run at (305,5) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." + text run at (0,28) width 321: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (0,1656.33) size 769x270 LayoutInline {SPAN} at (0,0) size 759x236 [bgcolor=#C0C0C0] LayoutText {#text} at (0,17) size 759x236 text run at (0,17) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " @@ -121,18 +121,18 @@ layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,179) width 735: "has been set on an inline element and should therefore only cover the text, not the interline" text run at (0,233) width 64: "spacing." LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1948.33) size 769x2432 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2430 + LayoutTable {TABLE} at (0,1944.33) size 769x2430 [border: (1px outset #808080)] + LayoutTableSection {TBODY} at (1,1) size 767x2428 LayoutTableRow {TR} at (0,0) size 767x26 LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] LayoutInline {STRONG} at (0,0) size 161x17 LayoutText {#text} at (4,4) size 161x17 text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x2404 - LayoutTableCell {TD} at (0,1215) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + LayoutTableRow {TR} at (0,26) size 767x2402 + LayoutTableCell {TD} at (0,1214) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (4,4) size 4x17 text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x2404.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + LayoutTableCell {TD} at (12,26) size 755x2402.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] LayoutBlockFlow {P} at (4,4) size 747x36 LayoutText {#text} at (0,0) size 746x35 text run at (0,0) width 575: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " @@ -211,13 +211,13 @@ layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) text run at (0,80) width 177: "element's font size). " text run at (176,80) width 501: "Extra text is included for the purposes of testing this more" text run at (0,116) width 92: "effectively." - LayoutBlockFlow {P} at (4,1880.33) size 747x64 - LayoutText {#text} at (0,8) size 742x48 - text run at (0,8) width 374: "This element should be in a sans-serif font, with a weight of 400. " - text run at (374,8) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,40) width 196: "shoud be 2.5 times that, or 24px. " - text run at (196,40) width 398: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1968.33) size 747x432 + LayoutBlockFlow {P} at (4,1880.33) size 747x62 + LayoutText {#text} at (0,7) size 742x47 + text run at (0,7) width 374: "This element should be in a sans-serif font, with a weight of 400. " + text run at (374,7) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" + text run at (0,38) width 196: "shoud be 2.5 times that, or 24px. " + text run at (196,38) width 398: "Extra text is included for the purposes of testing this more effectively." + LayoutBlockFlow {P} at (4,1966.33) size 747x432 LayoutInline {SPAN} at (0,0) size 726x387 [bgcolor=#C0C0C0] LayoutText {#text} at (0,22) size 726x387 text run at (0,22) width 711: "This element should be in a sans-serif font, italicized and small caps," diff --git a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.png b/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.png Binary files differindex 3123f8f..c541bd9 100644 --- a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.png diff --git a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.txt b/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.txt index 9d2b1e9..1adedbc 100644 --- a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.txt @@ -19,12 +19,12 @@ layer at (173,32) size 454x454 LayoutInline {SPAN} at (0,0) size 0x0 LayoutBlockFlow {DIV} at (0,0) size 453.53x0 LayoutInline {SPAN} at (0,0) size 0x0 -layer at (173,47) size 454x188 - LayoutBlockFlow (positioned) {H1} at (0,15.11) size 453.53x188 [color=#DD9955] - LayoutInline {SPAN} at (0,0) size 343x191 - LayoutText {#text} at (62,-2) size 343x191 - text run at (62,-2) width 329: "CSS ZEN" - text run at (55,92) width 343: "GARDEN" +layer at (173,47) size 454x190 + LayoutBlockFlow (positioned) {H1} at (0,15.11) size 453.53x190 [color=#DD9955] + LayoutInline {SPAN} at (0,0) size 343x192 + LayoutText {#text} at (62,-1) size 343x192 + text run at (62,-1) width 329: "CSS ZEN" + text run at (55,94) width 343: "GARDEN" layer at (173,119) size 454x22 LayoutBlockFlow (positioned) {H2} at (0,87.47) size 453.53x22 [color=#EEFF00] LayoutInline {SPAN} at (0,0) size 206x21 |
