From d6c00e1fede163c1c115489f47122ea44f034458 Mon Sep 17 00:00:00 2001 From: Fujii Hironori Date: Wed, 8 Mar 2023 18:09:43 -0800 Subject: [PATCH] Enable text shaping by default on Windows https://bugs.webkit.org/show_bug.cgi?id=215318 Reviewed by Don Olmstead. Use the complex text code path by default for Windows port. * LayoutTests/platform/wincairo/TestExpectations: * LayoutTests/platform/wincairo/...: Omitted layout test rebaselining. * Source/WebCore/platform/graphics/FontCascade.h: Canonical link: https://commits.webkit.org/261394@main --- .../platform/wincairo/TestExpectations | 12 +- ...change-transform-in-end-event-expected.txt | 4 +- ...trix-transform-type-animation-expected.txt | 6 +- .../state-at-end-event-transform-expected.txt | 4 +- ...missing-values-first-keyframe-expected.txt | 12 +- .../missing-values-last-keyframe-expected.txt | 12 +- .../state-at-end-event-expected.txt | 4 +- ...-at-end-event-transform-layer-expected.txt | 4 +- .../image-color-matching-expected.txt | 4 +- .../pdf-image-match-expected.txt | 4 +- ...ompositing-visible-descendant-expected.txt | 4 +- .../direct-image-compositing-expected.txt | 78 +- .../generated-content-expected.txt | 14 +- .../abs-position-inside-opacity-expected.txt | 4 +- .../geometry/clipping-foreground-expected.txt | 16 +- .../composited-html-size-expected.txt | 4 +- .../geometry/fixed-in-composited-expected.txt | 4 +- .../geometry/fixed-position-expected.txt | 8 +- ...er-due-to-layer-children-deep-expected.txt | 8 +- .../layer-due-to-layer-children-expected.txt | 8 +- .../geometry/outline-change-expected.txt | 4 +- .../partial-layout-update-expected.txt | 4 +- .../geometry/root-layer-update-expected.txt | 12 +- ...rom-origin-on-zero-size-layer-expected.txt | 12 +- .../video-fixed-scrolling-expected.txt | 4 +- .../video-opacity-overlay-expected.txt | 4 +- .../composited-iframe-alignment-expected.txt | 12 +- .../iframe-copy-on-scroll-expected.txt | 4 +- ...direct-image-background-color-expected.txt | 4 +- ...layers-inside-overflow-scroll-expected.txt | 4 +- .../masks/direct-image-mask-expected.txt | 4 +- .../masks/masked-ancestor-expected.txt | 4 +- .../masks/multiple-masks-expected.txt | 4 +- .../masks/simple-composited-mask-expected.txt | 4 +- .../overflow/ancestor-overflow-expected.txt | 4 +- .../fixed-position-ancestor-clip-expected.txt | 8 +- .../overflow/nested-scrolling-expected.txt | 86 +- ...erflow-compositing-descendant-expected.txt | 4 +- .../overflow-positioning-expected.txt | 4 +- .../overflow/overflow-scroll-expected.txt | 76 +- .../overflow/parent-overflow-expected.txt | 4 +- .../remove-overflow-crash2-expected.txt | 158 +- .../scroll-ancestor-update-expected.txt | 8 +- .../overflow/scrollbar-painting-expected.txt | 4 +- .../animation-inside-reflection-expected.txt | 10 +- ...ting-change-inside-reflection-expected.txt | 4 +- .../deeply-nested-reflections-expected.txt | 4 +- .../load-video-in-reflection-expected.txt | 4 +- ...sked-reflection-on-composited-expected.txt | 4 +- ...ested-reflection-anchor-point-expected.txt | 4 +- .../nested-reflection-animated-expected.txt | 10 +- .../nested-reflection-expected.txt | 4 +- ...nested-reflection-mask-change-expected.txt | 4 +- ...nested-reflection-on-overflow-expected.txt | 50 +- .../nested-reflection-opacity-expected.txt | 4 +- ...nested-reflection-size-change-expected.txt | 4 +- ...nested-reflection-transformed-expected.txt | 4 +- ...ested-reflection-transformed2-expected.txt | 6 +- .../nested-reflection-transition-expected.txt | 6 +- .../reflection-in-composited-expected.txt | 16 +- .../reflection-on-composited-expected.txt | 8 +- .../reflection-opacity-expected.txt | 6 +- .../reflection-ordering-expected.txt | 4 +- .../reflection-positioning-expected.txt | 4 +- .../reflection-positioning2-expected.txt | 4 +- ...simple-composited-reflections-expected.txt | 4 +- .../transform-inside-reflection-expected.txt | 6 +- ...come-overlay-composited-layer-expected.txt | 10 +- .../composited-document-element-expected.txt | 4 +- .../repaint/layer-repaint-expected.txt | 4 +- .../repaint/layer-repaint-rects-expected.txt | 4 +- .../opacity-between-absolute-expected.txt | 4 +- .../opacity-between-absolute2-expected.txt | 4 +- .../self-painting-layers-expected.txt | 14 +- .../shadows/shadow-drawing-expected.txt | 16 +- .../sibling-positioning-expected.txt | 10 +- .../text-on-large-layer-expected.txt | 10 +- .../scale-transition-no-start-expected.txt | 16 +- .../singular-scale-transition-expected.txt | 10 +- .../webgl/webgl-background-color-expected.txt | 4 +- .../webgl/webgl-reflection-expected.txt | 4 +- .../css1/basic/containment-expected.txt | 267 ++-- .../basic/contextual_selectors-expected.txt | 100 +- .../wincairo/css1/basic/grouping-expected.txt | 52 +- .../css1/basic/id_as_selector-expected.txt | 58 +- .../css1/basic/inheritance-expected.txt | 300 ++-- .../box_properties/acid_test-expected.txt | 88 +- .../css1/box_properties/border-expected.txt | 265 ++-- .../box_properties/border_bottom-expected.txt | 182 +-- .../border_bottom_inline-expected.txt | 69 +- .../border_bottom_width-expected.txt | 134 +- .../border_bottom_width_inline-expected.txt | 121 +- .../box_properties/border_color-expected.txt | 38 +- .../border_color_inline-expected.txt | 97 +- .../box_properties/border_inline-expected.txt | 68 +- .../box_properties/border_left-expected.txt | 169 ++- .../border_left_inline-expected.txt | 67 +- .../border_left_width-expected.txt | 138 +- .../border_left_width_inline-expected.txt | 128 +- .../box_properties/border_right-expected.txt | 69 +- .../border_right_inline-expected.txt | 199 ++- .../border_right_width-expected.txt | 141 +- .../border_right_width_inline-expected.txt | 132 +- .../box_properties/border_style-expected.txt | 112 +- .../border_style_inline-expected.txt | 89 +- .../box_properties/border_top-expected.txt | 158 +- .../border_top_inline-expected.txt | 69 +- .../border_top_width-expected.txt | 124 +- .../border_top_width_inline-expected.txt | 119 +- .../box_properties/border_width-expected.txt | 124 +- .../border_width_inline-expected.txt | 106 +- .../css1/box_properties/clear-expected.txt | 86 +- .../box_properties/clear_float-expected.txt | 165 +-- .../css1/box_properties/float-expected.txt | 42 +- .../float_elements_in_series-expected.txt | 52 +- .../box_properties/float_margin-expected.txt | 209 +-- .../float_on_text_elements-expected.txt | 522 +++---- .../css1/box_properties/height-expected.txt | 54 +- .../css1/box_properties/margin-expected.txt | 236 +-- .../box_properties/margin_bottom-expected.txt | 154 +- .../margin_bottom_inline-expected.txt | 130 +- .../box_properties/margin_inline-expected.txt | 198 +-- .../box_properties/margin_left-expected.txt | 153 +- .../margin_left_inline-expected.txt | 130 +- .../box_properties/margin_right-expected.txt | 153 +- .../margin_right_inline-expected.txt | 138 +- .../box_properties/margin_top-expected.txt | 150 +- .../margin_top_inline-expected.txt | 130 +- .../css1/box_properties/padding-expected.txt | 98 +- .../padding_bottom-expected.txt | 134 +- .../padding_bottom_inline-expected.txt | 138 +- .../padding_inline-expected.txt | 174 +-- .../box_properties/padding_left-expected.txt | 143 +- .../padding_left_inline-expected.txt | 150 +- .../box_properties/padding_right-expected.txt | 192 +-- .../padding_right_inline-expected.txt | 157 +- .../box_properties/padding_top-expected.txt | 101 +- .../padding_top_inline-expected.txt | 138 +- .../css1/box_properties/width-expected.txt | 83 +- .../css1/cascade/cascade_order-expected.txt | 154 +- .../css1/cascade/important-expected.txt | 70 +- .../css1/classification/display-expected.txt | 149 +- .../classification/list_style-expected.txt | 42 +- .../list_style_image-expected.txt | 86 +- .../list_style_position-expected.txt | 34 +- .../list_style_type-expected.txt | 338 ++--- .../classification/white_space-expected.txt | 110 +- .../background-expected.txt | 103 +- .../background_attachment-expected.txt | 229 +-- .../background_color-expected.txt | 97 +- .../background_image-expected.txt | 125 +- .../background_position-expected.txt | 184 +-- .../background_repeat-expected.txt | 437 +++--- .../color_and_background/color-expected.txt | 42 +- .../forward_compatible_parsing-expected.txt | 635 ++++---- .../css1/font_properties/font-expected.txt | 284 ++-- .../font_properties/font_size-expected.txt | 344 ++--- .../font_properties/font_style-expected.txt | 68 +- .../font_properties/font_variant-expected.txt | 62 +- .../font_properties/font_weight-expected.txt | 156 +- .../css1/formatting_model/canvas-expected.txt | 32 +- .../floating_elements-expected.txt | 1306 +++++++++-------- .../height_of_lines-expected.txt | 133 +- .../horizontal_formatting-expected.txt | 117 +- .../inline_elements-expected.txt | 122 +- .../replaced_elements-expected.txt | 66 +- .../vertical_formatting-expected.txt | 195 +-- .../wincairo/css1/pseudo/anchor-expected.txt | 130 +- .../css1/pseudo/firstletter-expected.txt | 94 +- .../css1/pseudo/firstline-expected.txt | 99 +- .../multiple_pseudo_elements-expected.txt | 122 +- .../pseudo_elements_in_selectors-expected.txt | 88 +- .../letter_spacing-expected.txt | 169 +-- .../text_properties/line_height-expected.txt | 217 +-- .../text_properties/text_align-expected.txt | 62 +- .../text_decoration-expected.txt | 298 ++-- .../text_properties/text_indent-expected.txt | 150 +- .../text_transform-expected.txt | 170 +-- .../vertical_align-expected.txt | 1152 +++++++-------- .../text_properties/word_spacing-expected.txt | 529 ++++--- .../css1/units/color_units-expected.txt | 343 ++--- .../css1/units/length_units-expected.txt | 188 +-- .../css1/units/percentage_units-expected.txt | 108 +- .../wincairo/css1/units/urls-expected.txt | 58 +- ...olute-non-replaced-height-001-expected.txt | 4 +- ...olute-non-replaced-height-002-expected.txt | 4 +- ...olute-non-replaced-height-003-expected.txt | 4 +- ...olute-non-replaced-height-004-expected.txt | 4 +- ...olute-non-replaced-height-005-expected.txt | 4 +- ...olute-non-replaced-height-006-expected.txt | 4 +- ...olute-non-replaced-height-007-expected.txt | 4 +- ...olute-non-replaced-height-008-expected.txt | 4 +- ...olute-non-replaced-height-009-expected.txt | 4 +- ...olute-non-replaced-height-010-expected.txt | 4 +- ...olute-non-replaced-height-011-expected.txt | 4 +- ...olute-non-replaced-height-012-expected.txt | 4 +- ...e-non-replaced-max-height-001-expected.txt | 4 +- ...e-non-replaced-max-height-002-expected.txt | 4 +- ...e-non-replaced-max-height-003-expected.txt | 4 +- ...e-non-replaced-max-height-004-expected.txt | 4 +- ...e-non-replaced-max-height-005-expected.txt | 4 +- ...e-non-replaced-max-height-006-expected.txt | 4 +- ...e-non-replaced-max-height-007-expected.txt | 4 +- ...e-non-replaced-max-height-008-expected.txt | 4 +- ...e-non-replaced-max-height-009-expected.txt | 4 +- ...e-non-replaced-max-height-010-expected.txt | 4 +- ...e-non-replaced-max-height-011-expected.txt | 4 +- ...e-non-replaced-max-height-012-expected.txt | 4 +- ...solute-non-replaced-width-001-expected.txt | 4 +- ...solute-non-replaced-width-002-expected.txt | 4 +- ...solute-non-replaced-width-003-expected.txt | 4 +- ...solute-non-replaced-width-004-expected.txt | 4 +- ...solute-non-replaced-width-005-expected.txt | 4 +- ...solute-non-replaced-width-006-expected.txt | 4 +- ...solute-non-replaced-width-007-expected.txt | 4 +- ...solute-non-replaced-width-008-expected.txt | 4 +- ...solute-non-replaced-width-009-expected.txt | 4 +- ...solute-non-replaced-width-010-expected.txt | 4 +- ...solute-non-replaced-width-011-expected.txt | 4 +- ...solute-non-replaced-width-012-expected.txt | 4 +- ...solute-non-replaced-width-013-expected.txt | 4 +- ...solute-non-replaced-width-014-expected.txt | 4 +- ...solute-non-replaced-width-015-expected.txt | 4 +- ...solute-non-replaced-width-016-expected.txt | 4 +- ...solute-non-replaced-width-017-expected.txt | 6 +- ...solute-non-replaced-width-018-expected.txt | 6 +- ...solute-non-replaced-width-019-expected.txt | 6 +- ...solute-non-replaced-width-020-expected.txt | 6 +- ...solute-non-replaced-width-021-expected.txt | 6 +- ...solute-non-replaced-width-022-expected.txt | 6 +- ...solute-non-replaced-width-023-expected.txt | 6 +- ...solute-non-replaced-width-024-expected.txt | 6 +- .../absolute-replaced-height-001-expected.txt | 4 +- .../absolute-replaced-height-002-expected.txt | 4 +- .../absolute-replaced-height-003-expected.txt | 4 +- .../absolute-replaced-height-004-expected.txt | 4 +- .../absolute-replaced-height-005-expected.txt | 4 +- .../absolute-replaced-height-007-expected.txt | 4 +- .../absolute-replaced-height-008-expected.txt | 4 +- .../absolute-replaced-height-009-expected.txt | 4 +- .../absolute-replaced-height-010-expected.txt | 4 +- .../absolute-replaced-height-011-expected.txt | 4 +- .../absolute-replaced-height-012-expected.txt | 4 +- .../absolute-replaced-height-014-expected.txt | 4 +- .../absolute-replaced-height-016-expected.txt | 4 +- .../absolute-replaced-height-017-expected.txt | 4 +- .../absolute-replaced-height-018-expected.txt | 4 +- .../absolute-replaced-height-019-expected.txt | 4 +- .../absolute-replaced-height-021-expected.txt | 4 +- .../absolute-replaced-height-022-expected.txt | 4 +- .../absolute-replaced-height-023-expected.txt | 4 +- .../absolute-replaced-height-024-expected.txt | 4 +- .../absolute-replaced-height-025-expected.txt | 4 +- .../absolute-replaced-height-026-expected.txt | 4 +- .../absolute-replaced-height-028-expected.txt | 4 +- .../absolute-replaced-height-029-expected.txt | 4 +- .../absolute-replaced-height-030-expected.txt | 4 +- .../absolute-replaced-height-031-expected.txt | 4 +- .../absolute-replaced-height-032-expected.txt | 4 +- .../absolute-replaced-height-033-expected.txt | 4 +- .../absolute-replaced-height-035-expected.txt | 4 +- .../absolute-replaced-height-036-expected.txt | 4 +- .../absolute-replaced-width-001-expected.txt | 19 +- .../absolute-replaced-width-006-expected.txt | 19 +- .../absolute-replaced-width-008-expected.txt | 19 +- .../absolute-replaced-width-013-expected.txt | 19 +- .../absolute-replaced-width-015-expected.txt | 19 +- .../absolute-replaced-width-020-expected.txt | 19 +- .../absolute-replaced-width-022-expected.txt | 19 +- .../absolute-replaced-width-027-expected.txt | 19 +- .../absolute-replaced-width-029-expected.txt | 19 +- .../absolute-replaced-width-034-expected.txt | 19 +- .../absolute-replaced-width-036-expected.txt | 19 +- .../absolute-replaced-width-041-expected.txt | 19 +- .../absolute-replaced-width-043-expected.txt | 19 +- .../absolute-replaced-width-048-expected.txt | 19 +- .../absolute-replaced-width-050-expected.txt | 19 +- .../absolute-replaced-width-055-expected.txt | 19 +- .../absolute-replaced-width-057-expected.txt | 19 +- .../absolute-replaced-width-062-expected.txt | 19 +- .../absolute-replaced-width-064-expected.txt | 19 +- .../absolute-replaced-width-069-expected.txt | 19 +- .../absolute-replaced-width-071-expected.txt | 19 +- .../absolute-replaced-width-076-expected.txt | 19 +- .../background-intrinsic-001-expected.txt | 4 +- .../background-intrinsic-002-expected.txt | 4 +- .../background-intrinsic-003-expected.txt | 4 +- .../background-intrinsic-004-expected.txt | 4 +- .../background-intrinsic-005-expected.txt | 4 +- .../background-intrinsic-006-expected.txt | 4 +- .../background-intrinsic-007-expected.txt | 4 +- .../background-intrinsic-008-expected.txt | 4 +- .../background-intrinsic-009-expected.txt | 4 +- ...block-non-replaced-height-001-expected.txt | 8 +- ...block-non-replaced-height-002-expected.txt | 8 +- ...block-non-replaced-height-003-expected.txt | 4 +- ...block-non-replaced-height-004-expected.txt | 4 +- ...block-non-replaced-height-005-expected.txt | 4 +- ...block-non-replaced-height-006-expected.txt | 4 +- ...block-non-replaced-height-007-expected.txt | 4 +- ...block-non-replaced-height-008-expected.txt | 4 +- ...block-non-replaced-height-009-expected.txt | 4 +- ...block-non-replaced-height-010-expected.txt | 4 +- ...block-non-replaced-height-011-expected.txt | 4 +- ...block-non-replaced-height-012-expected.txt | 4 +- ...block-non-replaced-height-013-expected.txt | 4 +- ...block-non-replaced-height-014-expected.txt | 4 +- ...block-non-replaced-height-015-expected.txt | 4 +- ...block-non-replaced-height-016-expected.txt | 4 +- .../block-non-replaced-width-001-expected.txt | 4 +- .../block-non-replaced-width-002-expected.txt | 4 +- .../block-non-replaced-width-003-expected.txt | 4 +- .../block-non-replaced-width-004-expected.txt | 4 +- .../block-non-replaced-width-005-expected.txt | 4 +- .../block-non-replaced-width-006-expected.txt | 4 +- .../block-non-replaced-width-007-expected.txt | 4 +- .../block-non-replaced-width-008-expected.txt | 14 +- .../block-replaced-height-001-expected.txt | 4 +- .../block-replaced-height-002-expected.txt | 4 +- .../block-replaced-height-003-expected.txt | 4 +- .../block-replaced-height-004-expected.txt | 4 +- .../block-replaced-height-005-expected.txt | 4 +- .../block-replaced-height-007-expected.txt | 4 +- .../block-replaced-width-001-expected.txt | 4 +- .../block-replaced-width-006-expected.txt | 4 +- .../border-collapse-offset-002-expected.txt | 8 +- .../border-conflict-style-079-expected.txt | 40 +- .../border-conflict-style-088-expected.txt | 40 +- ...border-spacing-applies-to-015-expected.txt | 4 +- .../20110323/c543-txt-decor-000-expected.txt | 131 +- .../dynamic-top-change-001-expected.txt | 4 +- .../dynamic-top-change-002-expected.txt | 4 +- .../dynamic-top-change-003-expected.txt | 4 +- .../dynamic-top-change-004-expected.txt | 4 +- .../20110323/empty-inline-001-expected.txt | 4 +- .../20110323/empty-inline-002-expected.txt | 4 +- .../20110323/empty-inline-003-expected.txt | 4 +- ...float-non-replaced-height-001-expected.txt | 4 +- .../float-non-replaced-width-001-expected.txt | 4 +- .../float-non-replaced-width-002-expected.txt | 4 +- .../float-non-replaced-width-003-expected.txt | 4 +- .../float-non-replaced-width-004-expected.txt | 4 +- .../float-non-replaced-width-005-expected.txt | 4 +- .../float-non-replaced-width-006-expected.txt | 4 +- .../float-non-replaced-width-007-expected.txt | 6 +- .../float-non-replaced-width-008-expected.txt | 6 +- .../float-non-replaced-width-009-expected.txt | 6 +- .../float-non-replaced-width-010-expected.txt | 6 +- .../float-non-replaced-width-011-expected.txt | 6 +- .../float-non-replaced-width-012-expected.txt | 6 +- .../float-replaced-height-001-expected.txt | 4 +- .../float-replaced-height-002-expected.txt | 4 +- .../float-replaced-height-003-expected.txt | 4 +- .../float-replaced-height-004-expected.txt | 4 +- .../float-replaced-height-005-expected.txt | 4 +- .../float-replaced-height-007-expected.txt | 4 +- .../float-replaced-width-001-expected.txt | 4 +- .../float-replaced-width-002-expected.txt | 4 +- .../float-replaced-width-003-expected.txt | 4 +- .../float-replaced-width-004-expected.txt | 4 +- .../float-replaced-width-005-expected.txt | 4 +- .../float-replaced-width-006-expected.txt | 15 +- .../float-replaced-width-011-expected.txt | 15 +- .../floating-replaced-height-008-expected.txt | 30 +- ...height-width-inline-table-001-expected.txt | 14 +- .../height-width-table-001-expected.txt | 14 +- ...block-non-replaced-height-001-expected.txt | 4 +- ...block-non-replaced-height-002-expected.txt | 4 +- ...-block-non-replaced-width-001-expected.txt | 4 +- ...-block-non-replaced-width-002-expected.txt | 4 +- ...-block-non-replaced-width-003-expected.txt | 6 +- ...-block-non-replaced-width-004-expected.txt | 6 +- ...ine-block-replaced-height-001-expected.txt | 4 +- ...ine-block-replaced-height-002-expected.txt | 4 +- ...ine-block-replaced-height-003-expected.txt | 4 +- ...ine-block-replaced-height-004-expected.txt | 4 +- ...ine-block-replaced-height-005-expected.txt | 4 +- ...ine-block-replaced-height-007-expected.txt | 4 +- ...ine-block-replaced-height-008-expected.txt | 30 +- ...line-block-replaced-width-001-expected.txt | 15 +- ...line-block-replaced-width-006-expected.txt | 15 +- ...nline-non-replaced-height-002-expected.txt | 4 +- ...nline-non-replaced-height-003-expected.txt | 4 +- ...inline-non-replaced-width-001-expected.txt | 4 +- ...inline-non-replaced-width-002-expected.txt | 4 +- .../inline-replaced-height-001-expected.txt | 4 +- .../inline-replaced-height-002-expected.txt | 4 +- .../inline-replaced-height-003-expected.txt | 4 +- .../inline-replaced-height-004-expected.txt | 4 +- .../inline-replaced-height-005-expected.txt | 4 +- .../inline-replaced-height-007-expected.txt | 4 +- .../inline-replaced-height-008-expected.txt | 30 +- .../inline-replaced-width-001-expected.txt | 15 +- .../inline-replaced-width-006-expected.txt | 15 +- .../inline-replaced-width-011-expected.txt | 4 +- .../inline-replaced-width-012-expected.txt | 4 +- .../inline-replaced-width-013-expected.txt | 4 +- .../inline-replaced-width-014-expected.txt | 6 +- .../inline-replaced-width-015-expected.txt | 4 +- .../20110323/inline-table-001-expected.txt | 20 +- .../margin-applies-to-001-expected.txt | 4 +- .../margin-applies-to-002-expected.txt | 4 +- .../margin-applies-to-003-expected.txt | 4 +- .../margin-applies-to-004-expected.txt | 4 +- .../margin-applies-to-005-expected.txt | 4 +- .../margin-applies-to-006-expected.txt | 4 +- .../margin-applies-to-007-expected.txt | 4 +- .../margin-applies-to-008-expected.txt | 12 +- .../margin-applies-to-009-expected.txt | 4 +- .../margin-applies-to-010-expected.txt | 6 +- .../margin-applies-to-012-expected.txt | 4 +- .../margin-applies-to-013-expected.txt | 4 +- .../margin-applies-to-014-expected.txt | 4 +- .../margin-applies-to-015-expected.txt | 4 +- .../outline-color-applies-to-008-expected.txt | 10 +- .../replaced-elements-001-expected.txt | 4 +- .../replaced-intrinsic-001-expected.txt | 35 +- .../replaced-intrinsic-002-expected.txt | 4 +- .../replaced-intrinsic-004-expected.txt | 4 +- .../replaced-intrinsic-005-expected.txt | 4 +- .../replaced-intrinsic-ratio-001-expected.txt | 29 +- .../replaced-min-max-001-expected.txt | 4 +- .../20110323/table-caption-001-expected.txt | 8 +- .../20110323/table-caption-002-expected.txt | 30 +- ...tion-horizontal-alignment-001-expected.txt | 8 +- .../table-caption-margins-001-expected.txt | 4 +- .../table-caption-optional-001-expected.txt | 8 +- .../table-caption-optional-002-expected.txt | 8 +- .../table-height-algorithm-023-expected.txt | 34 +- .../table-height-algorithm-024-expected.txt | 34 +- ...width-non-replaced-inline-001-expected.txt | 10 +- .../width-replaced-element-001-expected.txt | 4 +- .../t010403-shand-border-00-c-expected.txt | 6 +- .../t010403-shand-font-00-b-expected.txt | 12 +- .../t010403-shand-font-01-b-expected.txt | 12 +- .../t010403-shand-font-02-b-expected.txt | 12 +- .../t010403-shand-font-03-b-expected.txt | 12 +- .../css2.1/t040102-keywords-00-b-expected.txt | 4 +- .../css2.1/t040102-keywords-01-b-expected.txt | 4 +- .../css2.1/t040103-case-00-b-expected.txt | 4 +- .../css2.1/t040103-case-01-c-expected.txt | 4 +- .../css2.1/t040103-escapes-00-b-expected.txt | 28 +- .../css2.1/t040103-escapes-01-b-expected.txt | 4 +- .../css2.1/t040103-escapes-02-d-expected.txt | 4 +- .../css2.1/t040103-escapes-03-b-expected.txt | 4 +- .../css2.1/t040103-escapes-04-b-expected.txt | 4 +- .../css2.1/t040103-escapes-05-c-expected.txt | 4 +- .../css2.1/t040103-escapes-06-b-expected.txt | 4 +- .../css2.1/t040103-escapes-07-b-expected.txt | 4 +- .../css2.1/t040103-escapes-08-b-expected.txt | 4 +- .../css2.1/t040103-ident-00-c-expected.txt | 8 +- .../css2.1/t040103-ident-01-c-expected.txt | 8 +- .../css2.1/t040103-ident-02-c-expected.txt | 8 +- .../css2.1/t040103-ident-03-c-expected.txt | 8 +- .../css2.1/t040103-ident-04-c-expected.txt | 8 +- .../css2.1/t040103-ident-05-c-expected.txt | 8 +- .../css2.1/t040103-ident-06-c-expected.txt | 8 +- .../css2.1/t040103-ident-07-c-expected.txt | 8 +- .../css2.1/t040103-ident-08-c-expected.txt | 8 +- .../css2.1/t040103-ident-09-c-expected.txt | 8 +- .../css2.1/t040103-ident-10-c-expected.txt | 8 +- .../css2.1/t040103-ident-11-c-expected.txt | 8 +- .../css2.1/t040103-ident-12-c-expected.txt | 8 +- .../css2.1/t040103-ident-13-c-expected.txt | 8 +- .../css2.1/t040105-atkeyw-00-b-expected.txt | 4 +- .../css2.1/t040105-atkeyw-01-b-expected.txt | 4 +- .../css2.1/t040105-atkeyw-02-b-expected.txt | 4 +- .../css2.1/t040105-atrule-00-b-expected.txt | 4 +- .../css2.1/t040105-atrule-01-b-expected.txt | 4 +- .../css2.1/t040105-atrule-02-b-expected.txt | 4 +- .../css2.1/t040105-atrule-03-b-expected.txt | 4 +- .../css2.1/t040105-atrule-04-b-expected.txt | 4 +- .../css2.1/t040105-import-00-b-expected.txt | 4 +- .../css2.1/t040105-import-01-b-expected.txt | 4 +- .../css2.1/t040105-import-10-b-expected.txt | 4 +- .../t040109-c17-comments-00-b-expected.txt | 24 +- .../t040109-c17-comments-01-b-expected.txt | 8 +- .../t0402-c71-fwd-parsing-00-f-expected.txt | 36 +- .../t0402-c71-fwd-parsing-01-f-expected.txt | 4 +- .../t0402-c71-fwd-parsing-02-f-expected.txt | 64 +- .../t0402-c71-fwd-parsing-03-f-expected.txt | 16 +- .../t0402-c71-fwd-parsing-04-f-expected.txt | 4 +- .../css2.1/t0402-syntax-01-f-expected.txt | 4 +- .../css2.1/t0402-syntax-02-f-expected.txt | 4 +- .../css2.1/t0402-syntax-03-f-expected.txt | 4 +- .../css2.1/t0402-syntax-04-f-expected.txt | 4 +- .../css2.1/t0402-syntax-05-f-expected.txt | 4 +- .../css2.1/t0402-syntax-06-f-expected.txt | 4 +- .../t040302-c61-ex-len-00-b-a-expected.txt | 4 +- .../t040302-c61-phys-len-00-b-expected.txt | 12 +- .../t040302-c61-rel-len-00-b-ag-expected.txt | 4 +- .../t040303-c62-percent-00-b-ag-expected.txt | 4 +- .../t040304-c64-uri-00-a-g-expected.txt | 16 +- .../t040306-c63-color-00-b-ag-expected.txt | 94 +- .../css2.1/t040306-syntax-01-f-expected.txt | 36 +- .../css2.1/t040307-syntax-01-b-expected.txt | 4 +- .../t050201-c12-grouping-00-b-expected.txt | 12 +- .../t0505-c16-descendant-00-e-expected.txt | 14 +- .../t0505-c16-descendant-01-e-expected.txt | 8 +- .../t0505-c16-descendant-02-e-expected.txt | 4 +- .../t050803-c14-classes-00-e-expected.txt | 20 +- .../css2.1/t0509-c15-ids-00-a-expected.txt | 12 +- .../css2.1/t0509-c15-ids-01-e-expected.txt | 10 +- .../t0509-id-sel-syntax-01-f-expected.txt | 4 +- .../t0509-id-sel-syntax-02-b-expected.txt | 4 +- .../t0510-c25-pseudo-elmnt-00-c-expected.txt | 12 +- .../t0511-c21-pseud-anch-00-e-i-expected.txt | 10 +- .../t0511-c21-pseud-link-00-e-expected.txt | 10 +- .../t0511-c21-pseud-link-01-e-expected.txt | 10 +- .../t0511-c21-pseud-link-02-e-expected.txt | 10 +- .../t0511-c21-pseud-link-03-e-expected.txt | 10 +- .../t051103-c21-activ-ln-00-e-i-expected.txt | 10 +- .../t051103-c21-focus-ln-00-e-i-expected.txt | 6 +- .../t051103-c21-hover-ln-00-e-i-expected.txt | 6 +- .../t051103-dom-hover-01-c-io-expected.txt | 12 +- .../t051103-dom-hover-02-c-io-expected.txt | 18 +- .../t051201-c23-first-line-00-b-expected.txt | 178 +-- .../t051202-c24-first-lttr-00-b-expected.txt | 121 +- .../t051202-c26-psudo-nest-00-c-expected.txt | 236 ++- .../t0602-c13-inh-underlin-00-e-expected.txt | 88 +- .../t0602-c13-inheritance-00-e-expected.txt | 42 +- .../t0602-inherit-bdr-pad-b-00-expected.txt | 18 +- .../css2.1/t0603-c11-import-00-b-expected.txt | 16 +- .../t060401-c32-cascading-00-b-expected.txt | 60 +- .../t060402-c31-important-00-b-expected.txt | 12 +- .../t060403-c21-pseu-cls-00-e-i-expected.txt | 10 +- .../t060403-c21-pseu-id-00-e-i-expected.txt | 10 +- .../t0801-c412-hz-box-00-b-a-expected.txt | 4 +- .../t0803-c5501-imrgn-t-00-b-ag-expected.txt | 4 +- .../t0803-c5501-mrgn-t-00-b-a-expected.txt | 4 +- .../t0803-c5502-imrgn-r-00-b-ag-expected.txt | 4 +- .../t0803-c5502-imrgn-r-01-b-ag-expected.txt | 4 +- .../t0803-c5502-imrgn-r-02-b-a-expected.txt | 4 +- .../t0803-c5502-imrgn-r-03-b-a-expected.txt | 4 +- .../t0803-c5502-imrgn-r-04-b-ag-expected.txt | 4 +- .../t0803-c5502-imrgn-r-05-b-ag-expected.txt | 4 +- .../t0803-c5502-imrgn-r-06-b-ag-expected.txt | 4 +- .../t0803-c5502-mrgn-r-00-c-ag-expected.txt | 4 +- .../t0803-c5502-mrgn-r-01-c-a-expected.txt | 4 +- .../t0803-c5502-mrgn-r-02-c-expected.txt | 4 +- .../t0803-c5502-mrgn-r-03-c-expected.txt | 12 +- .../t0803-c5503-imrgn-b-00-b-a-expected.txt | 4 +- .../t0803-c5503-mrgn-b-00-b-a-expected.txt | 4 +- .../t0803-c5504-imrgn-l-00-b-ag-expected.txt | 4 +- .../t0803-c5504-imrgn-l-01-b-ag-expected.txt | 4 +- .../t0803-c5504-imrgn-l-02-b-ag-expected.txt | 4 +- .../t0803-c5504-imrgn-l-03-b-a-expected.txt | 4 +- .../t0803-c5504-imrgn-l-04-b-ag-expected.txt | 4 +- .../t0803-c5504-imrgn-l-05-b-ag-expected.txt | 4 +- .../t0803-c5504-imrgn-l-06-b-ag-expected.txt | 4 +- .../t0803-c5504-mrgn-l-00-c-ag-expected.txt | 4 +- .../t0803-c5504-mrgn-l-01-c-a-expected.txt | 4 +- .../t0803-c5504-mrgn-l-02-c-expected.txt | 4 +- .../t0803-c5504-mrgn-l-03-c-expected.txt | 12 +- .../t0803-c5505-imrgn-00-a-ag-expected.txt | 4 +- .../t0803-c5505-mrgn-00-b-ag-expected.txt | 14 +- .../t0803-c5505-mrgn-01-e-a-expected.txt | 4 +- .../css2.1/t0803-c5505-mrgn-02-c-expected.txt | 4 +- .../t0803-c5505-mrgn-03-c-ag-expected.txt | 4 +- .../t080301-c411-vt-mrgn-00-b-expected.txt | 60 +- .../t0804-c5506-ipadn-t-00-b-a-expected.txt | 4 +- .../t0804-c5506-ipadn-t-01-b-a-expected.txt | 4 +- .../t0804-c5506-ipadn-t-02-b-a-expected.txt | 4 +- .../t0804-c5506-padn-t-00-b-a-expected.txt | 4 +- .../t0804-c5507-ipadn-r-00-b-ag-expected.txt | 4 +- .../t0804-c5507-ipadn-r-01-b-ag-expected.txt | 4 +- .../t0804-c5507-ipadn-r-02-b-ag-expected.txt | 4 +- .../t0804-c5507-ipadn-r-03-b-a-expected.txt | 4 +- .../t0804-c5507-ipadn-r-04-b-ag-expected.txt | 4 +- .../t0804-c5507-padn-r-00-c-ag-expected.txt | 4 +- .../t0804-c5507-padn-r-01-c-a-expected.txt | 4 +- .../t0804-c5507-padn-r-02-f-expected.txt | 8 +- .../t0804-c5507-padn-r-03-f-expected.txt | 12 +- .../t0804-c5508-ipadn-b-00-b-a-expected.txt | 4 +- .../t0804-c5508-ipadn-b-01-f-a-expected.txt | 4 +- .../t0804-c5508-ipadn-b-02-b-a-expected.txt | 4 +- .../t0804-c5508-ipadn-b-03-b-a-expected.txt | 4 +- .../t0804-c5509-ipadn-l-00-b-ag-expected.txt | 4 +- .../t0804-c5509-ipadn-l-01-b-ag-expected.txt | 4 +- .../t0804-c5509-ipadn-l-02-b-ag-expected.txt | 4 +- .../t0804-c5509-ipadn-l-03-b-a-expected.txt | 4 +- .../t0804-c5509-ipadn-l-04-f-ag-expected.txt | 4 +- .../t0804-c5509-padn-l-00-b-ag-expected.txt | 4 +- .../t0804-c5509-padn-l-01-b-a-expected.txt | 4 +- .../t0804-c5509-padn-l-02-f-expected.txt | 8 +- .../t0804-c5509-padn-l-03-f-g-expected.txt | 12 +- .../t0804-c5510-ipadn-00-b-ag-expected.txt | 4 +- .../t0804-c5510-padn-00-b-ag-expected.txt | 4 +- .../t0804-c5510-padn-01-e-a-expected.txt | 4 +- .../css2.1/t0804-c5510-padn-02-f-expected.txt | 12 +- .../t0805-c5511-brdr-tw-00-b-expected.txt | 4 +- .../t0805-c5511-brdr-tw-01-b-g-expected.txt | 4 +- .../t0805-c5511-brdr-tw-02-b-expected.txt | 4 +- .../t0805-c5511-brdr-tw-03-b-expected.txt | 4 +- .../t0805-c5511-ibrdr-tw-00-a-expected.txt | 14 +- .../t0805-c5512-brdr-rw-00-b-expected.txt | 4 +- .../t0805-c5512-brdr-rw-01-b-g-expected.txt | 4 +- .../t0805-c5512-brdr-rw-02-b-expected.txt | 4 +- .../t0805-c5512-brdr-rw-03-b-expected.txt | 4 +- .../t0805-c5512-ibrdr-rw-00-a-expected.txt | 14 +- .../t0805-c5513-brdr-bw-00-b-expected.txt | 4 +- .../t0805-c5513-brdr-bw-01-b-g-expected.txt | 4 +- .../t0805-c5513-brdr-bw-02-b-expected.txt | 4 +- .../t0805-c5513-brdr-bw-03-b-expected.txt | 4 +- .../t0805-c5513-ibrdr-bw-00-a-expected.txt | 14 +- .../t0805-c5514-brdr-lw-00-b-expected.txt | 4 +- .../t0805-c5514-brdr-lw-01-b-g-expected.txt | 4 +- .../t0805-c5514-brdr-lw-02-b-expected.txt | 4 +- .../t0805-c5514-brdr-lw-03-b-expected.txt | 4 +- .../t0805-c5514-ibrdr-lw-00-a-expected.txt | 14 +- .../t0805-c5515-brdr-w-00-a-expected.txt | 4 +- .../t0805-c5515-brdr-w-01-b-g-expected.txt | 4 +- .../t0805-c5515-brdr-w-02-b-expected.txt | 4 +- .../t0805-c5515-ibrdr-00-b-expected.txt | 14 +- .../t0805-c5516-brdr-c-00-a-expected.txt | 12 +- .../t0805-c5516-ibrdr-c-00-a-expected.txt | 18 +- .../t0805-c5517-brdr-s-00-c-expected.txt | 48 +- .../t0805-c5517-ibrdr-s-00-a-expected.txt | 22 +- .../t0805-c5518-brdr-t-00-a-expected.txt | 8 +- .../t0805-c5518-brdr-t-01-e-expected.txt | 80 +- .../t0805-c5518-ibrdr-t-00-a-expected.txt | 102 +- .../t0805-c5519-brdr-r-00-a-expected.txt | 63 +- .../t0805-c5519-brdr-r-01-e-expected.txt | 58 +- .../t0805-c5519-brdr-r-02-e-expected.txt | 78 +- .../t0805-c5519-ibrdr-r-00-a-expected.txt | 106 +- .../t0805-c5520-brdr-b-00-a-expected.txt | 8 +- .../t0805-c5520-brdr-b-01-e-expected.txt | 80 +- .../t0805-c5520-ibrdr-b-00-a-expected.txt | 102 +- .../t0805-c5521-brdr-l-00-a-expected.txt | 62 +- .../t0805-c5521-brdr-l-01-e-expected.txt | 58 +- .../t0805-c5521-brdr-l-02-e-expected.txt | 63 +- .../t0805-c5521-ibrdr-l-00-a-expected.txt | 110 +- .../css2.1/t0805-c5522-brdr-00-b-expected.txt | 36 +- .../t0805-c5522-brdr-01-b-g-expected.txt | 4 +- .../css2.1/t0805-c5522-brdr-02-e-expected.txt | 50 +- .../t0805-c5522-ibrdr-00-a-expected.txt | 99 +- .../t09-c5526c-display-00-e-expected.txt | 90 +- ...090204-display-change-01-b-ao-expected.txt | 4 +- .../t090402-c42-ibx-pad-00-d-ag-expected.txt | 4 +- .../css2.1/t0905-c414-flt-00-d-expected.txt | 4 +- .../css2.1/t0905-c414-flt-01-d-g-expected.txt | 4 +- .../css2.1/t0905-c414-flt-02-c-expected.txt | 31 +- .../css2.1/t0905-c414-flt-03-c-expected.txt | 31 +- .../css2.1/t0905-c414-flt-04-c-expected.txt | 43 +- .../t0905-c414-flt-fit-00-d-expected.txt | 4 +- .../t0905-c414-flt-fit-01-d-g-expected.txt | 4 +- .../t0905-c414-flt-wrap-00-e-expected.txt | 42 +- .../t0905-c414-flt-wrap-01-d-g-expected.txt | 4 +- .../t0905-c5525-fltblck-00-d-ag-expected.txt | 4 +- .../t0905-c5525-fltblck-01-d-expected.txt | 12 +- .../t0905-c5525-fltclr-00-c-ag-expected.txt | 4 +- .../t0905-c5525-fltcont-00-d-g-expected.txt | 62 +- .../t0905-c5525-flthw-00-c-g-expected.txt | 4 +- .../t0905-c5525-fltinln-00-c-ag-expected.txt | 4 +- .../t0905-c5525-fltmrgn-00-c-ag-expected.txt | 4 +- .../t0905-c5525-fltmult-00-d-g-expected.txt | 18 +- .../t0905-c5525-fltwidth-00-c-g-expected.txt | 184 +-- .../t0905-c5525-fltwidth-01-c-g-expected.txt | 4 +- .../t0905-c5525-fltwidth-02-c-g-expected.txt | 6 +- .../t0905-c5525-fltwidth-03-c-g-expected.txt | 6 +- .../t0905-c5525-fltwrap-00-b-expected.txt | 36 +- .../t0905-c5526-fltclr-00-c-ag-expected.txt | 4 +- .../t0905-c5526-flthw-00-c-g-expected.txt | 4 +- .../css2.1/t090501-c414-flt-00-d-expected.txt | 48 +- .../css2.1/t090501-c414-flt-01-b-expected.txt | 26 +- .../t090501-c414-flt-02-d-g-expected.txt | 17 +- .../t090501-c414-flt-03-b-g-expected.txt | 40 +- .../t090501-c414-flt-ln-00-d-expected.txt | 127 +- .../t090501-c414-flt-ln-01-d-g-expected.txt | 117 +- .../t090501-c414-flt-ln-02-d-expected.txt | 153 +- .../t090501-c414-flt-ln-03-d-expected.txt | 121 +- .../t090501-c5525-flt-l-00-b-g-expected.txt | 81 +- .../t090501-c5525-flt-r-00-b-g-expected.txt | 81 +- .../css2.1/t1001-abs-pos-cb-01-b-expected.txt | 4 +- .../css2.1/t1001-abs-pos-cb-02-b-expected.txt | 4 +- .../css2.1/t1001-abs-pos-cb-03-b-expected.txt | 4 +- .../css2.1/t1001-abs-pos-cb-04-b-expected.txt | 4 +- .../css2.1/t1001-abs-pos-cb-05-b-expected.txt | 4 +- .../css2.1/t1001-abs-pos-cb-06-b-expected.txt | 4 +- .../css2.1/t1001-abs-pos-cb-07-b-expected.txt | 4 +- .../css2.1/t1001-abs-pos-cb-08-b-expected.txt | 4 +- .../css2.1/t1001-abs-pos-cb-09-b-expected.txt | 4 +- .../t1002-c5523-width-00-b-g-expected.txt | 4 +- .../t1002-c5523-width-01-b-g-expected.txt | 4 +- .../t1002-c5523-width-02-b-g-expected.txt | 111 +- .../t100303-c412-blockw-00-d-ag-expected.txt | 4 +- .../t100304-c43-rpl-bbx-00-d-g-expected.txt | 6 +- .../t100304-c43-rpl-bbx-01-d-g-expected.txt | 18 +- .../t1004-c43-rpl-bbx-00-d-ag-expected.txt | 12 +- .../t1004-c43-rpl-ibx-00-d-ag-expected.txt | 32 +- .../t1004-c5524-width-00-b-g-expected.txt | 9 +- .../t1005-c5524-width-00-b-g-expected.txt | 4 +- .../t1005-c5524-width-01-b-g-expected.txt | 4 +- .../t1008-c44-ln-box-00-d-ag-expected.txt | 4 +- .../t1008-c44-ln-box-01-d-ag-expected.txt | 4 +- .../t1008-c44-ln-box-02-d-ag-expected.txt | 4 +- .../t1008-c44-ln-box-03-d-ag-expected.txt | 4 +- .../t100801-c42-ibx-ht-00-d-a-expected.txt | 4 +- .../t100801-c544-valgn-00-a-ag-expected.txt | 6 +- .../t100801-c544-valgn-01-d-ag-expected.txt | 4 +- .../t100801-c544-valgn-02-d-agi-expected.txt | 9 +- .../t100801-c544-valgn-03-d-agi-expected.txt | 10 +- .../t100801-c544-valgn-04-d-agi-expected.txt | 9 +- .../t100801-c548-leadin-00-d-a-expected.txt | 4 +- .../t100801-c548-ln-ht-00-c-a-expected.txt | 4 +- .../t100801-c548-ln-ht-01-b-ag-expected.txt | 4 +- .../t100801-c548-ln-ht-02-b-ag-expected.txt | 4 +- .../t100801-c548-ln-ht-03-d-ag-expected.txt | 4 +- .../t100801-c548-ln-ht-04-d-ag-expected.txt | 4 +- .../css2.1/t1202-counter-00-b-expected.txt | 26 +- .../css2.1/t1202-counter-01-b-expected.txt | 14 +- .../css2.1/t1202-counter-02-b-expected.txt | 14 +- .../css2.1/t1202-counter-03-b-expected.txt | 14 +- .../css2.1/t1202-counter-04-b-expected.txt | 14 +- .../css2.1/t1202-counter-05-b-expected.txt | 26 +- .../css2.1/t1202-counter-06-b-expected.txt | 56 +- .../css2.1/t1202-counter-07-b-expected.txt | 238 +-- .../css2.1/t1202-counter-08-b-expected.txt | 214 +-- .../css2.1/t1202-counter-09-b-expected.txt | 4 +- .../css2.1/t1202-counter-11-b-expected.txt | 4 +- .../css2.1/t1202-counter-12-b-expected.txt | 4 +- .../css2.1/t1202-counter-13-b-expected.txt | 4 +- .../css2.1/t1202-counter-14-b-expected.txt | 4 +- .../css2.1/t1202-counter-15-b-expected.txt | 4 +- .../css2.1/t1202-counter-16-f-expected.txt | 26 +- .../css2.1/t1202-counters-00-b-expected.txt | 26 +- .../css2.1/t1202-counters-01-b-expected.txt | 40 +- .../css2.1/t1202-counters-02-b-expected.txt | 14 +- .../css2.1/t1202-counters-03-b-expected.txt | 14 +- .../css2.1/t1202-counters-04-b-expected.txt | 154 +- .../css2.1/t1202-counters-05-b-expected.txt | 26 +- .../css2.1/t1202-counters-06-b-expected.txt | 56 +- .../css2.1/t1202-counters-07-b-expected.txt | 252 ++-- .../css2.1/t1202-counters-08-b-expected.txt | 228 +-- .../css2.1/t1202-counters-09-b-expected.txt | 4 +- .../css2.1/t1202-counters-11-b-expected.txt | 88 +- .../css2.1/t1202-counters-12-b-expected.txt | 88 +- .../css2.1/t1202-counters-13-b-expected.txt | 158 +- .../css2.1/t1202-counters-14-b-expected.txt | 158 +- .../css2.1/t1202-counters-15-b-expected.txt | 4 +- .../css2.1/t1202-counters-16-c-expected.txt | 48 +- .../css2.1/t1202-counters-17-d-expected.txt | 44 +- .../css2.1/t1202-counters-18-f-expected.txt | 26 +- .../css2.1/t1204-implied-00-b-expected.txt | 4 +- .../css2.1/t1204-implied-01-c-expected.txt | 4 +- .../css2.1/t1204-implied-02-d-expected.txt | 8 +- .../css2.1/t1204-multiple-00-c-expected.txt | 4 +- .../css2.1/t1204-multiple-01-c-expected.txt | 4 +- .../css2.1/t1204-order-00-c-expected.txt | 58 +- .../css2.1/t1204-order-01-d-expected.txt | 6 +- .../wincairo/css2.1/t1204-root-e-expected.txt | 4 +- .../css2.1/t120401-scope-00-b-expected.txt | 10 +- .../css2.1/t120401-scope-01-c-expected.txt | 34 +- .../css2.1/t120401-scope-02-c-expected.txt | 4 +- .../css2.1/t120401-scope-03-c-expected.txt | 4 +- .../css2.1/t120401-scope-04-d-expected.txt | 8 +- .../t120403-content-none-00-c-expected.txt | 4 +- .../t120403-display-none-00-c-expected.txt | 4 +- .../t120403-visibility-00-c-expected.txt | 4 +- .../t1205-c561-list-displ-00-b-expected.txt | 44 +- .../t1205-c563-list-type-00-b-expected.txt | 40 +- .../t1205-c563-list-type-01-b-expected.txt | 46 +- .../t1205-c564-list-img-00-b-g-expected.txt | 28 +- .../t1205-c565-list-pos-00-b-expected.txt | 4 +- .../t1205-c566-list-stl-00-e-ag-expected.txt | 4 +- .../t1205-c566-list-stl-01-c-g-expected.txt | 6 +- .../css2.1/t1401-c531-color-00-a-expected.txt | 8 +- .../t1402-c45-bg-canvas-00-b-expected.txt | 6 +- .../t140201-c532-bgcolor-00-a-expected.txt | 22 +- .../t140201-c532-bgcolor-01-b-expected.txt | 4 +- .../t140201-c533-bgimage-00-a-expected.txt | 18 +- .../t140201-c533-bgimage-01-b-g-expected.txt | 4 +- .../t140201-c534-bgre-00-b-ag-expected.txt | 4 +- .../t140201-c534-bgre-01-b-ag-expected.txt | 4 +- .../t140201-c534-bgreps-00-c-ag-expected.txt | 4 +- .../t140201-c534-bgreps-01-c-ag-expected.txt | 4 +- .../t140201-c534-bgreps-02-c-ag-expected.txt | 4 +- .../t140201-c534-bgreps-03-c-ag-expected.txt | 4 +- .../t140201-c534-bgreps-04-c-ag-expected.txt | 4 +- .../t140201-c534-bgreps-05-c-ag-expected.txt | 4 +- .../t140201-c535-bg-fixd-00-b-g-expected.txt | 642 ++++---- .../t140201-c536-bgpos-00-b-ag-expected.txt | 4 +- .../t140201-c536-bgpos-01-b-ag-expected.txt | 4 +- .../t140201-c537-bgfxps-00-c-ag-expected.txt | 201 +-- .../t1504-c523-font-style-00-b-expected.txt | 20 +- .../t1505-c524-font-var-00-b-expected.txt | 14 +- .../t1506-c525-font-wt-00-b-expected.txt | 56 +- .../t1507-c526-font-sz-00-b-expected.txt | 76 +- .../t1507-c526-font-sz-01-b-a-expected.txt | 4 +- .../t1507-c526-font-sz-02-b-a-expected.txt | 4 +- .../t1507-c526-font-sz-03-f-a-expected.txt | 4 +- .../css2.1/t1508-c527-font-00-b-expected.txt | 32 +- .../css2.1/t1508-c527-font-01-b-expected.txt | 36 +- .../css2.1/t1508-c527-font-02-b-expected.txt | 36 +- .../css2.1/t1508-c527-font-03-b-expected.txt | 32 +- .../css2.1/t1508-c527-font-04-b-expected.txt | 44 +- .../css2.1/t1508-c527-font-05-b-expected.txt | 35 +- .../css2.1/t1508-c527-font-07-b-expected.txt | 35 +- .../css2.1/t1508-c527-font-08-b-expected.txt | 34 +- .../css2.1/t1508-c527-font-09-b-expected.txt | 39 +- .../css2.1/t1508-c527-font-10-c-expected.txt | 42 +- .../t1601-c547-indent-00-b-a-expected.txt | 4 +- .../t1601-c547-indent-01-d-expected.txt | 46 +- .../t1602-c43-center-00-d-ag-expected.txt | 4 +- .../t1602-c546-txt-align-00-b-expected.txt | 92 +- .../t1604-c542-letter-sp-00-b-a-expected.txt | 4 +- .../t1604-c542-letter-sp-01-b-a-expected.txt | 4 +- .../t1605-c545-txttrans-00-b-ag-expected.txt | 4 +- .../t1606-c562-white-sp-00-b-ag-expected.txt | 4 +- .../t170602-bdr-conflct-w-00-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-01-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-02-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-03-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-04-d-expected.txt | 8 +- .../t170602-bdr-conflct-w-05-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-06-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-07-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-08-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-09-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-10-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-11-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-12-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-13-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-14-d-expected.txt | 30 +- .../t170602-bdr-conflct-w-15-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-16-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-17-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-18-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-19-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-20-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-21-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-22-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-23-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-24-d-expected.txt | 8 +- .../t170602-bdr-conflct-w-25-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-26-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-27-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-28-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-29-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-30-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-31-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-32-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-33-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-34-d-expected.txt | 30 +- .../t170602-bdr-conflct-w-35-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-36-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-37-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-38-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-39-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-40-d-expected.txt | 64 +- .../t170602-bdr-conflct-w-41-d-expected.txt | 64 +- .../t170602-bdr-conflct-w-42-d-expected.txt | 64 +- .../t170602-bdr-conflct-w-43-d-expected.txt | 64 +- .../t170602-bdr-conflct-w-44-d-expected.txt | 4 +- .../t170602-bdr-conflct-w-45-d-expected.txt | 64 +- .../t170602-bdr-conflct-w-46-d-expected.txt | 64 +- .../t170602-bdr-conflct-w-47-d-expected.txt | 64 +- .../t170602-bdr-conflct-w-48-d-expected.txt | 64 +- .../t170602-bdr-conflct-w-49-d-expected.txt | 64 +- .../t170602-bdr-conflct-w-50-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-51-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-52-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-53-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-54-d-expected.txt | 8 +- .../t170602-bdr-conflct-w-55-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-56-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-57-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-58-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-59-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-60-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-61-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-62-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-63-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-64-d-expected.txt | 30 +- .../t170602-bdr-conflct-w-65-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-66-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-67-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-68-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-69-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-70-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-71-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-72-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-73-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-74-d-expected.txt | 30 +- .../t170602-bdr-conflct-w-75-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-76-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-77-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-78-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-79-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-80-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-81-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-82-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-83-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-84-d-expected.txt | 8 +- .../t170602-bdr-conflct-w-85-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-86-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-87-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-88-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-89-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-90-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-91-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-92-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-93-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-94-d-expected.txt | 8 +- .../t170602-bdr-conflct-w-95-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-96-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-97-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-98-d-expected.txt | 68 +- .../t170602-bdr-conflct-w-99-d-expected.txt | 68 +- .../table-anonymous-objects-015-expected.txt | 4 +- .../table-anonymous-objects-016-expected.txt | 4 +- .../table-anonymous-objects-023-expected.txt | 32 +- .../table-anonymous-objects-024-expected.txt | 32 +- .../table-anonymous-objects-035-expected.txt | 32 +- .../table-anonymous-objects-036-expected.txt | 32 +- .../table-anonymous-objects-037-expected.txt | 32 +- .../table-anonymous-objects-038-expected.txt | 32 +- .../table-anonymous-objects-045-expected.txt | 32 +- .../table-anonymous-objects-046-expected.txt | 32 +- .../table-anonymous-objects-047-expected.txt | 32 +- .../table-anonymous-objects-048-expected.txt | 32 +- .../table-anonymous-objects-049-expected.txt | 32 +- .../table-anonymous-objects-050-expected.txt | 32 +- .../table-anonymous-objects-055-expected.txt | 4 +- .../table-anonymous-objects-056-expected.txt | 4 +- .../table-anonymous-objects-115-expected.txt | 4 +- .../table-anonymous-objects-116-expected.txt | 4 +- .../table-anonymous-objects-117-expected.txt | 4 +- .../table-anonymous-objects-118-expected.txt | 4 +- .../table-anonymous-objects-119-expected.txt | 4 +- .../table-anonymous-objects-120-expected.txt | 4 +- .../table-anonymous-objects-121-expected.txt | 4 +- .../table-anonymous-objects-122-expected.txt | 4 +- .../table-anonymous-objects-177-expected.txt | 4 +- .../table-anonymous-objects-178-expected.txt | 4 +- .../table-anonymous-objects-179-expected.txt | 4 +- .../table-anonymous-objects-180-expected.txt | 4 +- .../table-anonymous-objects-189-expected.txt | 4 +- .../table-anonymous-objects-190-expected.txt | 4 +- .../table-anonymous-objects-191-expected.txt | 4 +- .../table-anonymous-objects-192-expected.txt | 4 +- .../table-anonymous-objects-193-expected.txt | 4 +- .../table-anonymous-objects-194-expected.txt | 4 +- .../table-anonymous-objects-195-expected.txt | 4 +- .../table-anonymous-objects-196-expected.txt | 4 +- .../table-anonymous-objects-205-expected.txt | 4 +- .../table-anonymous-objects-206-expected.txt | 4 +- .../table-anonymous-objects-207-expected.txt | 4 +- .../table-anonymous-objects-208-expected.txt | 4 +- .../flexbox/flexbox-baseline-expected.txt | 380 ++--- .../unicode-bidi-isolate-basic-expected.txt | 12 +- .../editing/caret/caret-color-expected.txt | 12 +- .../editing/deleting/4922367-expected.txt | 8 +- .../editing/deleting/5099303-expected.txt | 18 +- .../editing/deleting/5126166-expected.txt | 20 +- .../editing/deleting/5144139-2-expected.txt | 24 +- .../editing/deleting/5206311-1-expected.txt | 28 +- .../editing/deleting/5272440-expected.txt | 12 +- .../editing/deleting/5369009-expected.txt | 26 +- .../editing/deleting/5433862-2-expected.txt | 52 +- .../editing/deleting/5483370-expected.txt | 28 +- .../deleting/delete-3608445-fix-expected.txt | 8 +- .../deleting/delete-3608462-fix-expected.txt | 6 +- .../deleting/delete-3857753-fix-expected.txt | 12 +- .../deleting/delete-3865854-fix-expected.txt | 12 +- .../deleting/delete-3928305-fix-expected.txt | 8 +- .../deleting/delete-4083333-fix-expected.txt | 12 +- .../delete-after-span-ws-001-expected.txt | 4 +- .../delete-after-span-ws-002-expected.txt | 4 +- .../delete-after-span-ws-003-expected.txt | 4 +- .../deleting/delete-and-undo-expected.txt | 10 +- ...e-at-paragraph-boundaries-002-expected.txt | 20 +- ...e-at-paragraph-boundaries-003-expected.txt | 20 +- ...e-at-paragraph-boundaries-004-expected.txt | 20 +- ...e-at-paragraph-boundaries-005-expected.txt | 20 +- ...e-at-paragraph-boundaries-006-expected.txt | 20 +- ...e-at-paragraph-boundaries-007-expected.txt | 22 +- ...e-at-paragraph-boundaries-008-expected.txt | 22 +- ...e-at-paragraph-boundaries-009-expected.txt | 22 +- ...e-at-paragraph-boundaries-010-expected.txt | 37 +- ...e-at-paragraph-boundaries-011-expected.txt | 36 +- .../delete-block-contents-003-expected.txt | 6 +- ...lete-block-merge-contents-001-expected.txt | 4 +- ...lete-block-merge-contents-002-expected.txt | 10 +- ...lete-block-merge-contents-003-expected.txt | 10 +- ...lete-block-merge-contents-004-expected.txt | 10 +- ...lete-block-merge-contents-005-expected.txt | 8 +- ...lete-block-merge-contents-006-expected.txt | 10 +- ...lete-block-merge-contents-007-expected.txt | 10 +- ...lete-block-merge-contents-008-expected.txt | 8 +- ...lete-block-merge-contents-009-expected.txt | 4 +- ...lete-block-merge-contents-011-expected.txt | 10 +- ...lete-block-merge-contents-012-expected.txt | 8 +- ...lete-block-merge-contents-013-expected.txt | 4 +- ...lete-block-merge-contents-014-expected.txt | 4 +- ...lete-block-merge-contents-015-expected.txt | 4 +- ...lete-block-merge-contents-016-expected.txt | 4 +- ...lete-block-merge-contents-017-expected.txt | 8 +- ...lete-block-merge-contents-018-expected.txt | 14 +- ...lete-block-merge-contents-019-expected.txt | 4 +- ...lete-block-merge-contents-020-expected.txt | 4 +- ...lete-block-merge-contents-021-expected.txt | 6 +- ...lete-block-merge-contents-022-expected.txt | 6 +- ...lete-block-merge-contents-023-expected.txt | 4 +- ...lete-block-merge-contents-024-expected.txt | 4 +- .../deleting/delete-br-001-expected.txt | 6 +- .../deleting/delete-br-002-expected.txt | 4 +- .../deleting/delete-br-003-expected.txt | 4 +- .../deleting/delete-br-004-expected.txt | 4 +- .../deleting/delete-br-005-expected.txt | 4 +- .../deleting/delete-br-006-expected.txt | 6 +- .../deleting/delete-br-007-expected.txt | 6 +- .../deleting/delete-br-008-expected.txt | 4 +- .../deleting/delete-br-009-expected.txt | 4 +- .../deleting/delete-br-010-expected.txt | 4 +- .../deleting/delete-br-013-expected.txt | 14 +- .../delete-character-001-expected.txt | 6 +- .../delete-contiguous-ws-001-expected.txt | 6 +- .../delete-first-list-item-expected.txt | 16 +- .../editing/deleting/delete-hr-expected.txt | 10 +- .../deleting/delete-image-001-expected.txt | 14 +- .../deleting/delete-image-002-expected.txt | 20 +- .../deleting/delete-image-003-expected.txt | 6 +- .../deleting/delete-line-001-expected.txt | 4 +- .../deleting/delete-line-002-expected.txt | 4 +- .../deleting/delete-line-003-expected.txt | 10 +- .../deleting/delete-line-004-expected.txt | 8 +- .../deleting/delete-line-005-expected.txt | 4 +- .../deleting/delete-line-006-expected.txt | 4 +- .../deleting/delete-line-007-expected.txt | 4 +- .../deleting/delete-line-008-expected.txt | 4 +- .../deleting/delete-line-009-expected.txt | 4 +- .../deleting/delete-line-010-expected.txt | 4 +- .../deleting/delete-line-011-expected.txt | 4 +- .../deleting/delete-line-012-expected.txt | 4 +- .../deleting/delete-line-013-expected.txt | 8 +- .../deleting/delete-line-014-expected.txt | 4 +- .../deleting/delete-line-015-expected.txt | 8 +- .../deleting/delete-line-016-expected.txt | 8 +- .../deleting/delete-line-017-expected.txt | 6 +- .../delete-line-end-ws-001-expected.txt | 8 +- .../delete-line-end-ws-002-expected.txt | 8 +- .../deleting/delete-listitem-001-expected.txt | 4 +- .../deleting/delete-listitem-002-expected.txt | 4 +- .../delete-selection-001-expected.txt | 6 +- .../delete-to-select-table-expected.txt | 20 +- .../delete-trailing-ws-001-expected.txt | 6 +- .../delete-trailing-ws-002-expected.txt | 6 +- .../deleting/delete-ws-fixup-001-expected.txt | 36 +- .../deleting/delete-ws-fixup-002-expected.txt | 46 +- .../deleting/forward-delete-expected.txt | 6 +- .../editing/deleting/list-item-1-expected.txt | 6 +- .../merge-different-styles-expected.txt | 18 +- .../merge-endOfParagraph-expected.txt | 24 +- .../editing/deleting/merge-no-br-expected.txt | 18 +- .../merge-unrendered-space-expected.txt | 16 +- .../merge-whitespace-pre-expected.txt | 12 +- .../deleting/move-nodes-001-expected.txt | 16 +- .../deleting/non-smart-delete-expected.txt | 26 +- .../pruning-after-merge-2-expected.txt | 28 +- .../editing/deleting/table-cells-expected.txt | 28 +- .../type-delete-after-quote-expected.txt | 10 +- .../execCommand/4580583-1-expected.txt | 24 +- .../execCommand/4580583-2-expected.txt | 28 +- .../execCommand/4641880-1-expected.txt | 18 +- .../execCommand/4641880-2-expected.txt | 18 +- .../editing/execCommand/4747450-expected.txt | 18 +- .../editing/execCommand/4916402-expected.txt | 10 +- .../editing/execCommand/4916541-expected.txt | 16 +- .../editing/execCommand/4924441-expected.txt | 12 +- .../execCommand/5080333-1-expected.txt | 23 +- .../execCommand/5080333-2-expected.txt | 23 +- .../editing/execCommand/5136770-expected.txt | 12 +- .../editing/execCommand/5138441-expected.txt | 18 +- .../execCommand/5142012-1-expected.txt | 27 +- .../execCommand/5142012-2-expected.txt | 8 +- .../editing/execCommand/5190926-expected.txt | 18 +- .../editing/execCommand/5481523-expected.txt | 41 +- .../editing/execCommand/5482023-expected.txt | 8 +- .../editing/execCommand/5569741-expected.txt | 10 +- .../create-list-with-hr-expected.txt | 16 +- .../execCommand/findString-2-expected.txt | 21 +- .../execCommand/findString-expected.txt | 12 +- .../indent-empty-root-expected.txt | 4 +- .../execCommand/indent-list-item-expected.txt | 12 +- .../execCommand/indent-selection-expected.txt | 44 +- .../insert-list-and-stitch-expected.txt | 12 +- .../execCommand/insertImage-expected.txt | 8 +- .../nsresponder-indent-expected.txt | 10 +- .../nsresponder-outdent-expected.txt | 10 +- .../editing/execCommand/paste-1-expected.txt | 10 +- .../editing/execCommand/print-expected.txt | 46 +- ...ove-list-from-range-selection-expected.txt | 32 +- .../remove-list-item-1-expected.txt | 8 +- .../execCommand/selectAll-expected.txt | 46 +- ...t-the-edge-of-contenteditable-expected.txt | 17 +- .../editing/input/emacs-ctrl-o-expected.txt | 26 +- ...veal-caret-of-multiline-input-expected.txt | 10 +- .../editing/inserting/12882-expected.txt | 28 +- .../editing/inserting/4278698-expected.txt | 10 +- .../editing/inserting/4840662-expected.txt | 12 +- .../editing/inserting/4875189-1-expected.txt | 10 +- .../editing/inserting/4875189-2-expected.txt | 16 +- .../editing/inserting/4959067-expected.txt | 10 +- .../editing/inserting/4960120-1-expected.txt | 4 +- .../editing/inserting/4960120-2-expected.txt | 10 +- .../editing/inserting/5002441-expected.txt | 8 +- .../editing/inserting/5058163-1-expected.txt | 28 +- .../editing/inserting/5058163-2-expected.txt | 14 +- .../editing/inserting/5156401-2-expected.txt | 12 +- .../editing/inserting/5418891-expected.txt | 12 +- .../editing/inserting/5549929-2-expected.txt | 8 +- .../editing/inserting/5549929-3-expected.txt | 18 +- .../editing/inserting/6703873-expected.txt | 22 +- .../before-after-input-element-expected.txt | 16 +- .../editable-inline-element-expected.txt | 10 +- .../edited-whitespace-1-expected.txt | 14 +- .../inserting/insert-3800346-fix-expected.txt | 8 +- .../inserting/insert-br-009-expected.txt | 14 +- .../insert-br-at-tabspan-003-expected.txt | 4 +- .../insert-br-quoted-001-expected.txt | 20 +- .../insert-br-quoted-002-expected.txt | 20 +- .../insert-br-quoted-003-expected.txt | 24 +- .../insert-br-quoted-004-expected.txt | 24 +- .../insert-br-quoted-005-expected.txt | 20 +- .../insert-br-quoted-006-expected.txt | 22 +- .../inserting/insert-div-011-expected.txt | 8 +- .../inserting/insert-div-012-expected.txt | 8 +- .../inserting/insert-div-013-expected.txt | 8 +- .../inserting/insert-div-014-expected.txt | 8 +- .../inserting/insert-div-015-expected.txt | 8 +- .../inserting/insert-div-016-expected.txt | 8 +- .../inserting/insert-div-017-expected.txt | 8 +- .../inserting/insert-div-018-expected.txt | 8 +- .../inserting/insert-div-019-expected.txt | 4 +- .../inserting/insert-div-020-expected.txt | 6 +- .../inserting/insert-div-022-expected.txt | 26 +- .../inserting/insert-div-023-expected.txt | 26 +- .../inserting/insert-div-024-expected.txt | 18 +- .../inserting/insert-div-025-expected.txt | 18 +- .../inserting/insert-div-026-expected.txt | 46 +- .../inserting/insert-div-027-expected.txt | 10 +- .../insert-paragraph-01-expected.txt | 20 +- .../insert-paragraph-02-expected.txt | 20 +- .../insert-paragraph-03-expected.txt | 14 +- .../insert-paragraph-04-expected.txt | 22 +- .../insert-paragraph-05-expected.txt | 23 +- .../insert-text-with-newlines-expected.txt | 18 +- .../editing/inserting/line-break-expected.txt | 8 +- .../multiple-lines-selected-expected.txt | 13 +- .../paragraph-separator-01-expected.txt | 10 +- .../paragraph-separator-02-expected.txt | 10 +- .../paragraph-separator-03-expected.txt | 23 +- ...aragraph-separator-in-table-1-expected.txt | 32 +- ...aragraph-separator-in-table-2-expected.txt | 30 +- .../editing/inserting/redo-expected.txt | 4 +- ...return-key-with-selection-001-expected.txt | 36 +- ...return-key-with-selection-002-expected.txt | 36 +- ...return-key-with-selection-003-expected.txt | 38 +- .../editing/inserting/typing-002-expected.txt | 8 +- .../typing-at-end-of-line-expected.txt | 12 +- .../editing/pasteboard/3976872-expected.txt | 22 +- .../editing/pasteboard/4076267-2-expected.txt | 12 +- .../editing/pasteboard/4076267-3-expected.txt | 148 +- .../editing/pasteboard/4076267-expected.txt | 8 +- .../editing/pasteboard/4242293-expected.txt | 28 +- .../editing/pasteboard/4631972-expected.txt | 14 +- .../editing/pasteboard/4641033-expected.txt | 8 +- .../editing/pasteboard/4944770-1-expected.txt | 20 +- .../editing/pasteboard/4944770-2-expected.txt | 18 +- .../editing/pasteboard/4947130-expected.txt | 20 +- .../editing/pasteboard/5028447-expected.txt | 8 +- .../editing/pasteboard/5032095-expected.txt | 12 +- .../editing/pasteboard/5071074-2-expected.txt | 18 +- .../editing/pasteboard/5071074-expected.txt | 24 +- .../editing/pasteboard/5075944-expected.txt | 16 +- .../editing/pasteboard/5134759-expected.txt | 24 +- .../editing/pasteboard/5156401-1-expected.txt | 18 +- .../editing/pasteboard/5387578-expected.txt | 22 +- .../editing/pasteboard/5478250-expected.txt | 26 +- .../editing/pasteboard/7955-expected.txt | 4 +- .../editing/pasteboard/8145-1-expected.txt | 8 +- .../editing/pasteboard/8145-3-expected.txt | 21 +- .../pasteboard/cut-text-001-expected.txt | 6 +- ...displaced-generic-placeholder-expected.txt | 14 +- .../displaced-placeholder-expected.txt | 12 +- .../innerText-inline-table-expected.txt | 24 +- .../merge-after-delete-1-expected.txt | 27 +- .../merge-after-delete-2-expected.txt | 27 +- .../merge-after-delete-expected.txt | 4 +- .../merge-end-blockquote-expected.txt | 26 +- .../pasteboard/merge-end-borders-expected.txt | 26 +- .../merge-start-blockquote-expected.txt | 17 +- .../pasteboard/merge-start-list-expected.txt | 10 +- .../editing/pasteboard/paste-2-expected.txt | 10 +- ...e-blockquote-after-blockquote-expected.txt | 12 +- .../pasteboard/paste-text-004-expected.txt | 16 +- .../pasteboard/paste-text-008-expected.txt | 16 +- .../pasteboard/paste-text-009-expected.txt | 12 +- .../pasteboard/paste-text-013-expected.txt | 27 +- .../pasteboard/paste-text-014-expected.txt | 16 +- .../paste-text-at-tabspan-003-expected.txt | 6 +- .../pasteboard/pasting-object-expected.txt | 19 +- .../pasteboard/pasting-tabs-expected.txt | 26 +- .../styled-element-markup-expected.txt | 30 +- .../subframe-dragndrop-1-expected.txt | 12 +- .../undoable-fragment-removes-expected.txt | 12 +- .../pasteboard/unrendered-br-expected.txt | 14 +- .../editing/selection/14971-expected.txt | 24 +- .../editing/selection/3690703-2-expected.txt | 134 +- .../editing/selection/3690703-expected.txt | 134 +- .../editing/selection/3690719-expected.txt | 134 +- .../editing/selection/4397952-expected.txt | 22 +- .../editing/selection/4402375-expected.txt | 28 +- .../editing/selection/4776665-expected.txt | 6 +- .../editing/selection/4818145-expected.txt | 23 +- .../editing/selection/4889598-expected.txt | 34 +- .../editing/selection/4895428-2-expected.txt | 30 +- .../editing/selection/4895428-3-expected.txt | 23 +- .../editing/selection/4932260-1-expected.txt | 14 +- .../editing/selection/4932260-2-expected.txt | 14 +- .../editing/selection/4932260-3-expected.txt | 14 +- .../editing/selection/4947387-expected.txt | 22 +- .../editing/selection/4960116-expected.txt | 10 +- .../editing/selection/4960137-expected.txt | 8 +- .../editing/selection/4975120-expected.txt | 11 +- .../editing/selection/5007143-2-expected.txt | 26 +- .../editing/selection/5007143-expected.txt | 30 +- .../editing/selection/5057506-2-expected.txt | 26 +- .../editing/selection/5057506-expected.txt | 26 +- .../editing/selection/5076323-1-expected.txt | 22 +- .../editing/selection/5076323-2-expected.txt | 16 +- .../editing/selection/5076323-3-expected.txt | 16 +- .../editing/selection/5081257-1-expected.txt | 10 +- .../editing/selection/5081257-2-expected.txt | 9 +- .../editing/selection/5099303-expected.txt | 16 +- .../editing/selection/5131716-1-expected.txt | 28 +- .../editing/selection/5131716-2-expected.txt | 28 +- .../editing/selection/5131716-3-expected.txt | 28 +- .../editing/selection/5131716-4-expected.txt | 28 +- .../editing/selection/5195166-2-expected.txt | 8 +- .../editing/selection/5232159-expected.txt | 30 +- .../editing/selection/5234383-1-expected.txt | 14 +- .../editing/selection/5234383-2-expected.txt | 14 +- .../editing/selection/5240265-expected.txt | 20 +- .../editing/selection/5354455-2-expected.txt | 29 +- .../editing/selection/6476-expected.txt | 44 +- .../editing/selection/7152-1-expected.txt | 40 +- .../editing/selection/7152-2-expected.txt | 44 +- .../selection/after-line-wrap-expected.txt | 734 ++++----- .../caret-before-select-expected.txt | 12 +- .../selection/caret-ltr-2-expected.txt | 12 +- .../selection/caret-ltr-2-left-expected.txt | 12 +- .../editing/selection/caret-ltr-expected.txt | 12 +- .../selection/caret-rtl-2-expected.txt | 12 +- .../editing/selection/caret-rtl-expected.txt | 12 +- .../selection/clear-selection-expected.txt | 7 +- .../click-start-of-line-expected.txt | 32 +- .../contains-boundaries-expected.txt | 28 +- .../contenteditable-click-inside-expected.txt | 6 +- .../selection/display-table-text-expected.txt | 12 +- .../selection/drag-in-iframe-expected.txt | 24 +- .../selection/drag-select-1-expected.txt | 18 +- .../selection/editable-links-expected.txt | 14 +- .../editable-non-editable-crash-expected.txt | 6 +- .../selection/end-of-document-expected.txt | 96 +- .../expanding-selections-expected.txt | 20 +- .../expanding-selections2-expected.txt | 20 +- .../extend-by-character-001-expected.txt | 6 +- .../extend-by-character-002-expected.txt | 22 +- .../extend-by-character-003-expected.txt | 22 +- .../extend-by-character-004-expected.txt | 20 +- .../extend-by-character-005-expected.txt | 22 +- .../extend-by-sentence-001-expected.txt | 4 +- .../selection/extend-by-word-002-expected.txt | 38 +- .../extend-selection-bidi-expected.txt | 22 +- .../selection/fake-doubleclick-expected.txt | 4 +- .../editing/selection/focus-body-expected.txt | 6 +- .../focus_editable_html-expected.txt | 22 +- .../editing/selection/iframe-expected.txt | 100 +- .../image-before-linebreak-expected.txt | 8 +- .../inline-closest-leaf-child-expected.txt | 54 +- .../selection/inline-table-expected.txt | 81 +- .../leave-requested-block-expected.txt | 28 +- .../selection/line-wrap-1-expected.txt | 10 +- .../selection/line-wrap-2-expected.txt | 14 +- .../mixed-editability-1-expected.txt | 14 +- .../mixed-editability-2-expected.txt | 24 +- .../mixed-editability-3-expected.txt | 28 +- .../mixed-editability-4-expected.txt | 28 +- .../mixed-editability-5-expected.txt | 28 +- .../mixed-editability-6-expected.txt | 32 +- .../mixed-editability-7-expected.txt | 32 +- .../mixed-editability-8-expected.txt | 36 +- .../mixed-editability-9-expected.txt | 39 +- .../selection/move-3875618-fix-expected.txt | 14 +- .../selection/move-3875641-fix-expected.txt | 12 +- .../move-backwords-by-word-001-expected.txt | 6 +- .../move-between-blocks-no-001-expected.txt | 10 +- .../move-between-blocks-yes-001-expected.txt | 10 +- .../move-by-character-001-expected.txt | 6 +- .../move-by-character-002-expected.txt | 20 +- .../move-by-character-003-expected.txt | 22 +- .../move-by-character-004-expected.txt | 20 +- .../move-by-character-005-expected.txt | 22 +- .../move-by-character-6-expected.txt | 6 +- .../selection/move-by-line-002-expected.txt | 4 +- .../move-by-sentence-001-expected.txt | 6 +- .../move-by-sentence-linebreak-expected.txt | 26 +- .../selection/node-removal-2-expected.txt | 28 +- .../paragraph-granularity-expected.txt | 70 +- .../previous-line-position-expected.txt | 34 +- ...ange-between-block-and-inline-expected.txt | 16 +- .../replace-selection-1-expected.txt | 22 +- .../replaced-boundaries-1-expected.txt | 11 +- .../replaced-boundaries-2-expected.txt | 11 +- .../replaced-boundaries-3-expected.txt | 15 +- ...elect-across-readonly-input-1-expected.txt | 29 +- ...elect-across-readonly-input-2-expected.txt | 29 +- ...elect-across-readonly-input-3-expected.txt | 35 +- ...elect-across-readonly-input-4-expected.txt | 41 +- ...elect-across-readonly-input-5-expected.txt | 41 +- .../selection/select-all-001-expected.txt | 28 +- .../selection/select-all-002-expected.txt | 40 +- .../selection/select-all-003-expected.txt | 30 +- .../selection/select-all-004-expected.txt | 4 +- .../selection/select-all-005-expected.txt | 7 +- .../selection/select-all-006-expected.txt | 7 +- .../selection/select-all-iframe-expected.txt | 40 +- .../editing/selection/select-box-expected.txt | 16 +- ...ct-element-paragraph-boundary-expected.txt | 8 +- ...elect-from-textfield-outwards-expected.txt | 44 +- ...select-text-overflow-ellipsis-expected.txt | 20 +- .../editing/selection/selectNode-expected.txt | 26 +- .../selection/selectNodeContents-expected.txt | 26 +- .../selection/selection-actions-expected.txt | 50 +- .../selection-button-text-expected.txt | 40 +- .../selection/table-caret-1-expected.txt | 40 +- .../selection/table-caret-2-expected.txt | 40 +- .../selection/table-caret-3-expected.txt | 40 +- .../transformed-selection-rects-expected.txt | 18 +- .../triple-click-in-pre-expected.txt | 18 +- .../selection/unrendered-001-expected.txt | 4 +- .../selection/unrendered-002-expected.txt | 4 +- .../selection/unrendered-003-expected.txt | 4 +- .../selection/unrendered-004-expected.txt | 4 +- .../selection/unrendered-005-expected.txt | 4 +- .../selection/unrendered-space-expected.txt | 14 +- ...r-ltr-extend-line-backward-br-expected.txt | 4 +- ...lr-ltr-extend-line-forward-br-expected.txt | 4 +- ...l-ltr-extend-line-backward-br-expected.txt | 4 +- ...rl-ltr-extend-line-backward-p-expected.txt | 4 +- ...ltr-extend-line-backward-wrap-expected.txt | 4 +- ...rl-ltr-extend-line-forward-br-expected.txt | 4 +- ...-rl-ltr-extend-line-forward-p-expected.txt | 4 +- ...-ltr-extend-line-forward-wrap-expected.txt | 4 +- ...l-rtl-extend-line-backward-br-expected.txt | 4 +- ...rl-rtl-extend-line-backward-p-expected.txt | 4 +- ...rl-rtl-extend-line-forward-br-expected.txt | 4 +- ...-rl-rtl-extend-line-forward-p-expected.txt | 4 +- .../selection/word-granularity-expected.txt | 70 +- .../wrapped-line-caret-1-expected.txt | 14 +- .../wrapped-line-caret-2-expected.txt | 16 +- .../editing/style/4916887-expected.txt | 10 +- .../editing/style/5017613-1-expected.txt | 26 +- .../editing/style/5017613-2-expected.txt | 38 +- .../editing/style/5046875-1-expected.txt | 14 +- .../editing/style/5046875-2-expected.txt | 14 +- .../editing/style/5065910-expected.txt | 28 +- .../editing/style/5084241-expected.txt | 23 +- .../editing/style/5228141-expected.txt | 12 +- .../editing/style/5279521-expected.txt | 4 +- .../apple-style-editable-mix-expected.txt | 52 +- .../style/block-style-001-expected.txt | 28 +- .../style/block-style-002-expected.txt | 28 +- .../style/block-style-003-expected.txt | 28 +- .../style/block-styles-007-expected.txt | 26 +- .../create-block-for-style-001-expected.txt | 10 +- .../create-block-for-style-002-expected.txt | 10 +- .../create-block-for-style-003-expected.txt | 4 +- .../create-block-for-style-004-expected.txt | 6 +- .../create-block-for-style-005-expected.txt | 10 +- .../create-block-for-style-006-expected.txt | 6 +- .../create-block-for-style-007-expected.txt | 10 +- .../create-block-for-style-008-expected.txt | 10 +- .../create-block-for-style-009-expected.txt | 6 +- .../create-block-for-style-010-expected.txt | 10 +- .../create-block-for-style-011-expected.txt | 6 +- .../create-block-for-style-012-expected.txt | 6 +- .../create-block-for-style-013-expected.txt | 6 +- .../editing/style/designmode-expected.txt | 10 +- .../style/font-family-with-space-expected.txt | 12 +- .../editing/style/highlight-expected.txt | 4 +- ...relative-font-size-change-001-expected.txt | 24 +- ...relative-font-size-change-002-expected.txt | 34 +- ...relative-font-size-change-003-expected.txt | 28 +- ...relative-font-size-change-004-expected.txt | 28 +- .../style/style-3681552-fix-001-expected.txt | 14 +- .../style/style-3681552-fix-002-expected.txt | 16 +- .../style/style-3998892-fix-expected.txt | 28 +- .../style/style-boundary-002-expected.txt | 22 +- .../style/style-boundary-003-expected.txt | 22 +- .../style/style-boundary-004-expected.txt | 14 +- .../style/table-selection-expected.txt | 4 +- .../style/typing-style-001-expected.txt | 12 +- .../style/typing-style-002-expected.txt | 16 +- .../editing/undo/4063751-expected.txt | 12 +- ...undo-combined-delete-boundary-expected.txt | 16 +- .../undo/undo-combined-delete-expected.txt | 8 +- .../undo/undo-delete-boundary-expected.txt | 16 +- .../editing/undo/undo-delete-expected.txt | 8 +- .../undo-forward-delete-boundary-expected.txt | 16 +- .../undo/undo-forward-delete-expected.txt | 8 +- .../list-delete-001-expected.txt | 42 +- .../list-delete-003-expected.txt | 44 +- .../list-type-after-expected.txt | 64 +- .../list-type-before-expected.txt | 64 +- .../table-delete-002-expected.txt | 44 +- .../table-type-after-expected.txt | 40 +- .../background-color/001-expected.txt | 4 +- .../background-color/001-xhtml-expected.txt | 4 +- .../background-color/002-expected.txt | 4 +- .../background-color/002-xhtml-expected.txt | 4 +- .../003-declarative-expected.txt | 4 +- .../background-color/003-expected.txt | 4 +- .../background-color/003-xhtml-expected.txt | 4 +- .../004-declarative-expected.txt | 4 +- .../background-color/004-expected.txt | 4 +- .../background-color/004-xhtml-expected.txt | 4 +- .../005-declarative-expected.txt | 4 +- .../background-color/005-expected.txt | 4 +- .../background-color/005-xhtml-expected.txt | 4 +- .../006-declarative-expected.txt | 4 +- .../background-color/006-expected.txt | 4 +- .../background-color/006-xhtml-expected.txt | 4 +- .../007-declarative-expected.txt | 4 +- .../background-color/007-expected.txt | 4 +- .../background-color/007-xhtml-expected.txt | 4 +- .../background-color/008-expected.txt | 4 +- .../background-color/008-xhtml-expected.txt | 4 +- .../background-image/001-expected.txt | 4 +- .../background-image/001-xhtml-expected.txt | 4 +- .../background-image/002-expected.txt | 4 +- .../background-image/002-xhtml-expected.txt | 4 +- .../003-declarative-expected.txt | 4 +- .../background-image/003-expected.txt | 4 +- .../background-image/003-xhtml-expected.txt | 4 +- .../004-declarative-expected.txt | 4 +- .../background-image/004-expected.txt | 4 +- .../background-image/004-xhtml-expected.txt | 4 +- .../005-declarative-expected.txt | 4 +- .../background-image/005-expected.txt | 4 +- .../background-image/005-xhtml-expected.txt | 4 +- .../006-declarative-expected.txt | 4 +- .../background-image/006-expected.txt | 4 +- .../background-image/006-xhtml-expected.txt | 4 +- .../007-declarative-expected.txt | 4 +- .../background-image/007-expected.txt | 4 +- .../background-image/007-xhtml-expected.txt | 4 +- .../background-image/008-expected.txt | 4 +- .../background-image/008-xhtml-expected.txt | 4 +- .../background-image/009-expected.txt | 14 +- .../background-image/009-xhtml-expected.txt | 14 +- .../background-image/010-expected.txt | 12 +- .../background-image/010-xhtml-expected.txt | 12 +- .../overflow/001-expected.txt | 35 +- .../overflow/001-xhtml-expected.txt | 35 +- .../overflow/002-expected.txt | 24 +- .../overflow/002-xhtml-expected.txt | 24 +- .../overflow/003-declarative-expected.txt | 24 +- .../overflow/003-expected.txt | 24 +- .../overflow/003-xhtml-expected.txt | 24 +- .../overflow/004-declarative-expected.txt | 24 +- .../overflow/004-expected.txt | 24 +- .../overflow/004-xhtml-expected.txt | 24 +- .../overflow/005-declarative-expected.txt | 41 +- .../overflow/005-expected.txt | 41 +- .../overflow/005-xhtml-expected.txt | 41 +- .../overflow/006-declarative-expected.txt | 4 +- .../overflow/006-expected.txt | 4 +- .../overflow/006-xhtml-expected.txt | 4 +- .../overflow/007-declarative-expected.txt | 24 +- .../overflow/007-expected.txt | 24 +- .../overflow/007-xhtml-expected.txt | 24 +- .../box-shadow/basic-shadows-expected.txt | 150 +- .../box-shadow/border-radius-big-expected.txt | 4 +- .../box-shadow-transformed-expected.txt | 4 +- ...-box-shadow-subpixel-position-expected.txt | 22 +- .../fast/box-shadow/inset-expected.txt | 10 +- .../transform-fringing-expected.txt | 4 +- .../fast/box-sizing/box-sizing-expected.txt | 26 +- .../fast/box-sizing/panels-one-expected.txt | 28 +- .../fast/box-sizing/panels-two-expected.txt | 28 +- .../box-sizing/percentage-height-expected.txt | 38 +- ...nvas-size-change-after-layout-expected.txt | 4 +- .../fast/canvas/canvas-zoom-expected.txt | 4 +- .../wincairo/fast/clip/001-expected.txt | 6 +- .../wincairo/fast/clip/002-expected.txt | 6 +- .../wincairo/fast/clip/003-expected.txt | 6 +- .../wincairo/fast/clip/004-expected.txt | 12 +- .../wincairo/fast/clip/005-expected.txt | 12 +- .../wincairo/fast/clip/006-expected.txt | 14 +- .../wincairo/fast/clip/007-expected.txt | 14 +- .../wincairo/fast/clip/008-expected.txt | 14 +- .../wincairo/fast/clip/009-expected.txt | 10 +- .../wincairo/fast/clip/010-expected.txt | 10 +- .../wincairo/fast/clip/011-expected.txt | 10 +- .../wincairo/fast/clip/012-expected.txt | 10 +- .../wincairo/fast/clip/013-expected.txt | 10 +- .../wincairo/fast/clip/014-expected.txt | 14 +- .../wincairo/fast/clip/015-expected.txt | 6 +- .../wincairo/fast/clip/016-expected.txt | 4 +- .../clip/nestedTransparencyClip-expected.txt | 20 +- .../clip/outline-overflowClip-expected.txt | 25 +- .../overflow-border-radius-clip-expected.txt | 6 +- ...ow-border-radius-combinations-expected.txt | 26 +- ...flow-border-radius-composited-expected.txt | 26 +- ...-border-radius-fixed-position-expected.txt | 12 +- ...low-border-radius-transformed-expected.txt | 26 +- .../wincairo/fast/compact/001-expected.txt | 14 +- .../wincairo/fast/compact/002-expected.txt | 4 +- .../wincairo/fast/compact/003-expected.txt | 14 +- .../css-generated-content/001-expected.txt | 6 +- .../css-generated-content/002-expected.txt | 18 +- .../css-generated-content/003-expected.txt | 4 +- .../css-generated-content/004-expected.txt | 6 +- .../css-generated-content/005-expected.txt | 16 +- .../css-generated-content/007-expected.txt | 10 +- .../css-generated-content/008-expected.txt | 18 +- .../css-generated-content/009-expected.txt | 30 +- .../css-generated-content/010-expected.txt | 6 +- .../css-generated-content/011-expected.txt | 8 +- .../css-generated-content/012-expected.txt | 37 +- .../css-generated-content/013-expected.txt | 40 +- .../css-generated-content/014-expected.txt | 126 +- .../css-generated-content/015-expected.txt | 20 +- .../css-generated-content/016-expected.txt | 40 +- .../after-duplicated-after-split-expected.txt | 26 +- .../after-order-expected.txt | 60 +- .../before-with-first-letter-expected.txt | 28 +- .../beforeAfter-interdocument-expected.txt | 32 +- .../details-summary-before-after-expected.txt | 38 +- .../hover-style-change-expected.txt | 50 +- .../initial-letter-basic-expected.txt | 26 +- ...initial-letter-border-padding-expected.txt | 29 +- .../initial-letter-clearance-expected.txt | 18 +- .../initial-letter-descender-expected.txt | 15 +- .../initial-letter-raised-expected.txt | 29 +- .../initial-letter-sunken-expected.txt | 30 +- .../inline-display-types-expected.txt | 88 +- .../no-openclose-quote-expected.txt | 10 +- .../table-before-after-child-add-expected.txt | 38 +- ...e-cell-before-after-child-add-expected.txt | 34 +- .../table-cell-before-content-expected.txt | 20 +- ...le-row-before-after-child-add-expected.txt | 38 +- .../table-row-before-after-expected.txt | 4 +- .../table-row-group-to-inline-expected.txt | 22 +- .../table-row-group-with-before-expected.txt | 24 +- .../table-row-with-before-expected.txt | 24 +- ...-table-before-after-child-add-expected.txt | 46 +- .../table-with-before-expected.txt | 24 +- .../visibleContentHiddenParent-expected.txt | 12 +- .../wbr-with-before-content-expected.txt | 12 +- .../wincairo/fast/css/001-expected.txt | 10 +- .../wincairo/fast/css/002-expected.txt | 12 +- .../wincairo/fast/css/003-expected.txt | 36 +- .../wincairo/fast/css/004-expected.txt | 22 +- .../wincairo/fast/css/005-expected.txt | 102 +- .../wincairo/fast/css/007-expected.txt | 12 +- .../wincairo/fast/css/008-expected.txt | 4 +- .../fast/css/ZeroOpacityLayers-expected.txt | 18 +- .../fast/css/ZeroOpacityLayers2-expected.txt | 18 +- ...bsolute-poition-in-rtl-parent-expected.txt | 30 +- .../wincairo/fast/css/acid2-expected.txt | 55 +- .../fast/css/acid2-pixel-expected.txt | 4 +- .../attribute-selector-dynamic-expected.txt | 10 +- ...ttribute-selector-empty-value-expected.txt | 4 +- ...kground-shorthand-invalid-url-expected.txt | 4 +- .../beforeSelectorOnCodeElement-expected.txt | 24 +- ...-contain-selector-empty-value-expected.txt | 12 +- ...i-override-in-anonymous-block-expected.txt | 168 +-- .../fast/css/border-height-expected.txt | 6 +- .../border-radius-outline-offset-expected.txt | 26 +- .../css/clip-text-in-scaled-div-expected.txt | 6 +- .../fast/css/clip-zooming-expected.txt | 10 +- .../fast/css/color-quirk-expected.txt | 8 +- .../fast/css/color-strict-expected.txt | 8 +- .../css/compare-content-style-expected.txt | 54 +- .../fast/css/continuationCrash-expected.txt | 68 +- .../counter-text-security-expected.txt | 4 +- .../counter-text-transform-expected.txt | 44 +- .../css/create_element_align-expected.txt | 12 +- .../fast/css/css-imports-expected.txt | 23 +- ...s1_forward_compatible_parsing-expected.txt | 46 +- .../fast/css/css3-nth-child-expected.txt | 80 +- .../css3-space-in-nth-and-lang-expected.txt | 24 +- .../css/disabled-author-styles-expected.txt | 4 +- .../css/dynamic-sibling-selector-expected.txt | 4 +- .../fast/css/empty-body-test-expected.txt | 4 +- .../fast/css/empty-pseudo-class-expected.txt | 62 +- .../fast/css/error-in-last-decl-expected.txt | 26 +- .../css/ex-after-font-variant-expected.txt | 26 +- .../css/fieldset-display-row-expected.txt | 4 +- .../fast/css/find-next-layer-expected.txt | 33 +- .../css/first-child-pseudo-class-expected.txt | 78 +- .../css/first-letter-capitalized-expected.txt | 36 +- .../fast/css/first-letter-detach-expected.txt | 40 +- ...first-letter-first-line-hover-expected.txt | 6 +- ...irst-letter-float-after-float-expected.txt | 28 +- .../fast/css/first-letter-float-expected.txt | 36 +- .../fast/css/first-letter-hover-expected.txt | 24 +- .../first-letter-recalculation-expected.txt | 14 +- .../css/first-letter-visibility-expected.txt | 22 +- .../first-line-text-decoration-expected.txt | 64 +- ...oration-inherited-from-parent-expected.txt | 50 +- .../first-of-type-pseudo-class-expected.txt | 90 +- .../fast/css/focus-ring-detached-expected.txt | 34 +- ...-ring-exists-for-search-field-expected.txt | 11 +- .../css/focus-ring-multiline-expected.txt | 34 +- ...ultiline-writingmode-vertical-expected.txt | 14 +- .../css/focus-ring-outline-color-expected.txt | 6 +- .../focus-ring-outline-offset-expected.txt | 14 +- .../css/focus-ring-outline-width-expected.txt | 6 +- ...font-face-implicit-local-font-expected.txt | 22 +- .../fast/css/font-face-opentype-expected.txt | 41 +- .../css/font-face-unicode-range-expected.txt | 72 +- .../font-face-weight-matching-expected.txt | 32 +- .../font-shorthand-weight-only-expected.txt | 26 +- .../fast/css/font-smoothing-expected.txt | 62 +- .../fast/css/font-weight-1-expected.txt | 4 +- .../css/font_property_normal-expected.txt | 40 +- .../css/h1-in-section-elements-expected.txt | 36 +- .../fast/css/hover-subselector-expected.txt | 36 +- .../wincairo/fast/css/hsl-color-expected.txt | 106 +- .../import-rule-regression-11590-expected.txt | 23 +- .../inline-element-line-break-expected.txt | 110 +- .../inline-properties-important-expected.txt | 15 +- .../css/input-search-padding-expected.txt | 12 +- .../invalid-percentage-property-expected.txt | 30 +- .../css/invalid-pseudo-classes-expected.txt | 4 +- .../css/invalidation-errors-2-expected.txt | 30 +- .../css/invalidation-errors-3-expected.txt | 22 +- .../fast/css/invalidation-errors-expected.txt | 30 +- .../css/last-child-pseudo-class-expected.txt | 80 +- .../last-of-type-pseudo-class-expected.txt | 90 +- .../fast/css/layerZOrderCrash-expected.txt | 54 +- .../css/line-after-floating-div-expected.txt | 4 +- .../fast/css/line-height-expected.txt | 27 +- .../css/line-height-overflow-expected.txt | 6 +- .../fast/css/link-outside-head-expected.txt | 6 +- .../fast/css/list-outline-expected.txt | 4 +- .../fast/css/live-cssrules-expected.txt | 4 +- ...gin-bottom-form-element-quirk-expected.txt | 4 +- ...in-bottom-form-element-strict-expected.txt | 4 +- .../margin-top-bottom-dynamic-expected.txt | 88 +- .../fast/css/namespaces/001-expected.txt | 6 +- .../fast/css/namespaces/002-expected.txt | 6 +- .../fast/css/namespaces/003-expected.txt | 4 +- .../fast/css/namespaces/004-expected.txt | 20 +- .../fast/css/namespaces/005-expected.txt | 16 +- .../fast/css/namespaces/006-expected.txt | 38 +- .../fast/css/namespaces/007-expected.txt | 4 +- .../namespaces-comments-expected.txt | 18 +- .../namespaces/namespaces-empty-expected.txt | 8 +- .../namespaces-escapes-expected.txt | 4 +- .../namespaces-invalid-at-expected.txt | 18 +- .../fast/css/negative-leading-expected.txt | 31 +- .../fast/css/negative-nth-child-expected.txt | 6 +- ...relative-position-percentages-expected.txt | 4 +- .../fast/css/non-empty-span-expected.txt | 24 +- .../non-standard-checkbox-size-expected.txt | 12 +- .../fast/css/nth-child-dynamic-expected.txt | 132 +- .../css/only-child-pseudo-class-expected.txt | 66 +- .../only-of-type-pseudo-class-expected.txt | 70 +- .../css/outline-auto-location-expected.txt | 16 +- .../pendingStylesheetFontSize-expected.txt | 4 +- ...-container-height-unspecified-expected.txt | 8 +- ...-value-with-relative-position-expected.txt | 4 +- .../position-negative-top-margin-expected.txt | 8 +- ...pecified-zoom-level-on-reload-expected.txt | 8 +- .../pseudo-element-line-break-expected.txt | 102 +- ...ed-with-inline-parent-dynamic-expected.txt | 58 +- ...inline-parent-dynamic-removed-expected.txt | 52 +- ...ock-nested-with-inline-parent-expected.txt | 56 +- ...ple-descendant-blocks-dynamic-expected.txt | 50 +- ...e-ancestor-and-parent-dynamic-expected.txt | 20 +- ...-with-inline-ancestor-dynamic-expected.txt | 20 +- ...line-ancestor-dynamic-removed-expected.txt | 20 +- ...ed-block-with-inline-ancestor-expected.txt | 20 +- ...ck-with-inline-parent-dynamic-expected.txt | 18 +- ...inline-parent-dynamic-removed-expected.txt | 16 +- ...ith-inline-parent-keeps-style-expected.txt | 16 +- .../fast/css/rem-dynamic-scaling-expected.txt | 16 +- .../fast/css/rem-units-on-root-expected.txt | 6 +- ...e-corner-tracking-transformed-expected.txt | 22 +- ...r-tracking-transformed-iframe-expected.txt | 22 +- .../fast/css/rtl-ordering-expected.txt | 60 +- .../fast/css/rtl-to-viewport-expected.txt | 6 +- .../css/selector-set-attribute-expected.txt | 24 +- .../fast/css/shadow-multiple-expected.txt | 36 +- ...simple-selector-chain-parsing-expected.txt | 4 +- .../fast/css/style-outside-head-expected.txt | 6 +- .../style-parsed-outside-head-expected.txt | 6 +- .../css/table-text-align-quirk-expected.txt | 8 +- .../css/table-text-align-strict-expected.txt | 8 +- .../css/target-fragment-match-expected.txt | 4 +- .../wincairo/fast/css/text-align-expected.txt | 56 +- ...put-with-webkit-border-radius-expected.txt | 20 +- .../text-overflow-ellipsis-bidi-expected.txt | 72 +- .../css/text-overflow-ellipsis-expected.txt | 116 +- ...text-overflow-ellipsis-strict-expected.txt | 116 +- ...ow-ellipsis-text-align-center-expected.txt | 140 +- ...w-ellipsis-text-align-justify-expected.txt | 183 +-- ...flow-ellipsis-text-align-left-expected.txt | 140 +- ...low-ellipsis-text-align-right-expected.txt | 140 +- .../fast/css/text-overflow-input-expected.txt | 398 ++--- .../fast/css/text-rendering-expected.txt | 14 +- .../fast/css/text-security-expected.txt | 76 +- .../css/text-transform-select-expected.txt | 76 +- .../css/textCapitalizeEdgeCases-expected.txt | 46 +- .../transform-default-parameter-expected.txt | 20 +- .../fast/css/transformed-mask-expected.txt | 4 +- .../css/universal-hover-quirk-expected.txt | 34 +- ...alue-list-out-of-bounds-crash-expected.txt | 4 +- ...ow-ellipsis-text-align-center-expected.txt | 132 +- ...w-ellipsis-text-align-justify-expected.txt | 132 +- ...flow-ellipsis-text-align-left-expected.txt | 132 +- ...low-ellipsis-text-align-right-expected.txt | 132 +- .../css/viewport-units-dynamic-expected.txt | 13 +- .../fast/css/word-space-extra-expected.txt | 1052 ++++++------- .../fast/css/zoom-font-size-expected.txt | 20 +- .../text-decoration-line-scaled-expected.txt | 114 +- .../wincairo/fast/doctypes/001-expected.txt | 10 +- .../wincairo/fast/doctypes/002-expected.txt | 10 +- .../wincairo/fast/doctypes/003-expected.txt | 10 +- .../wincairo/fast/doctypes/004-expected.txt | 10 +- .../wincairo/fast/dom/34176-expected.txt | 489 +++--- .../wincairo/fast/dom/52776-expected.txt | 116 +- .../class-attribute-whitespace-expected.txt | 56 +- .../Element/null-offset-parent-expected.txt | 6 +- ...meless-location-bugzilla10837-expected.txt | 8 +- .../fast/dom/HTMLElement/bdo-expected.txt | 48 +- .../head-link-style-href-check-expected.txt | 50 +- .../HTMLHeadElement/textInHead1-expected.txt | 4 +- .../HTMLHeadElement/textInHead2-expected.txt | 4 +- .../HTMLHeadElement/textInHead3-expected.txt | 4 +- .../HTMLHeadElement/textInHead4-expected.txt | 10 +- .../HTMLHeadElement/textInHead5-expected.txt | 4 +- .../image-alt-text-expected.txt | 10 +- .../input-image-alt-text-expected.txt | 12 +- .../pending-stylesheet-count-expected.txt | 22 +- .../meter-boundary-values-expected.txt | 128 +- .../meter-optimums-expected.txt | 110 +- .../meter-styles-changing-pseudo-expected.txt | 8 +- .../meter-styles-expected.txt | 76 +- .../vspace-hspace-as-number-expected.txt | 10 +- .../native-progress-bar-expected.txt | 4 +- ...ress-bar-value-pseudo-element-expected.txt | 48 +- .../resize-table-using-col-width-expected.txt | 48 +- .../dom/HTMLTableElement/colSpan-expected.txt | 144 +- .../createCaption-expected.txt | 134 +- .../reset-textarea-expected.txt | 34 +- .../create-contextual-fragment-expected.txt | 10 +- .../fast/dom/Window/btoa-pnglet-expected.txt | 4 +- ...open-existing-pop-up-blocking-expected.txt | 15 +- .../fast/dom/anchor-text-expected.txt | 16 +- .../dom/blur-contenteditable-expected.txt | 8 +- .../fast/dom/children-nodes-expected.txt | 163 +- .../clone-contents-0-end-offset-expected.txt | 10 +- .../dom/clone-node-dynamic-style-expected.txt | 62 +- .../comment-not-documentElement-expected.txt | 4 +- .../fast/dom/createDocumentType-expected.txt | 8 +- ...s-mediarule-deleteRule-update-expected.txt | 4 +- ...s-mediarule-insertRule-update-expected.txt | 4 +- .../fast/dom/css-rule-functions-expected.txt | 26 +- .../dom/focus-contenteditable-expected.txt | 14 +- .../fast/dom/importNodeHTML-expected.txt | 40 +- .../fast/dom/importNodeXML-expected.txt | 40 +- .../wincairo/fast/dom/inner-text-expected.txt | 4 +- .../wincairo/fast/dom/outerText-expected.txt | 4 +- ...scroll-to-leftmost-and-resize-expected.txt | 6 +- .../scroll-reveal-left-overflow-expected.txt | 4 +- .../scroll-reveal-top-overflow-expected.txt | 4 +- .../wincairo/fast/dynamic/002-expected.txt | 26 +- .../wincairo/fast/dynamic/004-expected.txt | 4 +- .../wincairo/fast/dynamic/006-expected.txt | 4 +- .../wincairo/fast/dynamic/007-expected.txt | 24 +- .../wincairo/fast/dynamic/008-expected.txt | 4 +- .../wincairo/fast/dynamic/009-expected.txt | 4 +- .../wincairo/fast/dynamic/011-expected.txt | 14 +- .../wincairo/fast/dynamic/012-expected.txt | 40 +- .../wincairo/fast/dynamic/013-expected.txt | 12 +- .../wincairo/fast/dynamic/014-expected.txt | 32 +- .../wincairo/fast/dynamic/015-expected.txt | 59 +- .../fast/dynamic/anchor-lock-expected.txt | 20 +- ...nonymous-block-orphaned-lines-expected.txt | 32 +- .../containing-block-change-expected.txt | 34 +- ...erer-for-whitespace-only-text-expected.txt | 140 +- ...tespace-after-last-line-break-expected.txt | 36 +- .../dynamic/float-withdrawal-expected.txt | 36 +- ...re-table-part-in-continuation-expected.txt | 367 ++--- .../dynamic/layer-hit-test-crash-expected.txt | 12 +- .../dynamic/link-href-change-expected.txt | 6 +- .../move-node-with-selection-expected.txt | 6 +- .../dynamic/noninlinebadness-expected.txt | 8 +- .../fast/dynamic/outerHTML-doc-expected.txt | 20 +- .../fast/dynamic/outerHTML-img-expected.txt | 16 +- ...ment-with-positioned-children-expected.txt | 16 +- .../selection-highlight-adjust-expected.txt | 36 +- ...cY-marking-parents-regression-expected.txt | 48 +- .../fast/dynamic/text-combine-expected.txt | 4 +- .../fast/dynamic/view-overflow-expected.txt | 26 +- ...window-resize-scrollbars-test-expected.txt | 4 +- .../window-scrollbars-test-expected.txt | 4 +- .../events/context-no-deselect-expected.txt | 4 +- .../event-listener-on-link-expected.txt | 6 +- .../fast/events/pointer-events-2-expected.txt | 107 +- .../fast/events/resize-events-expected.txt | 20 +- .../reveal-link-when-focused-expected.txt | 10 +- .../fixed-position-element-expected.txt | 6 +- .../no-fixed-position-elements-expected.txt | 10 +- .../crash-on-zero-radius-expected.txt | 4 +- .../generated-gradients-expected.txt | 16 +- .../gradients/list-item-gradient-expected.txt | 12 +- .../gradients/radial-centered-expected.txt | 12 +- .../gradients/simple-gradients-expected.txt | 8 +- .../html/details-add-child-1-expected.txt | 10 +- .../html/details-add-child-2-expected.txt | 10 +- .../details-add-details-child-1-expected.txt | 10 +- .../details-add-details-child-2-expected.txt | 12 +- ...tails-add-summary-1-and-click-expected.txt | 4 +- .../html/details-add-summary-1-expected.txt | 4 +- ...ails-add-summary-10-and-click-expected.txt | 4 +- .../html/details-add-summary-10-expected.txt | 8 +- ...tails-add-summary-2-and-click-expected.txt | 8 +- .../html/details-add-summary-2-expected.txt | 4 +- ...tails-add-summary-3-and-click-expected.txt | 8 +- .../html/details-add-summary-3-expected.txt | 4 +- ...tails-add-summary-4-and-click-expected.txt | 8 +- .../html/details-add-summary-4-expected.txt | 4 +- ...tails-add-summary-5-and-click-expected.txt | 8 +- .../html/details-add-summary-5-expected.txt | 4 +- ...tails-add-summary-6-and-click-expected.txt | 4 +- .../html/details-add-summary-6-expected.txt | 4 +- ...tails-add-summary-7-and-click-expected.txt | 4 +- .../html/details-add-summary-7-expected.txt | 8 +- ...tails-add-summary-8-and-click-expected.txt | 4 +- .../html/details-add-summary-8-expected.txt | 8 +- ...tails-add-summary-9-and-click-expected.txt | 4 +- .../html/details-add-summary-9-expected.txt | 8 +- .../details-add-summary-child-1-expected.txt | 10 +- .../details-add-summary-child-2-expected.txt | 12 +- .../html/details-marker-style-expected.txt | 36 +- .../fast/html/details-nested-1-expected.txt | 16 +- .../fast/html/details-nested-2-expected.txt | 16 +- .../html/details-no-summary1-expected.txt | 4 +- .../html/details-no-summary2-expected.txt | 4 +- .../html/details-no-summary3-expected.txt | 4 +- .../html/details-no-summary4-expected.txt | 4 +- .../html/details-open-javascript-expected.txt | 8 +- .../fast/html/details-open1-expected.txt | 4 +- .../fast/html/details-open2-expected.txt | 4 +- .../fast/html/details-open3-expected.txt | 4 +- .../fast/html/details-open4-expected.txt | 4 +- .../fast/html/details-open5-expected.txt | 4 +- .../fast/html/details-open6-expected.txt | 4 +- .../fast/html/details-position-expected.txt | 20 +- .../html/details-remove-child-1-expected.txt | 8 +- .../html/details-remove-child-2-expected.txt | 8 +- ...ls-remove-summary-1-and-click-expected.txt | 4 +- .../details-remove-summary-1-expected.txt | 4 +- ...ls-remove-summary-2-and-click-expected.txt | 4 +- .../details-remove-summary-2-expected.txt | 4 +- ...ls-remove-summary-3-and-click-expected.txt | 4 +- .../details-remove-summary-3-expected.txt | 4 +- ...ls-remove-summary-4-and-click-expected.txt | 4 +- .../details-remove-summary-4-expected.txt | 4 +- ...ls-remove-summary-5-and-click-expected.txt | 4 +- .../details-remove-summary-5-expected.txt | 4 +- ...ls-remove-summary-6-and-click-expected.txt | 4 +- .../details-remove-summary-6-expected.txt | 4 +- ...etails-remove-summary-child-1-expected.txt | 8 +- ...etails-remove-summary-child-2-expected.txt | 10 +- .../html/details-replace-text-expected.txt | 4 +- .../html/details-writing-mode-expected.txt | 648 ++++---- ...-weight-bold-for-b-and-strong-expected.txt | 38 +- .../html/link-rel-stylesheet-expected.txt | 16 +- .../wincairo/fast/html/listing-expected.txt | 16 +- .../fast/inline-block/001-expected.txt | 140 +- .../fast/inline-block/002-expected.txt | 4 +- .../fast/inline-block/003-expected.txt | 24 +- .../fast/inline-block/006-expected.txt | 58 +- .../14498-positionForCoordinates-expected.txt | 32 +- .../contenteditable-baseline-expected.txt | 26 +- .../inline-block-vertical-align-expected.txt | 10 +- .../inline-block/overflow-clip-expected.txt | 26 +- .../inline-block/tricky-baseline-expected.txt | 201 +-- .../line-grid-contains-value-expected.txt | 22 +- .../line-grid/line-grid-floating-expected.txt | 34 +- .../line-grid-inside-columns-expected.txt | 127 +- .../line-grid-into-columns-expected.txt | 70 +- .../line-grid-into-floats-expected.txt | 46 +- .../line-grid-positioned-expected.txt | 38 +- .../abs-position-in-reflection-expected.txt | 4 +- .../reflections/inline-crash-expected.txt | 36 +- .../opacity-reflection-transform-expected.txt | 6 +- .../reflection-nesting-expected.txt | 4 +- .../reflection-overflow-hidden-expected.txt | 18 +- ...ansparent-reflected-sublayers-expected.txt | 4 +- .../text/arabic-times-new-roman-expected.txt | 6 +- .../atsui-kerning-and-ligatures-expected.txt | 26 +- .../atsui-multiple-renderers-expected.txt | 78 +- ...sui-negative-spacing-features-expected.txt | 62 +- .../text/atsui-partial-selection-expected.txt | 44 +- .../atsui-pointtooffset-calls-cg-expected.txt | 14 +- .../atsui-rtl-override-selection-expected.txt | 4 +- ...i-small-caps-punctuation-size-expected.txt | 46 +- .../text/atsui-spacing-features-expected.txt | 90 +- ...backslash-to-yen-sign-dynamic-expected.txt | 4 +- .../wincairo/fast/text/basic/001-expected.txt | 28 +- .../wincairo/fast/text/basic/002-expected.txt | 24 +- .../wincairo/fast/text/basic/003-expected.txt | 6 +- .../wincairo/fast/text/basic/004-expected.txt | 56 +- .../wincairo/fast/text/basic/005-expected.txt | 20 +- .../wincairo/fast/text/basic/006-expected.txt | 12 +- .../wincairo/fast/text/basic/007-expected.txt | 60 +- .../wincairo/fast/text/basic/008-expected.txt | 41 +- .../wincairo/fast/text/basic/009-expected.txt | 14 +- .../wincairo/fast/text/basic/011-expected.txt | 30 +- .../wincairo/fast/text/basic/012-expected.txt | 48 +- .../wincairo/fast/text/basic/013-expected.txt | 100 +- .../wincairo/fast/text/basic/014-expected.txt | 50 +- .../wincairo/fast/text/basic/015-expected.txt | 83 +- .../basic/generic-family-changes-expected.txt | 54 +- .../basic/generic-family-reset-expected.txt | 104 +- ...i-embedding-pop-and-push-same-expected.txt | 136 +- .../fast/text/break-word-expected.txt | 30 +- .../text/capitalize-boundaries-expected.txt | 369 +++-- ...talize-empty-generated-string-expected.txt | 72 +- .../capitalize-preserve-nbsp-expected.txt | 46 +- .../text/cg-fallback-bolding-expected.txt | 16 +- .../fast/text/cg-vs-atsui-expected.txt | 52 +- ...ex-synthetic-bold-space-width-expected.txt | 4 +- .../text/complex-text-opacity-expected.txt | 12 +- .../delete-hard-break-character-expected.txt | 24 +- .../fast/text/drawBidiText-expected.txt | 8 +- ...embed-at-end-of-pre-wrap-line-expected.txt | 26 +- .../wincairo/fast/text/emphasis-expected.txt | 306 ++-- .../fast/text/emphasis-vertical-expected.txt | 200 ++- .../fast/text/fake-italic-expected.txt | 8 +- .../fast/text/firstline/001-expected.txt | 10 +- .../fast/text/firstline/002-expected.txt | 4 +- .../fast/text/firstline/003-expected.txt | 4 +- ...ixed-pitch-control-characters-expected.txt | 20 +- .../fast/text/font-initial-expected.txt | 28 +- .../fast/text/format-control-expected.txt | 28 +- .../text/hyphenate-character-expected.txt | 124 +- .../hyphenate-limit-before-after-expected.txt | 122 +- .../text/hyphenate-limit-lines-expected.txt | 40 +- .../fast/text/hyphenate-locale-expected.txt | 40 +- .../wincairo/fast/text/hyphens-expected.txt | 93 +- .../text/in-rendered-text-rtl-expected.txt | 24 +- .../wincairo/fast/text/indic-expected.txt | 6 +- .../international/arabic-justify-expected.txt | 28 +- .../bidi-AN-after-L-expected.txt | 4 +- .../bidi-AN-after-empty-run-expected.txt | 22 +- .../bidi-CS-after-AN-expected.txt | 4 +- .../bidi-L2-run-reordering-expected.txt | 48 +- .../international/bidi-LDB-2-CSS-expected.txt | 460 +++--- .../bidi-LDB-2-HTML-expected.txt | 436 +++--- ...i-LDB-2-formatting-characters-expected.txt | 376 ++--- ...-control-chars-treated-as-ZWS-expected.txt | 9 +- .../bidi-european-terminators-expected.txt | 30 +- .../bidi-explicit-embedding-expected.txt | 70 +- ...gnored-for-first-child-inline-expected.txt | 126 +- .../international/bidi-innertext-expected.txt | 124 +- .../bidi-layout-across-linebreak-expected.txt | 4 +- .../bidi-linebreak-001-expected.txt | 14 +- .../bidi-linebreak-002-expected.txt | 14 +- .../bidi-linebreak-003-expected.txt | 14 +- .../bidi-listbox-atsui-expected.txt | 28 +- .../international/bidi-listbox-expected.txt | 40 +- .../international/bidi-menulist-expected.txt | 48 +- .../bidi-mirror-he-ar-expected.txt | 8 +- ...irectionality-paragraph-start-expected.txt | 42 +- .../bidi-neutral-run-expected.txt | 4 +- .../international/bidi-override-expected.txt | 186 +-- .../international/bold-bengali-expected.txt | 14 +- .../international/danda-space-expected.txt | 14 +- .../international/hebrew-vowels-expected.txt | 12 +- .../international/hindi-spacing-expected.txt | 8 +- .../hindi-whitespace-expected.txt | 12 +- .../khmer-selection-expected.txt | 31 +- ...-text-alignment-and-direction-expected.txt | 168 +-- .../text/international/rtl-caret-expected.txt | 28 +- .../rtl-white-space-pre-wrap-expected.txt | 50 +- .../system-font-punctuation-expected.txt | 6 +- .../text-combine-image-test-expected.txt | 38 +- .../thai-baht-space-expected.txt | 16 +- .../thai-line-breaks-expected.txt | 31 +- ...de-bidi-plaintext-in-textarea-expected.txt | 57 +- .../justified-selection-at-edge-expected.txt | 27 +- .../text/justified-selection-expected.txt | 30 +- ...y-ideograph-leading-expansion-expected.txt | 32 +- .../large-text-composed-char-expected.txt | 4 +- ...tter-spacing-negative-opacity-expected.txt | 8 +- ...line-breaks-after-white-space-expected.txt | 20 +- .../fast/text/line-breaks-expected.txt | 42 +- ...ine-initial-and-final-swashes-expected.txt | 4 +- ...rd-break-after-breakable-char-expected.txt | 104 +- .../fast/text/midword-break-hang-expected.txt | 18 +- .../text/monospace-width-cache-expected.txt | 28 +- .../fast/text/reset-emptyRun-expected.txt | 50 +- .../selection-hard-linebreak-expected.txt | 40 +- .../text/selection-rect-rounding-expected.txt | 136 +- .../fast/text/should-use-atsui-expected.txt | 26 +- .../text/stroking-decorations-expected.txt | 18 +- .../wincairo/fast/text/stroking-expected.txt | 16 +- .../text-combine-different-fonts-expected.txt | 24 +- .../text/text-letter-spacing-expected.txt | 323 ++-- .../text-shadow-no-default-color-expected.txt | 4 +- .../text/textIteratorNilRenderer-expected.txt | 20 +- .../text/trailing-white-space-2-expected.txt | 184 +-- .../text/trailing-white-space-expected.txt | 104 +- .../unicode-variation-selector-expected.txt | 28 +- .../vertical-rl-rtl-linebreak-expected.txt | 6 +- .../wincairo/fast/text/wbr-expected.txt | 24 +- .../fast/text/wbr-in-pre-crash-expected.txt | 36 +- .../fast/text/wbr-styled-expected.txt | 44 +- .../fast/text/whitespace/002-expected.txt | 4 +- .../fast/text/whitespace/003-expected.txt | 4 +- .../fast/text/whitespace/004-expected.txt | 4 +- .../fast/text/whitespace/005-expected.txt | 4 +- .../fast/text/whitespace/006-expected.txt | 4 +- .../fast/text/whitespace/007-expected.txt | 4 +- .../fast/text/whitespace/008-expected.txt | 4 +- .../fast/text/whitespace/009-expected.txt | 4 +- .../fast/text/whitespace/010-expected.txt | 4 +- .../fast/text/whitespace/011-expected.txt | 4 +- .../fast/text/whitespace/012-expected.txt | 4 +- .../fast/text/whitespace/015-expected.txt | 4 +- .../fast/text/whitespace/016-expected.txt | 4 +- .../fast/text/whitespace/018-expected.txt | 4 +- .../fast/text/whitespace/020-expected.txt | 30 +- .../fast/text/whitespace/021-expected.txt | 13 +- .../fast/text/whitespace/024-expected.txt | 89 +- .../fast/text/whitespace/025-expected.txt | 10 +- .../fast/text/whitespace/026-expected.txt | 4 +- .../fast/text/whitespace/027-expected.txt | 80 +- .../fast/text/whitespace/030-expected.txt | 6 +- .../nbsp-mode-and-linewraps-expected.txt | 268 ++-- .../normal-after-nowrap-breaking-expected.txt | 690 ++++----- .../whitespace/pre-break-word-expected.txt | 6 +- .../pre-wrap-last-char-expected.txt | 32 +- .../pre-wrap-line-test-expected.txt | 14 +- .../pre-wrap-overflow-selection-expected.txt | 26 +- ...pre-wrap-spaces-after-newline-expected.txt | 68 +- ...in-word-space-causes-overflow-expected.txt | 22 +- .../text/wide-zero-width-space-expected.txt | 34 +- .../fast/text/word-break-expected.txt | 80 +- .../text/word-break-run-rounding-expected.txt | 55 +- .../text/word-break-soft-hyphen-expected.txt | 36 +- .../fast/text/word-space-expected.txt | 40 +- .../fast/text/zero-font-size-expected.txt | 6 +- .../bounding-rect-zoom-expected.txt | 18 +- .../fast/transforms/diamond-expected.txt | 6 +- .../transforms/identity-matrix-expected.txt | 6 +- .../overflow-with-transform-expected.txt | 46 +- .../skew-with-unitless-zero-expected.txt | 4 +- .../transform-on-inline-expected.txt | 46 +- .../transform-overflow-expected.txt | 4 +- ...transform-positioned-ancestor-expected.txt | 29 +- .../transform-table-row-expected.txt | 48 +- .../transforms/transformed-caret-expected.txt | 12 +- .../transformed-document-element-expected.txt | 4 +- .../transforms-with-opacity-expected.txt | 4 +- .../transforms-with-zoom-expected.txt | 10 +- .../wincairo/fonts/cursive-expected.txt | 484 +++--- .../wincairo/fonts/default-expected.txt | 478 +++--- .../wincairo/fonts/monospace-expected.txt | 38 +- .../wincairo/fonts/sans-serif-expected.txt | 340 ++--- .../wincairo/fonts/serif-expected.txt | 552 +++---- .../file-url-sent-as-referer-expected.txt | 12 +- .../http/tests/misc/acid2-expected.txt | 55 +- .../http/tests/misc/acid2-pixel-expected.txt | 4 +- .../http/tests/misc/error404-expected.txt | 4 +- .../tests/misc/favicon-as-image-expected.txt | 4 +- .../frame-access-during-load-expected.txt | 30 +- ...enerated-content-inside-table-expected.txt | 18 +- .../http/tests/misc/iframe404-expected.txt | 52 +- ...vg-delayed-size-negotiation-2-expected.txt | 8 +- ...slow-loading-image-in-pattern-expected.txt | 10 +- .../http/tests/uri/css-href-expected.txt | 38 +- ...nd-attachment-local-scrolling-expected.txt | 60 +- ...ied-to-rounded-inline-element-expected.txt | 10 +- .../background-color-border-box-expected.txt | 4 +- ...ound-repeat-space-padding-box-expected.txt | 4 +- .../background-size-002-expected.txt | 4 +- ...kground-size-applies-to-block-expected.txt | 4 +- .../background-size-aspect-ratio-expected.txt | 4 +- .../background_color_padding_box-expected.txt | 4 +- ...nd_position_three_four_values-expected.txt | 4 +- ...roperties_greater_than_images-expected.txt | 4 +- ...round_repeat_space_border_box-expected.txt | 4 +- ...ound_repeat_space_content_box-expected.txt | 6 +- .../border-radius-applies-to-001-expected.txt | 10 +- .../border-radius-applies-to-002-expected.txt | 4 +- .../border-radius-applies-to-003-expected.txt | 4 +- .../border-radius-applies-to-005-expected.txt | 4 +- .../border-radius-applies-to-006-expected.txt | 4 +- .../border-radius-applies-to-007-expected.txt | 4 +- .../border-radius-applies-to-008-expected.txt | 4 +- .../border-radius-applies-to-009-expected.txt | 4 +- .../border-radius-applies-to-010-expected.txt | 4 +- .../border-radius-applies-to-011-expected.txt | 4 +- .../border-radius-applies-to-012-expected.txt | 4 +- .../border-radius-applies-to-013-expected.txt | 4 +- .../border-radius-applies-to-014-expected.txt | 4 +- .../border-radius-applies-to-015-expected.txt | 4 +- .../border-radius-applies-to-016-expected.txt | 4 +- .../border-radius-applies-to-017-expected.txt | 4 +- .../border-radius-clip-001-expected.txt | 36 +- .../border-radius-clip-002-expected.txt | 4 +- ...order-radius-content-edge-001-expected.txt | 4 +- ...er-radius-different-width-001-expected.txt | 4 +- ...rder-radius-initial-value-001-expected.txt | 4 +- ...rder-radius-not-inherited-001-expected.txt | 4 +- .../border-radius-shorthand-001-expected.txt | 4 +- .../border-radius-style-001-expected.txt | 6 +- .../border-radius-style-002-expected.txt | 4 +- .../border-radius-style-003-expected.txt | 4 +- .../border-radius-style-004-expected.txt | 4 +- .../border-radius-style-005-expected.txt | 4 +- ...order-radius-sum-of-radii-001-expected.txt | 4 +- ...order-radius-sum-of-radii-002-expected.txt | 4 +- ...-radius-with-three-values-001-expected.txt | 4 +- ...er-radius-with-two-values-001-expected.txt | 4 +- ...er-top-left-radius-values-001-expected.txt | 4 +- ...er-top-left-radius-values-002-expected.txt | 4 +- ...er-top-left-radius-values-003-expected.txt | 4 +- ...er-top-left-radius-values-004-expected.txt | 4 +- ...r-top-right-radius-values-004-expected.txt | 4 +- .../box-shadow-001-expected.txt | 4 +- .../box-shadow-002-expected.txt | 4 +- .../box-shadow-003-expected.txt | 4 +- .../box-shadow-004-expected.txt | 4 +- .../color-behind-images-expected.txt | 4 +- .../none-as-image-layer-expected.txt | 4 +- .../order-of-images-expected.txt | 4 +- .../css3/text/textshadow-001-expected.txt | 4 +- .../css3/text/textshadow-002-expected.txt | 8 +- .../css3/text/textshadow-003-expected.txt | 8 +- .../css3/text/textshadow-004-expected.txt | 8 +- .../css3/text/textshadow-005-expected.txt | 4 +- .../css3/text/textshadow-006-expected.txt | 8 +- .../css3/text/textshadow-007-expected.txt | 4 +- .../css3/text/textshadow-008-expected.txt | 4 +- .../css3/text/textshadow-009-expected.txt | 16 +- .../css3/text/textshadow-010-expected.txt | 12 +- ...ound-transforms-vs-containers-expected.txt | 22 +- .../transforms/2d/hindi-rotated-expected.txt | 32 +- .../2d/transform-borderbox-expected.txt | 12 +- .../2d/transform-fixed-container-expected.txt | 4 +- .../transform-origin-borderbox-expected.txt | 14 +- .../transforms/2d/zoom-menulist-expected.txt | 4 +- .../3d/general/perspective-units-expected.txt | 4 +- .../backface-hit-test-expected.txt | 16 +- ...ackface-no-transform-hit-test-expected.txt | 16 +- .../3d-point-mapping-3-expected.txt | 36 +- .../3d-point-mapping-4-expected.txt | 68 +- .../3d-point-mapping-coplanar-expected.txt | 40 +- .../3d-point-mapping-deep-expected.txt | 68 +- .../3d-point-mapping-expected.txt | 76 +- .../3d-point-mapping-origins-expected.txt | 76 +- .../3d-point-mapping-overlapping-expected.txt | 40 +- .../3d-point-mapping-preserve-3d-expected.txt | 140 +- .../transforms/svg-vs-css-expected.txt | 16 +- .../WebCore/platform/graphics/FontCascade.h | 13 +- 2178 files changed, 37006 insertions(+), 36805 deletions(-) diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations index cf958c978787..425bdce105d7 100644 --- a/LayoutTests/platform/wincairo/TestExpectations +++ b/LayoutTests/platform/wincairo/TestExpectations @@ -1860,7 +1860,6 @@ fast/text/international/system-language/declarative-language.html [ Failure ] fast/text/international/system-language/han-quotes.html [ ImageOnlyFailure ] fast/text/international/vertical-text-glyph-test.html [ Failure ] fast/text/international/vertical-text-metrics-test.html [ Failure ] -fast/text/international/vietnamese-nfd.html [ ImageOnlyFailure ] fast/text/international/wrap-CJK-001.html [ Failure ] fast/text/justify-ideograph-complex.html [ Failure ] fast/text/justify-ideograph-simple.html [ Failure ] @@ -1895,7 +1894,6 @@ fast/text/shadow-translucent-fill.html [ Failure ] fast/text/small-caps-web-font.html [ ImageOnlyFailure ] fast/text/small-line-height.html [ ImageOnlyFailure ] fast/text/soft-hyphen-as-first-breaking-opportunity.html [ ImageOnlyFailure ] -fast/text/space-width.html [ ImageOnlyFailure ] fast/text/svg-font-face-with-kerning.html [ Failure ] fast/text/synthetic-bold-transformed.html [ ImageOnlyFailure ] fast/text/system-font-fallback-emoji.html [ Failure ] @@ -2038,8 +2036,6 @@ webgl/max-active-contexts-gc.html [ Failure Pass ] webgl/max-active-contexts-webglcontextlost-prevent-default.html [ Failure ] webgl/multiple-context-losses.html [ Failure ] -fast/css/tab-size.html [ ImageOnlyFailure ] - fast/css3-text/css3-text-decoration/text-decoration-dashed.html [ ImageOnlyFailure ] fast/css3-text/css3-text-decoration/text-decoration-dotted-dashed.html [ ImageOnlyFailure ] fast/css3-text/css3-text-decoration/text-decoration-dotted.html [ ImageOnlyFailure ] @@ -2615,3 +2611,11 @@ http/tests/xmlhttprequest/resetting-timeout-to-zero.html [ Failure Pass ] http/tests/xmlhttprequest/timeout-greater-than-default-network-timeout.html [ Failure Pass ] fast/text/backslash-to-yen-sign.html [ Pass Failure ] + +css2.1/20110323/overflow-applies-to-009.htm [ ImageOnlyFailure ] +fast/text/all-small-caps-whitespace.html [ ImageOnlyFailure ] +fast/text/isolate-ignore.html [ ImageOnlyFailure ] +fast/text/multiple-renderers-with-hypen-on-boundary.html [ ImageOnlyFailure ] +fast/text/soft-hyphen-min-preferred-width.html [ ImageOnlyFailure ] +fast/text/whitespace/inline-whitespace-wrapping-8.html [ ImageOnlyFailure ] +webkit.org/b/253547 fast/text/midword-break-before-surrogate-pair.html [ Skip ] # Crash for Debug, Timeout for Release diff --git a/LayoutTests/platform/wincairo/animations/3d/change-transform-in-end-event-expected.txt b/LayoutTests/platform/wincairo/animations/3d/change-transform-in-end-event-expected.txt index f1444d6e93f5..bde9b9b8df81 100644 --- a/LayoutTests/platform/wincairo/animations/3d/change-transform-in-end-event-expected.txt +++ b/LayoutTests/platform/wincairo/animations/3d/change-transform-in-end-event-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x162 RenderBlock {HTML} at (0,0) size 800x162 RenderBody {BODY} at (8,16) size 784x138 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 384x19 - text run at (0,0) width 384: "At the end of the test the green box should obscure the red box." + RenderText {#text} at (0,0) size 399x19 + text run at (0,0) width 399: "At the end of the test the green box should obscure the red box." RenderBlock {DIV} at (0,138) size 784x0 layer at (8,52) size 402x102 RenderBlock (relative positioned) {DIV} at (0,36) size 402x102 [border: (1px solid #000000)] diff --git a/LayoutTests/platform/wincairo/animations/3d/matrix-transform-type-animation-expected.txt b/LayoutTests/platform/wincairo/animations/3d/matrix-transform-type-animation-expected.txt index c8389888a8ca..af948ab1d6dc 100644 --- a/LayoutTests/platform/wincairo/animations/3d/matrix-transform-type-animation-expected.txt +++ b/LayoutTests/platform/wincairo/animations/3d/matrix-transform-type-animation-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x136 RenderBlock {HTML} at (0,0) size 800x136 RenderBody {BODY} at (8,8) size 784x120 RenderBlock {DIV} at (0,100) size 784x20 - RenderText {#text} at (0,0) size 540x19 - text run at (0,0) width 540: "PASS - \"webkitTransform.4\" property for \"box\" element at 1s saw something close to: 50" - RenderBR {BR} at (540,0) size 0x19 + RenderText {#text} at (0,0) size 565x19 + text run at (0,0) width 565: "PASS - \"webkitTransform.4\" property for \"box\" element at 1s saw something close to: 50" + RenderBR {BR} at (565,0) size 0x19 layer at (8,8) size 784x100 RenderBlock (relative positioned) {DIV} at (0,0) size 784x100 layer at (58,8) size 100x100 diff --git a/LayoutTests/platform/wincairo/animations/3d/state-at-end-event-transform-expected.txt b/LayoutTests/platform/wincairo/animations/3d/state-at-end-event-transform-expected.txt index fd01fdf58cef..d336bdbecde2 100644 --- a/LayoutTests/platform/wincairo/animations/3d/state-at-end-event-transform-expected.txt +++ b/LayoutTests/platform/wincairo/animations/3d/state-at-end-event-transform-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x162 RenderBlock {HTML} at (0,0) size 800x162 RenderBody {BODY} at (8,16) size 784x138 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 384x19 - text run at (0,0) width 384: "At the end of the test the green box should obscure the red box." + RenderText {#text} at (0,0) size 399x19 + text run at (0,0) width 399: "At the end of the test the green box should obscure the red box." RenderBlock {DIV} at (0,138) size 784x0 layer at (8,52) size 402x102 RenderBlock (relative positioned) {DIV} at (0,36) size 402x102 [border: (1px solid #000000)] diff --git a/LayoutTests/platform/wincairo/animations/missing-values-first-keyframe-expected.txt b/LayoutTests/platform/wincairo/animations/missing-values-first-keyframe-expected.txt index bf682e3dd45e..db97b72cfba8 100644 --- a/LayoutTests/platform/wincairo/animations/missing-values-first-keyframe-expected.txt +++ b/LayoutTests/platform/wincairo/animations/missing-values-first-keyframe-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (0,0) size 800x240 RenderBlock {DIV} at (0,200) size 800x40 - RenderText {#text} at (0,0) size 471x19 - text run at (0,0) width 471: "PASS - \"left\" property for \"box1\" element at 0.5s saw something close to: 100" - RenderBR {BR} at (471,0) size 0x19 - RenderText {#text} at (0,20) size 568x19 - text run at (0,20) width 568: "PASS - \"webkitTransform.4\" property for \"box2\" element at 0.5s saw something close to: 100" - RenderBR {BR} at (568,20) size 0x19 + RenderText {#text} at (0,0) size 493x19 + text run at (0,0) width 493: "PASS - \"left\" property for \"box1\" element at 0.5s saw something close to: 100" + RenderBR {BR} at (493,0) size 0x19 + RenderText {#text} at (0,20) size 593x19 + text run at (0,20) width 593: "PASS - \"webkitTransform.4\" property for \"box2\" element at 0.5s saw something close to: 100" + RenderBR {BR} at (593,20) size 0x19 layer at (100,0) size 100x100 RenderBlock (positioned) {DIV} at (100,0) size 100x100 [bgcolor=#FF0000] layer at (100,100) size 100x100 diff --git a/LayoutTests/platform/wincairo/animations/missing-values-last-keyframe-expected.txt b/LayoutTests/platform/wincairo/animations/missing-values-last-keyframe-expected.txt index b07e72001ece..debfeee3018b 100644 --- a/LayoutTests/platform/wincairo/animations/missing-values-last-keyframe-expected.txt +++ b/LayoutTests/platform/wincairo/animations/missing-values-last-keyframe-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (0,0) size 800x240 RenderBlock {DIV} at (0,200) size 800x40 - RenderText {#text} at (0,0) size 471x19 - text run at (0,0) width 471: "PASS - \"left\" property for \"box1\" element at 1.5s saw something close to: 100" - RenderBR {BR} at (471,0) size 0x19 - RenderText {#text} at (0,20) size 568x19 - text run at (0,20) width 568: "PASS - \"webkitTransform.4\" property for \"box2\" element at 1.5s saw something close to: 100" - RenderBR {BR} at (568,20) size 0x19 + RenderText {#text} at (0,0) size 493x19 + text run at (0,0) width 493: "PASS - \"left\" property for \"box1\" element at 1.5s saw something close to: 100" + RenderBR {BR} at (493,0) size 0x19 + RenderText {#text} at (0,20) size 593x19 + text run at (0,20) width 593: "PASS - \"webkitTransform.4\" property for \"box2\" element at 1.5s saw something close to: 100" + RenderBR {BR} at (593,20) size 0x19 layer at (100,0) size 100x100 RenderBlock (positioned) {DIV} at (100,0) size 100x100 [bgcolor=#FF0000] layer at (100,100) size 100x100 diff --git a/LayoutTests/platform/wincairo/animations/state-at-end-event-expected.txt b/LayoutTests/platform/wincairo/animations/state-at-end-event-expected.txt index fd01fdf58cef..d336bdbecde2 100644 --- a/LayoutTests/platform/wincairo/animations/state-at-end-event-expected.txt +++ b/LayoutTests/platform/wincairo/animations/state-at-end-event-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x162 RenderBlock {HTML} at (0,0) size 800x162 RenderBody {BODY} at (8,16) size 784x138 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 384x19 - text run at (0,0) width 384: "At the end of the test the green box should obscure the red box." + RenderText {#text} at (0,0) size 399x19 + text run at (0,0) width 399: "At the end of the test the green box should obscure the red box." RenderBlock {DIV} at (0,138) size 784x0 layer at (8,52) size 402x102 RenderBlock (relative positioned) {DIV} at (0,36) size 402x102 [border: (1px solid #000000)] diff --git a/LayoutTests/platform/wincairo/compositing/animation/state-at-end-event-transform-layer-expected.txt b/LayoutTests/platform/wincairo/compositing/animation/state-at-end-event-transform-layer-expected.txt index 8e07f3fee6df..7cf76d5346ad 100644 --- a/LayoutTests/platform/wincairo/compositing/animation/state-at-end-event-transform-layer-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/animation/state-at-end-event-transform-layer-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x162 RenderBlock {HTML} at (0,0) size 800x162 RenderBody {BODY} at (8,16) size 784x138 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 384x19 - text run at (0,0) width 384: "At the end of the test the green box should obscure the red box." + RenderText {#text} at (0,0) size 399x19 + text run at (0,0) width 399: "At the end of the test the green box should obscure the red box." RenderBlock {DIV} at (0,138) size 784x0 layer at (8,52) size 402x102 RenderBlock (relative positioned) {DIV} at (0,36) size 402x102 [border: (1px solid #000000)] diff --git a/LayoutTests/platform/wincairo/compositing/color-matching/image-color-matching-expected.txt b/LayoutTests/platform/wincairo/compositing/color-matching/image-color-matching-expected.txt index 4e965f71a7ed..a0c038f98234 100644 --- a/LayoutTests/platform/wincairo/compositing/color-matching/image-color-matching-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/color-matching/image-color-matching-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x550 RenderBlock {HTML} at (0,0) size 800x550 RenderBody {BODY} at (8,16) size 784x526 [color=#FFFFFF] [bgcolor=#000000] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 195x19 - text run at (0,0) width 195: "Images should all look the same." + RenderText {#text} at (0,0) size 205x19 + text run at (0,0) width 205: "Images should all look the same." RenderBlock {DIV} at (0,36) size 784x245 RenderImage {IMG} at (0,0) size 360x240 RenderText {#text} at (360,225) size 4x19 diff --git a/LayoutTests/platform/wincairo/compositing/color-matching/pdf-image-match-expected.txt b/LayoutTests/platform/wincairo/compositing/color-matching/pdf-image-match-expected.txt index 10a81e7abf3f..ff89267dcf2f 100644 --- a/LayoutTests/platform/wincairo/compositing/color-matching/pdf-image-match-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/color-matching/pdf-image-match-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x85 RenderBlock {HTML} at (0,0) size 800x85 RenderBody {BODY} at (8,16) size 784x61 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This test should not crash" + RenderText {#text} at (0,0) size 160x19 + text run at (0,0) width 160: "This test should not crash" RenderBlock (anonymous) at (0,36) size 784x25 RenderText {#text} at (0,0) size 0x0 layer at (8,52) size 20x20 diff --git a/LayoutTests/platform/wincairo/compositing/compositing-visible-descendant-expected.txt b/LayoutTests/platform/wincairo/compositing/compositing-visible-descendant-expected.txt index 9b2bafc5b319..03f16d460d7a 100644 --- a/LayoutTests/platform/wincairo/compositing/compositing-visible-descendant-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/compositing-visible-descendant-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 245x19 - text run at (0,0) width 245: "You should see one green square below." + RenderText {#text} at (0,0) size 253x19 + text run at (0,0) width 253: "You should see one green square below." layer at (20,40) size 100x100 RenderBlock (positioned) {DIV} at (20,40) size 100x100 [bgcolor=#FF0000] layer at (20,40) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/direct-image-compositing-expected.txt b/LayoutTests/platform/wincairo/compositing/direct-image-compositing-expected.txt index b2d577dfa4bb..876eb3e49e60 100644 --- a/LayoutTests/platform/wincairo/compositing/direct-image-compositing-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/direct-image-compositing-expected.txt @@ -4,53 +4,55 @@ layer at (0,0) size 785x756 RenderBlock {HTML} at (0,0) size 785x756 RenderBody {BODY} at (8,21) size 769x119 RenderBlock {H1} at (0,0) size 769x37 - RenderText {#text} at (0,0) size 387x36 - text run at (0,0) width 387: "Image optimisation in layers" + RenderText {#text} at (0,0) size 389x36 + text run at (0,0) width 389: "Image optimisation in layers" RenderBlock {P} at (0,58) size 769x61 RenderText {#text} at (0,0) size 747x59 - text run at (0,0) width 564: "This test exercises direct compositing of images with hardware acceleration. The visual results " - text run at (564,0) width 30: "using" - text run at (0,20) width 641: "ACCELERATED_COMPOSITING and regular TOT should be identical. Running this test manually with " - text run at (641,20) width 106: "the correct debug" - text run at (0,40) width 379: "options will show which elements are directly composited. See " - RenderInline {A} at (0,0) size 291x19 [color=#0000EE] - RenderText {#text} at (379,40) size 291x19 - text run at (379,40) width 291: "https://bugs.webkit.org/show_bug.cgi?id=23361" + text run at (0,0) width 595: "This test exercises direct compositing of images with hardware acceleration. The visual results " + text run at (595,0) width 34: "using" + text run at (0,20) width 681: "ACCELERATED_COMPOSITING and regular TOT should be identical. Running this test manually with " + text run at (681,20) width 66: "the correct" + text run at (0,40) width 442: "debug options will show which elements are directly composited. See " + RenderInline {A} at (0,0) size 305x19 [color=#0000EE] + RenderText {#text} at (442,40) size 305x19 + text run at (442,40) width 305: "https://bugs.webkit.org/show_bug.cgi?id=23361" RenderText {#text} at (0,0) size 0x0 RenderBlock (floating) {DIV} at (0,134) size 260x201 - RenderText {#text} at (150,0) size 101x79 - text run at (150,0) width 101: "Basic image - no" - text run at (150,20) width 81: "style - can be" - text run at (150,40) width 44: "directly" - text run at (150,60) width 70: "composited" + RenderText {#text} at (150,0) size 106x79 + text run at (150,0) width 106: "Basic image - no" + text run at (150,20) width 83: "style - can be" + text run at (150,40) width 47: "directly" + text run at (150,60) width 72: "composited" RenderBlock (floating) {DIV} at (260,134) size 260x201 - RenderText {#text} at (160,0) size 97x79 - text run at (160,0) width 97: "5px blue border" - text run at (160,20) width 87: "- can NOT be" - text run at (160,40) width 44: "directly" - text run at (160,60) width 70: "composited" + RenderText {#text} at (160,0) size 100x79 + text run at (160,0) width 100: "5px blue border" + text run at (160,20) width 88: "- can NOT be" + text run at (160,40) width 47: "directly" + text run at (160,60) width 72: "composited" RenderBlock (floating) {DIV} at (0,334) size 260x201 - RenderText {#text} at (160,0) size 100x59 - text run at (160,0) width 75: "margin - can" - text run at (160,20) width 100: "NOT be directly" - text run at (160,40) width 70: "composited" + RenderText {#text} at (160,0) size 79x79 + text run at (160,0) width 79: "margin - can" + text run at (160,20) width 53: "NOT be" + text run at (160,40) width 47: "directly" + text run at (160,60) width 72: "composited" RenderBlock (floating) {DIV} at (260,334) size 260x201 - RenderText {#text} at (150,0) size 104x59 - text run at (150,0) width 104: "solid background" - text run at (150,20) width 98: "- can be directly" - text run at (150,40) width 70: "composited" + RenderText {#text} at (150,0) size 109x59 + text run at (150,0) width 109: "solid background" + text run at (150,20) width 101: "- can be directly" + text run at (150,40) width 72: "composited" RenderBlock (floating) {DIV} at (0,534) size 260x201 - RenderText {#text} at (150,0) size 107x79 - text run at (150,0) width 72: "background" - text run at (150,20) width 107: "image - can NOT" - text run at (150,40) width 63: "be directly" - text run at (150,60) width 70: "composited" + RenderText {#text} at (150,0) size 104x79 + text run at (150,0) width 75: "background" + text run at (150,20) width 73: "image - can" + text run at (150,40) width 104: "NOT be directly" + text run at (150,60) width 72: "composited" RenderBlock (floating) {DIV} at (260,534) size 260x201 - RenderText {#text} at (150,0) size 108x79 - text run at (150,0) width 66: "rotated but" - text run at (150,20) width 108: "otherwise no style" - text run at (150,40) width 98: "- can be directly" - text run at (150,60) width 70: "composited" + RenderText {#text} at (150,0) size 83x99 + text run at (150,0) width 67: "rotated but" + text run at (150,20) width 81: "otherwise no" + text run at (150,40) width 83: "style - can be" + text run at (150,60) width 47: "directly" + text run at (150,80) width 72: "composited" layer at (8,156) size 150x150 RenderImage {IMG} at (0,0) size 150x150 layer at (268,156) size 160x160 diff --git a/LayoutTests/platform/wincairo/compositing/generated-content-expected.txt b/LayoutTests/platform/wincairo/compositing/generated-content-expected.txt index 2ef4c92f53fb..051c8ddee919 100644 --- a/LayoutTests/platform/wincairo/compositing/generated-content-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/generated-content-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x298 RenderBlock {HTML} at (0,0) size 800x298 RenderBody {BODY} at (8,16) size 784x274 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 291x19 [color=#0000EE] - RenderText {#text} at (0,0) size 291x19 - text run at (0,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=26095" + RenderInline {A} at (0,0) size 305x19 [color=#0000EE] + RenderText {#text} at (0,0) size 305x19 + text run at (0,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=26095" RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 376x19 - text run at (0,0) width 376: "Tests that a 3D transform on a generated node does not crash." + RenderText {#text} at (0,0) size 387x19 + text run at (0,0) width 387: "Tests that a 3D transform on a generated node does not crash." RenderBlock {DIV} at (0,72) size 202x202 [border: (1px solid #000000)] layer at (9,89) size 200x200 RenderBlock (generated) at (1,1) size 200x200 - RenderText at (0,0) size 63x19 - text run at (0,0) width 63: "Generated" + RenderText at (0,0) size 65x19 + text run at (0,0) width 65: "Generated" diff --git a/LayoutTests/platform/wincairo/compositing/geometry/abs-position-inside-opacity-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/abs-position-inside-opacity-expected.txt index 83ffbea06b9e..d3481f46ec19 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/abs-position-inside-opacity-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/abs-position-inside-opacity-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x542 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 314x19 - text run at (0,0) width 314: "You should see two green boxes below, with no red" + RenderText {#text} at (0,0) size 326x19 + text run at (0,0) width 326: "You should see two green boxes below, with no red" layer at (58,78) size 120x120 RenderBlock (relative positioned) {DIV} at (50,70) size 120x120 [border: (1px solid #000000)] layer at (69,89) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/geometry/clipping-foreground-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/clipping-foreground-expected.txt index 613668874286..33e607b9d359 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/clipping-foreground-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/clipping-foreground-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 489x19 - text run at (0,0) width 489: "The layering and positions of the boxes should not be affected by oveflow:hidden." + RenderText {#text} at (0,0) size 518x19 + text run at (0,0) width 518: "The layering and positions of the boxes should not be affected by oveflow:hidden." RenderBlock (anonymous) at (0,36) size 784x475 RenderText {#text} at (320,305) size 4x19 text run at (320,305) width 4: " " @@ -24,15 +24,15 @@ layer at (50,301) size 100x100 layer at (68,259) size 200x200 layerType: foreground only RenderBlock (relative positioned) {DIV} at (60,215) size 200x200 [color=#0000FF] [bgcolor=#FFFFFFCC] [border: (10px solid #000000)] RenderText {#text} at (30,31) size 126x82 - text run at (30,31) width 60: "Box" + text run at (30,31) width 59: "Box" text run at (30,73) width 126: "contents" RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 layer at (158,349) size 150x150 RenderBlock (positioned) zI: 1 {DIV} at (90,90) size 150x150 [color=#808080] [bgcolor=#C8C880] [border: (2px solid #000000)] - RenderText zI: 1 {#text} at (22,23) size 87x82 + RenderText zI: 1 {#text} at (22,23) size 85x82 text run at (22,23) width 33: "In" - text run at (22,65) width 87: "Front" + text run at (22,65) width 85: "Front" layer at (392,104) size 200x200 clip at (402,114) size 180x180 scrollWidth 230 scrollHeight 230 layerType: background only layer at (352,64) size 150x150 backgroundClip at (402,114) size 180x180 clip at (402,114) size 180x180 RenderBlock (positioned) zI: -1 {DIV} at (-40,-40) size 150x150 [color=#808080] [bgcolor=#C86464] [border: (2px solid #000000)] @@ -47,12 +47,12 @@ layer at (374,146) size 100x100 backgroundClip at (402,114) size 180x180 clip at layer at (392,104) size 200x200 clip at (402,114) size 180x180 scrollWidth 230 scrollHeight 230 layerType: foreground only RenderBlock (relative positioned) {DIV} at (384,60) size 200x200 [color=#0000FF] [bgcolor=#FFFFFFCC] [border: (10px solid #000000)] RenderText {#text} at (30,31) size 126x82 - text run at (30,31) width 60: "Box" + text run at (30,31) width 59: "Box" text run at (30,73) width 126: "contents" RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 layer at (482,194) size 150x150 backgroundClip at (402,114) size 180x180 clip at (402,114) size 180x180 RenderBlock (positioned) zI: 1 {DIV} at (90,90) size 150x150 [color=#808080] [bgcolor=#C8C880] [border: (2px solid #000000)] - RenderText zI: 1 {#text} at (22,23) size 87x82 + RenderText zI: 1 {#text} at (22,23) size 85x82 text run at (22,23) width 33: "In" - text run at (22,65) width 87: "Front" + text run at (22,65) width 85: "Front" diff --git a/LayoutTests/platform/wincairo/compositing/geometry/composited-html-size-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/composited-html-size-expected.txt index 8cb598d216bc..948a7946797a 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/composited-html-size-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/composited-html-size-expected.txt @@ -5,8 +5,8 @@ layer at (10,10) size 100x100 RenderBlock (positioned) zI: -1 {DIV} at (10,10) size 100x100 [bgcolor=#0000FF] layer at (10,10) size 100x20 RenderBlock {DIV} at (0,0) size 100x20 - RenderText {#text} at (0,0) size 76x19 - text run at (0,0) width 76: "Compositing" + RenderText {#text} at (0,0) size 81x19 + text run at (0,0) width 81: "Compositing" layer at (0,0) size 800x36 layerType: foreground only RenderBlock {HTML} at (0,0) size 800x36 RenderBody {BODY} at (8,8) size 784x20 [bgcolor=#C0C0C0] diff --git a/LayoutTests/platform/wincairo/compositing/geometry/fixed-in-composited-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/fixed-in-composited-expected.txt index b0fe1cbd4e62..6fcbc2dc6ee6 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/fixed-in-composited-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/fixed-in-composited-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x2000 RenderBlock {HTML} at (0,0) size 785x2000 RenderBody {BODY} at (0,0) size 785x2000 RenderBlock {P} at (0,210) size 785x20 - RenderText {#text} at (0,0) size 181x19 - text run at (0,0) width 181: "You should see no red above." + RenderText {#text} at (0,0) size 186x19 + text run at (0,0) width 186: "You should see no red above." layer at (20,70) size 100x100 RenderBlock (positioned) {DIV} at (20,70) size 100x100 [bgcolor=#FF0000] layer at (220,120) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/geometry/fixed-position-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/fixed-position-expected.txt index 2aef6663a6b4..e6b340b758f1 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/fixed-position-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/fixed-position-expected.txt @@ -3,10 +3,10 @@ layer at (0,0) size 1008x1016 layer at (0,0) size 785x1016 RenderBlock {HTML} at (0,0) size 785x1016 RenderBody {BODY} at (8,8) size 1000x1000 -layer at (50,166) size 420x20 - RenderBlock (positioned) {P} at (50,166) size 420x20 - RenderText {#text} at (0,0) size 420x19 - text run at (0,0) width 420: "You should see a green square in the top left corner of an orange box." +layer at (50,166) size 437x20 + RenderBlock (positioned) {P} at (50,166) size 437x20 + RenderText {#text} at (0,0) size 437x19 + text run at (0,0) width 437: "You should see a green square in the top left corner of an orange box." layer at (50,50) size 100x100 RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#FFA500] layer at (50,50) size 50x50 diff --git a/LayoutTests/platform/wincairo/compositing/geometry/layer-due-to-layer-children-deep-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/layer-due-to-layer-children-deep-expected.txt index 68680c4af4d9..ce2fb981aa19 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/layer-due-to-layer-children-deep-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/layer-due-to-layer-children-deep-expected.txt @@ -7,13 +7,13 @@ layer at (8,8) size 784x292 layer at (8,8) size 342x292 RenderBlock (relative positioned) {DIV} at (0,0) size 342x292 [border: (1px solid #000000)] RenderBlock (anonymous) at (21,21) size 300x20 - RenderText {#text} at (0,0) size 164x19 - text run at (0,0) width 164: "This content is in the parent" + RenderText {#text} at (0,0) size 174x19 + text run at (0,0) width 174: "This content is in the parent" layer at (39,49) size 250x220 RenderBlock (relative positioned) {DIV} at (21,41) size 250x220 [bgcolor=#0000FF] layer at (49,59) size 200x200 RenderBlock (relative positioned) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] layer at (149,59) size 250x100 RenderBlock (relative positioned) {DIV} at (0,0) size 250x100 [bgcolor=#008000] - RenderText {#text} at (0,0) size 173x19 - text run at (0,0) width 173: "Box should have perspective" + RenderText {#text} at (0,0) size 182x19 + text run at (0,0) width 182: "Box should have perspective" diff --git a/LayoutTests/platform/wincairo/compositing/geometry/layer-due-to-layer-children-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/layer-due-to-layer-children-expected.txt index f8646e59c136..496fe811d4e4 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/layer-due-to-layer-children-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/layer-due-to-layer-children-expected.txt @@ -7,9 +7,9 @@ layer at (8,8) size 784x192 layer at (8,8) size 242x192 RenderBlock (relative positioned) {DIV} at (0,0) size 242x192 [border: (1px solid #000000)] RenderBlock (anonymous) at (21,21) size 200x20 - RenderText {#text} at (0,0) size 164x19 - text run at (0,0) width 164: "This content is in the parent" + RenderText {#text} at (0,0) size 174x19 + text run at (0,0) width 174: "This content is in the parent" layer at (129,49) size 250x100 RenderBlock (relative positioned) {DIV} at (21,41) size 250x100 [bgcolor=#008000] - RenderText {#text} at (0,0) size 173x19 - text run at (0,0) width 173: "Box should have perspective" + RenderText {#text} at (0,0) size 182x19 + text run at (0,0) width 182: "Box should have perspective" diff --git a/LayoutTests/platform/wincairo/compositing/geometry/outline-change-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/outline-change-expected.txt index 52377a57673f..c1beee63a91b 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/outline-change-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/outline-change-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x256 RenderBlock {HTML} at (0,0) size 800x256 RenderBody {BODY} at (8,16) size 784x232 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 280x19 - text run at (0,0) width 280: "Adding outline should not affect layer positions" + RenderText {#text} at (0,0) size 299x19 + text run at (0,0) width 299: "Adding outline should not affect layer positions" RenderBlock {DIV} at (0,222) size 10x10 layer at (58,86) size 102x102 RenderBlock (relative positioned) {DIV} at (50,70) size 102x102 [border: (1px solid #000000)] diff --git a/LayoutTests/platform/wincairo/compositing/geometry/partial-layout-update-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/partial-layout-update-expected.txt index 2724c28ff6e5..78033b54f034 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/partial-layout-update-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/partial-layout-update-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 345x19 - text run at (0,0) width 345: "The green box should always obscure the red box below." + RenderText {#text} at (0,0) size 360x19 + text run at (0,0) width 360: "The green box should always obscure the red box below." layer at (8,44) size 402x202 clip at (9,45) size 400x200 RenderBlock (relative positioned) {DIV} at (0,36) size 402x202 [border: (1px solid #000000)] layer at (9,45) size 200x200 diff --git a/LayoutTests/platform/wincairo/compositing/geometry/root-layer-update-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/root-layer-update-expected.txt index 9078c917fd07..c225913fb488 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/root-layer-update-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/root-layer-update-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x174 RenderBlock {HTML} at (0,0) size 800x174 RenderBody {BODY} at (100,0) size 600x158 RenderBlock {P} at (0,118) size 600x40 - RenderInline {A} at (0,0) size 146x19 [color=#0000EE] - RenderText {#text} at (0,0) size 146x19 - text run at (0,0) width 146: "rdar://problem/7026010" - RenderBR {BR} at (146,0) size 0x19 - RenderText {#text} at (0,20) size 445x19 - text run at (0,20) width 445: "Test for the root layer getting correctly positioned. You should see no red." + RenderInline {A} at (0,0) size 149x19 [color=#0000EE] + RenderText {#text} at (0,0) size 149x19 + text run at (0,0) width 149: "rdar://problem/7026010" + RenderBR {BR} at (149,0) size 0x19 + RenderText {#text} at (0,20) size 462x19 + text run at (0,20) width 462: "Test for the root layer getting correctly positioned. You should see no red." layer at (350,1) size 100x100 RenderBlock (positioned) {DIV} at (350,1) size 100x100 [bgcolor=#FF0000] layer at (-100,0) size 300x100 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 diff --git a/LayoutTests/platform/wincairo/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.txt index 3262d2a66f7a..751bf8575ca5 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (0,0) size 800x584 RenderBlock {P} at (0,0) size 800x20 - RenderText {#text} at (0,0) size 28x19 - text run at (0,0) width 28: "Bug " + RenderText {#text} at (0,0) size 31x19 + text run at (0,0) width 31: "Bug " RenderInline {A} at (0,0) size 40x19 [color=#0000EE] - RenderText {#text} at (28,0) size 40x19 - text run at (28,0) width 40: "29495" - RenderText {#text} at (68,0) size 312x19 - text run at (68,0) width 312: ". You should see one green box below, with no red." + RenderText {#text} at (31,0) size 40x19 + text run at (31,0) width 40: "29495" + RenderText {#text} at (71,0) size 324x19 + text run at (71,0) width 324: ". You should see one green box below, with no red." layer at (10,60) size 50x50 RenderBlock (positioned) {DIV} at (10,60) size 50x50 [bgcolor=#FF0000] layer at (10,10) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/geometry/video-fixed-scrolling-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/video-fixed-scrolling-expected.txt index 5e610aa69f99..2a9e6503ba2e 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/video-fixed-scrolling-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/video-fixed-scrolling-expected.txt @@ -6,8 +6,8 @@ layer at (0,0) size 785x1016 RenderBlock (anonymous) at (0,0) size 769x385 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,401) size 769x20 - RenderText {#text} at (0,0) size 425x19 - text run at (0,0) width 425: "The blue bar should be in front of the video, and at the top of the page." + RenderText {#text} at (0,0) size 445x19 + text run at (0,0) width 445: "The blue bar should be in front of the video, and at the top of the page." layer at (8,88) size 400x300 RenderVideo {VIDEO} at (0,80) size 400x300 layer at (0,50) size 500x60 diff --git a/LayoutTests/platform/wincairo/compositing/geometry/video-opacity-overlay-expected.txt b/LayoutTests/platform/wincairo/compositing/geometry/video-opacity-overlay-expected.txt index 2b2f9b0fd93c..6a4f12cbccf5 100644 --- a/LayoutTests/platform/wincairo/compositing/geometry/video-opacity-overlay-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/geometry/video-opacity-overlay-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x362 RenderBlock {HTML} at (0,0) size 800x362 RenderBody {BODY} at (8,16) size 784x338 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 279x19 - text run at (0,0) width 279: "The orange bar should be in front of the video." + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "The orange bar should be in front of the video." layer at (8,52) size 402x302 RenderBlock (relative positioned) {DIV} at (0,36) size 402x302 [border: (1px solid #000000)] RenderBlock (anonymous) at (1,1) size 400x305 diff --git a/LayoutTests/platform/wincairo/compositing/iframes/composited-iframe-alignment-expected.txt b/LayoutTests/platform/wincairo/compositing/iframes/composited-iframe-alignment-expected.txt index 768e8f39f5ce..3c3cb57cb125 100644 --- a/LayoutTests/platform/wincairo/compositing/iframes/composited-iframe-alignment-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/iframes/composited-iframe-alignment-expected.txt @@ -3,12 +3,12 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x76 RenderBlock {HTML} at (0,0) size 800x76 RenderBody {BODY} at (8,8) size 784x60 - RenderText {#text} at (0,0) size 766x39 - text run at (0,0) width 567: "Simple test of composited iframe content. There should be a blue box with a gray background " - text run at (567,0) width 199: "inside the black border. The gray" - text run at (0,20) width 334: "background should fit perfectly within the block border " - text run at (334,20) width 80: "with no gaps." - RenderBR {BR} at (414,20) size 0x19 + RenderText {#text} at (0,0) size 769x39 + text run at (0,0) width 594: "Simple test of composited iframe content. There should be a blue box with a gray background " + text run at (594,0) width 175: "inside the black border. The" + text run at (0,20) width 384: "gray background should fit perfectly within the block border " + text run at (384,20) width 85: "with no gaps." + RenderBR {BR} at (469,20) size 0x19 RenderBR {BR} at (0,40) size 0x19 RenderText {#text} at (0,0) size 0x0 layer at (100,100) size 440x340 diff --git a/LayoutTests/platform/wincairo/compositing/iframes/iframe-copy-on-scroll-expected.txt b/LayoutTests/platform/wincairo/compositing/iframes/iframe-copy-on-scroll-expected.txt index d9d73af3cddf..b8d8616e3f3d 100644 --- a/LayoutTests/platform/wincairo/compositing/iframes/iframe-copy-on-scroll-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/iframes/iframe-copy-on-scroll-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 356x19 - text run at (0,0) width 356: "In pixel results, the blue box should be scrolled out of view." + RenderText {#text} at (0,0) size 375x19 + text run at (0,0) width 375: "In pixel results, the blue box should be scrolled out of view." layer at (8,52) size 324x229 RenderBlock (positioned) zI: 1 {DIV} at (8,52) size 324x229 RenderIFrame {IFRAME} at (10,10) size 304x204 [border: (2px inset #000000)] diff --git a/LayoutTests/platform/wincairo/compositing/images/direct-image-background-color-expected.txt b/LayoutTests/platform/wincairo/compositing/images/direct-image-background-color-expected.txt index 56ea243a61e1..a06b1ab27308 100644 --- a/LayoutTests/platform/wincairo/compositing/images/direct-image-background-color-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/images/direct-image-background-color-expected.txt @@ -5,7 +5,7 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,20) size 784x564 RenderImage {IMG} at (20,0) size 280x200 [bgcolor=#00008080] RenderBlock {P} at (0,440) size 784x20 - RenderText {#text} at (0,0) size 233x19 - text run at (0,0) width 233: "Top and bottom should look the same." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "Top and bottom should look the same." layer at (28,240) size 280x200 RenderImage {IMG} at (20,220) size 280x200 [bgcolor=#00008080] diff --git a/LayoutTests/platform/wincairo/compositing/layers-inside-overflow-scroll-expected.txt b/LayoutTests/platform/wincairo/compositing/layers-inside-overflow-scroll-expected.txt index 52be62963ec0..09ac2b309ec7 100644 --- a/LayoutTests/platform/wincairo/compositing/layers-inside-overflow-scroll-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/layers-inside-overflow-scroll-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x431 RenderBlock {HTML} at (0,0) size 800x431 RenderBody {BODY} at (8,16) size 784x405 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 412x19 - text run at (0,0) width 412: "The red box in the overflow:scroll div should be scrolled out of view." + RenderText {#text} at (0,0) size 436x19 + text run at (0,0) width 436: "The red box in the overflow:scroll div should be scrolled out of view." RenderBlock {DIV} at (10,36) size 302x207 [border: (1px solid #000000)] RenderText {#text} at (0,0) size 0x0 layer at (19,53) size 300x200 diff --git a/LayoutTests/platform/wincairo/compositing/masks/direct-image-mask-expected.txt b/LayoutTests/platform/wincairo/compositing/masks/direct-image-mask-expected.txt index 36c46fafe943..7fc61f4a37fd 100644 --- a/LayoutTests/platform/wincairo/compositing/masks/direct-image-mask-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/masks/direct-image-mask-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 551x19 - text run at (0,0) width 551: "Testing reflections on directly composited images. Left and right sides should look the same." + RenderText {#text} at (0,0) size 580x19 + text run at (0,0) width 580: "Testing reflections on directly composited images. Left and right sides should look the same." RenderBlock (anonymous) at (0,36) size 784x169 RenderText {#text} at (224,149) size 4x19 text run at (224,149) width 4: " " diff --git a/LayoutTests/platform/wincairo/compositing/masks/masked-ancestor-expected.txt b/LayoutTests/platform/wincairo/compositing/masks/masked-ancestor-expected.txt index 8f97a9d1b5d2..be40e0470be0 100644 --- a/LayoutTests/platform/wincairo/compositing/masks/masked-ancestor-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/masks/masked-ancestor-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x619 RenderBlock {HTML} at (0,0) size 785x619 RenderBody {BODY} at (8,8) size 769x603 RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 495x19 - text run at (0,0) width 495: "Testing masks on compositing layers. Left and right columns should look the same." + RenderText {#text} at (0,0) size 523x19 + text run at (0,0) width 523: "Testing masks on compositing layers. Left and right columns should look the same." RenderBlock (anonymous) at (0,36) size 769x567 RenderText {#text} at (262,547) size 4x19 text run at (262,547) width 4: " " diff --git a/LayoutTests/platform/wincairo/compositing/masks/multiple-masks-expected.txt b/LayoutTests/platform/wincairo/compositing/masks/multiple-masks-expected.txt index 8ead59902913..30f574b2cd9b 100644 --- a/LayoutTests/platform/wincairo/compositing/masks/multiple-masks-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/masks/multiple-masks-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x619 RenderBlock {HTML} at (0,0) size 785x619 RenderBody {BODY} at (8,8) size 769x603 RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 495x19 - text run at (0,0) width 495: "Testing masks on compositing layers. Left and right columns should look the same." + RenderText {#text} at (0,0) size 523x19 + text run at (0,0) width 523: "Testing masks on compositing layers. Left and right columns should look the same." RenderBlock (anonymous) at (0,36) size 769x567 RenderBlock {DIV} at (0,0) size 262x562 [border: (1px solid #000000)] RenderText {#text} at (262,547) size 4x19 diff --git a/LayoutTests/platform/wincairo/compositing/masks/simple-composited-mask-expected.txt b/LayoutTests/platform/wincairo/compositing/masks/simple-composited-mask-expected.txt index 6cd3588f5917..3704cd5979ff 100644 --- a/LayoutTests/platform/wincairo/compositing/masks/simple-composited-mask-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/masks/simple-composited-mask-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x619 RenderBlock {HTML} at (0,0) size 785x619 RenderBody {BODY} at (8,8) size 769x603 RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 495x19 - text run at (0,0) width 495: "Testing masks on compositing layers. Left and right columns should look the same." + RenderText {#text} at (0,0) size 523x19 + text run at (0,0) width 523: "Testing masks on compositing layers. Left and right columns should look the same." RenderBlock (anonymous) at (0,36) size 769x567 RenderBlock {DIV} at (0,0) size 262x562 [border: (1px solid #000000)] RenderText {#text} at (262,547) size 4x19 diff --git a/LayoutTests/platform/wincairo/compositing/overflow/ancestor-overflow-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/ancestor-overflow-expected.txt index 4876a2a8564b..429d9033bb3d 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/ancestor-overflow-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/ancestor-overflow-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x434 RenderBlock {HTML} at (0,0) size 800x434 RenderBody {BODY} at (8,16) size 784x410 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 431x19 - text run at (0,0) width 431: "Test overflow clipping of composited elements in various configurations." + RenderText {#text} at (0,0) size 458x19 + text run at (0,0) width 458: "Test overflow clipping of composited elements in various configurations." RenderBlock (anonymous) at (0,36) size 784x374 RenderText {#text} at (182,167) size 4x19 text run at (182,167) width 4: " " diff --git a/LayoutTests/platform/wincairo/compositing/overflow/fixed-position-ancestor-clip-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/fixed-position-ancestor-clip-expected.txt index 5093a81fb7f9..8d3d44fafc13 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/fixed-position-ancestor-clip-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/fixed-position-ancestor-clip-expected.txt @@ -3,10 +3,10 @@ layer at (0,0) size 1008x1016 layer at (0,0) size 785x1016 RenderBlock {HTML} at (0,0) size 785x1016 RenderBody {BODY} at (8,8) size 1000x1000 -layer at (50,166) size 302x20 - RenderBlock (positioned) {P} at (50,166) size 302x20 - RenderText {#text} at (0,0) size 302x19 - text run at (0,0) width 302: "You should see a single green square, with no red." +layer at (50,166) size 316x20 + RenderBlock (positioned) {P} at (50,166) size 316x20 + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "You should see a single green square, with no red." layer at (58,58) size 100x100 RenderBlock (positioned) {DIV} at (8,8) size 100x100 [bgcolor=#FF0000] layer at (58,58) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/overflow/nested-scrolling-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/nested-scrolling-expected.txt index d2d3adeea688..a5e652c6256b 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/nested-scrolling-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/nested-scrolling-expected.txt @@ -4,47 +4,51 @@ layer at (0,0) size 785x838 RenderBlock {HTML} at (0,0) size 785x838 RenderBody {BODY} at (8,8) size 769x822 RenderBlock (anonymous) at (0,0) size 769x20 - RenderText {#text} at (0,0) size 78x19 - text run at (0,0) width 78: "Text outside." -layer at (8,28) size 702x802 clip at (9,29) size 685x785 scrollHeight 1154 + RenderText {#text} at (0,0) size 81x19 + text run at (0,0) width 81: "Text outside." +layer at (8,28) size 702x802 clip at (9,29) size 685x785 scrollHeight 1286 RenderBlock {DIV} at (0,20) size 702x802 [border: (1px solid #000000)] - RenderBlock {P} at (1,17) size 685x132 - RenderText {#text} at (0,7) size 667x118 - text run at (0,7) width 655: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore" - text run at (0,40) width 667: "magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo" - text run at (0,73) width 641: "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur." - text run at (0,106) width 642: "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." - RenderBlock {P} at (1,197) size 685x132 - RenderText {#text} at (0,7) size 667x118 - text run at (0,7) width 655: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore" - text run at (0,40) width 667: "magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo" - text run at (0,73) width 641: "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur." - text run at (0,106) width 642: "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." - RenderBlock {P} at (1,795) size 685x132 - RenderText {#text} at (0,7) size 667x118 - text run at (0,7) width 655: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore" - text run at (0,40) width 667: "magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo" - text run at (0,73) width 641: "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur." - text run at (0,106) width 642: "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." - RenderBlock {P} at (1,975) size 685x132 - RenderText {#text} at (0,7) size 667x118 - text run at (0,7) width 655: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore" - text run at (0,40) width 667: "magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo" - text run at (0,73) width 641: "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur." - text run at (0,106) width 642: "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -layer at (19,405) size 602x402 clip at (20,406) size 585x385 scrollHeight 442 - RenderBlock {DIV} at (11,377) size 602x402 [border: (1px solid #000000)] + RenderBlock {P} at (1,17) size 685x165 + RenderText {#text} at (0,7) size 674x151 + text run at (0,7) width 642: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et" + text run at (0,40) width 670: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex" + text run at (0,73) width 674: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat" + text run at (0,106) width 671: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim" + text run at (0,139) width 93: "id est laborum." + RenderBlock {P} at (1,230) size 685x165 + RenderText {#text} at (0,7) size 674x151 + text run at (0,7) width 642: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et" + text run at (0,40) width 670: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex" + text run at (0,73) width 674: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat" + text run at (0,106) width 671: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim" + text run at (0,139) width 93: "id est laborum." + RenderBlock {P} at (1,861) size 685x165 + RenderText {#text} at (0,7) size 674x151 + text run at (0,7) width 642: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et" + text run at (0,40) width 670: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex" + text run at (0,73) width 674: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat" + text run at (0,106) width 671: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim" + text run at (0,139) width 93: "id est laborum." + RenderBlock {P} at (1,1074) size 685x165 + RenderText {#text} at (0,7) size 674x151 + text run at (0,7) width 642: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et" + text run at (0,40) width 670: "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex" + text run at (0,73) width 674: "ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat" + text run at (0,106) width 671: "nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim" + text run at (0,139) width 93: "id est laborum." +layer at (19,471) size 602x402 backgroundClip at (19,471) size 602x343 clip at (20,472) size 585x342 scrollHeight 442 + RenderBlock {DIV} at (11,443) size 602x402 [border: (1px solid #000000)] RenderBlock {P} at (1,17) size 585x165 - RenderText {#text} at (0,7) size 585x151 - text run at (0,7) width 555: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut" - text run at (0,40) width 585: "labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris" - text run at (0,73) width 573: "nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit" - text run at (0,106) width 578: "esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in" - text run at (0,139) width 310: "culpa qui officia deserunt mollit anim id est laborum." + RenderText {#text} at (0,7) size 584x151 + text run at (0,7) width 584: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut" + text run at (0,40) width 574: "labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco" + text run at (0,73) width 559: "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in" + text run at (0,106) width 568: "voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat" + text run at (0,139) width 465: "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." RenderBlock {P} at (1,230) size 585x165 - RenderText {#text} at (0,7) size 585x151 - text run at (0,7) width 555: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut" - text run at (0,40) width 585: "labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris" - text run at (0,73) width 573: "nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit" - text run at (0,106) width 578: "esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in" - text run at (0,139) width 310: "culpa qui officia deserunt mollit anim id est laborum." + RenderText {#text} at (0,7) size 584x151 + text run at (0,7) width 584: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut" + text run at (0,40) width 574: "labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco" + text run at (0,73) width 559: "laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in" + text run at (0,106) width 568: "voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat" + text run at (0,139) width 465: "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." diff --git a/LayoutTests/platform/wincairo/compositing/overflow/overflow-compositing-descendant-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/overflow-compositing-descendant-expected.txt index 032e667c0a17..3e33bbc340e2 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/overflow-compositing-descendant-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/overflow-compositing-descendant-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 447x19 - text run at (0,0) width 447: "You should see a green box under the video. If you see red, the test failed." + RenderText {#text} at (0,0) size 465x19 + text run at (0,0) width 465: "You should see a green box under the video. If you see red, the test failed." layer at (8,52) size 132x222 clip at (9,53) size 130x220 scrollHeight 225 RenderBlock (positioned) {DIV} at (8,52) size 132x222 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock (anonymous) at (11,11) size 110x105 diff --git a/LayoutTests/platform/wincairo/compositing/overflow/overflow-positioning-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/overflow-positioning-expected.txt index 9de75937effa..90e6fa576d29 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/overflow-positioning-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/overflow-positioning-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x438 RenderBlock {HTML} at (0,0) size 800x438 RenderBody {BODY} at (100,100) size 600x238 RenderBlock {P} at (0,0) size 600x20 - RenderText {#text} at (0,0) size 444x19 - text run at (0,0) width 444: "Things should not jump around when the green square starts the transition." + RenderText {#text} at (0,0) size 469x19 + text run at (0,0) width 469: "Things should not jump around when the green square starts the transition." layer at (100,136) size 202x202 clip at (101,137) size 200x200 RenderBlock (relative positioned) {DIV} at (0,36) size 202x202 [border: (1px solid #000000)] layer at (101,137) size 200x100 diff --git a/LayoutTests/platform/wincairo/compositing/overflow/overflow-scroll-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/overflow-scroll-expected.txt index c87e08e5a164..1035dbc30817 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/overflow-scroll-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/overflow-scroll-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x591 RenderBlock {HTML} at (0,0) size 800x591 RenderBody {BODY} at (8,16) size 784x567 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 230x19 - text run at (0,0) width 230: "All of the boxes should look the same." + RenderText {#text} at (0,0) size 242x19 + text run at (0,0) width 242: "All of the boxes should look the same." RenderBlock (anonymous) at (0,36) size 784x531 RenderText {#text} at (172,157) size 4x19 text run at (172,157) width 4: " " @@ -35,90 +35,90 @@ layer at (194,62) size 152x152 clip at (195,63) size 135x135 scrollY 50 scrollWi layer at (19,13) size 210x510 backgroundClip at (19,63) size 135x135 clip at (19,63) size 135x135 RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (195,13) size 210x510 backgroundClip at (195,63) size 135x135 clip at (195,63) size 135x135 RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (370,62) size 152x152 clip at (371,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock (relative positioned) {DIV} at (362,10) size 152x152 [border: (1px solid #000000)] layer at (371,13) size 210x510 backgroundClip at (371,63) size 135x135 clip at (371,63) size 135x135 RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (546,62) size 152x152 clip at (547,63) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock (relative positioned) {DIV} at (538,10) size 152x152 [border: (1px solid #000000)] layer at (547,13) size 210x510 backgroundClip at (547,63) size 135x135 clip at (547,63) size 135x135 RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (18,239) size 152x152 clip at (19,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock {DIV} at (10,187) size 152x152 [border: (1px solid #000000)] RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (194,239) size 152x152 clip at (195,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock {DIV} at (186,187) size 152x152 [border: (1px solid #000000)] layer at (195,190) size 210x510 backgroundClip at (195,240) size 135x135 clip at (195,240) size 135x135 RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (370,239) size 152x152 clip at (371,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock {DIV} at (362,187) size 152x152 [border: (1px solid #000000)] layer at (371,190) size 210x510 backgroundClip at (371,240) size 135x135 clip at (371,240) size 135x135 RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (546,239) size 152x152 clip at (547,240) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock {DIV} at (538,187) size 152x152 [border: (1px solid #000000)] layer at (547,190) size 210x510 backgroundClip at (547,240) size 135x135 clip at (547,240) size 135x135 RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (18,416) size 152x152 clip at (19,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock (relative positioned) {DIV} at (10,364) size 152x152 [border: (1px solid #000000)] RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (194,416) size 152x152 clip at (195,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock (relative positioned) {DIV} at (186,364) size 152x152 [border: (1px solid #000000)] layer at (195,367) size 210x510 backgroundClip at (195,417) size 135x135 clip at (195,417) size 135x135 RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (370,416) size 152x152 clip at (371,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock (relative positioned) {DIV} at (362,364) size 152x152 [border: (1px solid #000000)] layer at (371,367) size 210x510 backgroundClip at (371,417) size 135x135 clip at (371,417) size 135x135 RenderBlock {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." layer at (546,416) size 152x152 clip at (547,417) size 135x135 scrollY 50 scrollWidth 210 scrollHeight 510 RenderBlock (relative positioned) {DIV} at (538,364) size 152x152 [border: (1px solid #000000)] layer at (547,367) size 210x510 backgroundClip at (547,417) size 135x135 clip at (547,417) size 135x135 RenderBlock (relative positioned) {DIV} at (1,1) size 210x510 [bgcolor=#808080] RenderBlock {P} at (5,29) size 200x56 - RenderText {#text} at (0,0) size 189x55 - text run at (0,0) width 189: "This is the inner div" - text run at (0,28) width 110: "that scrolls." + RenderText {#text} at (0,0) size 194x55 + text run at (0,0) width 194: "This is the inner div" + text run at (0,28) width 112: "that scrolls." diff --git a/LayoutTests/platform/wincairo/compositing/overflow/parent-overflow-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/parent-overflow-expected.txt index b8f8a1942ba3..fa94bace385f 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/parent-overflow-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/parent-overflow-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x227 RenderBlock {HTML} at (0,0) size 800x227 RenderBody {BODY} at (8,16) size 784x203 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 349x19 - text run at (0,0) width 349: "Gray box should be clipped by black border in each case." + RenderText {#text} at (0,0) size 362x19 + text run at (0,0) width 362: "Gray box should be clipped by black border in each case." RenderBlock (anonymous) at (0,36) size 784x167 RenderText {#text} at (162,147) size 4x19 text run at (162,147) width 4: " " diff --git a/LayoutTests/platform/wincairo/compositing/overflow/remove-overflow-crash2-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/remove-overflow-crash2-expected.txt index c02e18dbdb7e..cef84615d3e8 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/remove-overflow-crash2-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/remove-overflow-crash2-expected.txt @@ -3,80 +3,86 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x218 RenderBlock {HTML} at (0,0) size 800x218 RenderBody {BODY} at (8,8) size 784x202 -layer at (8,8) size 103x202 clip at (9,9) size 86x185 scrollHeight 1480 +layer at (8,8) size 103x202 clip at (9,9) size 86x185 scrollHeight 1600 RenderBlock {DIV} at (0,0) size 103x202 [border: (1px solid #000000)] - RenderText {#text} at (1,1) size 86x1479 - text run at (1,1) width 79: "Lorem ipsum" - text run at (1,21) width 86: "dolor sit amet," - text run at (1,41) width 69: "consectetur" - text run at (1,61) width 62: "adipisicing" - text run at (1,81) width 66: "elit, sed do" - text run at (1,101) width 50: "eiusmod" - text run at (1,121) width 43: "tempor" - text run at (1,141) width 72: "incididunt ut" - text run at (1,161) width 53: "labore et" - text run at (1,181) width 82: "dolore magna" - text run at (1,201) width 58: "aliqua. Ut" - text run at (1,221) width 86: "enim ad minim" - text run at (1,241) width 74: "veniam, quis" - text run at (1,261) width 45: "nostrud" - text run at (1,281) width 69: "exercitation" - text run at (1,301) width 46: "ullamco" - text run at (1,321) width 78: "laboris nisi ut" - text run at (1,341) width 75: "aliquip ex ea" - text run at (1,361) width 61: "commodo" - text run at (1,381) width 65: "consequat." - text run at (1,401) width 56: "Duis aute" - text run at (1,421) width 77: "irure dolor in" - text run at (1,441) width 80: "reprehenderit" - text run at (1,461) width 69: "in voluptate" - text run at (1,481) width 54: "velit esse" - text run at (1,501) width 77: "cillum dolore" - text run at (1,521) width 81: "eu fugiat nulla" - text run at (1,541) width 50: "pariatur." - text run at (1,561) width 85: "Excepteur sint" - text run at (1,581) width 54: "occaecat" - text run at (1,601) width 81: "cupidatat non" - text run at (1,621) width 82: "proident, sunt" - text run at (1,641) width 68: "in culpa qui" - text run at (1,661) width 36: "officia" - text run at (1,681) width 51: "deserunt" - text run at (1,701) width 79: "mollit anim id" - text run at (1,721) width 74: "est laborum." - text run at (1,741) width 79: "Lorem ipsum" - text run at (1,761) width 86: "dolor sit amet," - text run at (1,781) width 69: "consectetur" - text run at (1,801) width 62: "adipisicing" - text run at (1,821) width 66: "elit, sed do" - text run at (1,841) width 50: "eiusmod" - text run at (1,861) width 43: "tempor" - text run at (1,881) width 72: "incididunt ut" - text run at (1,901) width 53: "labore et" - text run at (1,921) width 82: "dolore magna" - text run at (1,941) width 58: "aliqua. Ut" - text run at (1,961) width 86: "enim ad minim" - text run at (1,981) width 74: "veniam, quis" - text run at (1,1001) width 45: "nostrud" - text run at (1,1021) width 69: "exercitation" - text run at (1,1041) width 46: "ullamco" - text run at (1,1061) width 78: "laboris nisi ut" - text run at (1,1081) width 75: "aliquip ex ea" - text run at (1,1101) width 61: "commodo" - text run at (1,1121) width 65: "consequat." - text run at (1,1141) width 56: "Duis aute" - text run at (1,1161) width 77: "irure dolor in" - text run at (1,1181) width 80: "reprehenderit" - text run at (1,1201) width 69: "in voluptate" - text run at (1,1221) width 54: "velit esse" - text run at (1,1241) width 77: "cillum dolore" - text run at (1,1261) width 81: "eu fugiat nulla" - text run at (1,1281) width 50: "pariatur." - text run at (1,1301) width 85: "Excepteur sint" - text run at (1,1321) width 54: "occaecat" - text run at (1,1341) width 81: "cupidatat non" - text run at (1,1361) width 82: "proident, sunt" - text run at (1,1381) width 68: "in culpa qui" - text run at (1,1401) width 36: "officia" - text run at (1,1421) width 51: "deserunt" - text run at (1,1441) width 79: "mollit anim id" - text run at (1,1461) width 74: "est laborum." + RenderText {#text} at (1,1) size 86x1599 + text run at (1,1) width 84: "Lorem ipsum" + text run at (1,21) width 51: "dolor sit" + text run at (1,41) width 34: "amet," + text run at (1,61) width 71: "consectetur" + text run at (1,81) width 68: "adipisicing" + text run at (1,101) width 68: "elit, sed do" + text run at (1,121) width 53: "eiusmod" + text run at (1,141) width 44: "tempor" + text run at (1,161) width 79: "incididunt ut" + text run at (1,181) width 54: "labore et" + text run at (1,201) width 86: "dolore magna" + text run at (1,221) width 62: "aliqua. Ut" + text run at (1,241) width 50: "enim ad" + text run at (1,261) width 40: "minim" + text run at (1,281) width 80: "veniam, quis" + text run at (1,301) width 47: "nostrud" + text run at (1,321) width 73: "exercitation" + text run at (1,341) width 50: "ullamco" + text run at (1,361) width 84: "laboris nisi ut" + text run at (1,381) width 80: "aliquip ex ea" + text run at (1,401) width 63: "commodo" + text run at (1,421) width 67: "consequat." + text run at (1,441) width 60: "Duis aute" + text run at (1,461) width 82: "irure dolor in" + text run at (1,481) width 83: "reprehenderit" + text run at (1,501) width 74: "in voluptate" + text run at (1,521) width 57: "velit esse" + text run at (1,541) width 83: "cillum dolore" + text run at (1,561) width 55: "eu fugiat" + text run at (1,581) width 86: "nulla pariatur." + text run at (1,601) width 64: "Excepteur" + text run at (1,621) width 80: "sint occaecat" + text run at (1,641) width 85: "cupidatat non" + text run at (1,661) width 86: "proident, sunt" + text run at (1,681) width 74: "in culpa qui" + text run at (1,701) width 40: "officia" + text run at (1,721) width 53: "deserunt" + text run at (1,741) width 71: "mollit anim" + text run at (1,761) width 33: "id est" + text run at (1,781) width 56: "laborum." + text run at (1,801) width 84: "Lorem ipsum" + text run at (1,821) width 51: "dolor sit" + text run at (1,841) width 34: "amet," + text run at (1,861) width 71: "consectetur" + text run at (1,881) width 68: "adipisicing" + text run at (1,901) width 68: "elit, sed do" + text run at (1,921) width 53: "eiusmod" + text run at (1,941) width 44: "tempor" + text run at (1,961) width 79: "incididunt ut" + text run at (1,981) width 54: "labore et" + text run at (1,1001) width 86: "dolore magna" + text run at (1,1021) width 62: "aliqua. Ut" + text run at (1,1041) width 50: "enim ad" + text run at (1,1061) width 40: "minim" + text run at (1,1081) width 80: "veniam, quis" + text run at (1,1101) width 47: "nostrud" + text run at (1,1121) width 73: "exercitation" + text run at (1,1141) width 50: "ullamco" + text run at (1,1161) width 84: "laboris nisi ut" + text run at (1,1181) width 80: "aliquip ex ea" + text run at (1,1201) width 63: "commodo" + text run at (1,1221) width 67: "consequat." + text run at (1,1241) width 60: "Duis aute" + text run at (1,1261) width 82: "irure dolor in" + text run at (1,1281) width 83: "reprehenderit" + text run at (1,1301) width 74: "in voluptate" + text run at (1,1321) width 57: "velit esse" + text run at (1,1341) width 83: "cillum dolore" + text run at (1,1361) width 55: "eu fugiat" + text run at (1,1381) width 86: "nulla pariatur." + text run at (1,1401) width 64: "Excepteur" + text run at (1,1421) width 80: "sint occaecat" + text run at (1,1441) width 85: "cupidatat non" + text run at (1,1461) width 86: "proident, sunt" + text run at (1,1481) width 74: "in culpa qui" + text run at (1,1501) width 40: "officia" + text run at (1,1521) width 53: "deserunt" + text run at (1,1541) width 71: "mollit anim" + text run at (1,1561) width 33: "id est" + text run at (1,1581) width 56: "laborum." diff --git a/LayoutTests/platform/wincairo/compositing/overflow/scroll-ancestor-update-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/scroll-ancestor-update-expected.txt index 71a12c6d7c16..2d30f91c714c 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/scroll-ancestor-update-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/scroll-ancestor-update-expected.txt @@ -11,10 +11,10 @@ layer at (50,50) size 100x100 layer at (50,50) size 200x200 RenderBlock (positioned) {DIV} at (50,50) size 200x200 RenderBlock {P} at (0,218) size 200x60 - RenderText {#text} at (0,0) size 198x59 - text run at (0,0) width 182: "The green box should obscure" - text run at (0,20) width 198: "the red box, and move when you" - text run at (0,40) width 109: "drag the scrollbar." + RenderText {#text} at (0,0) size 191x59 + text run at (0,0) width 191: "The green box should obscure" + text run at (0,20) width 180: "the red box, and move when" + text run at (0,40) width 140: "you drag the scrollbar." layer at (50,50) size 202x202 clip at (51,51) size 185x200 scrollY 50 scrollHeight 550 RenderBlock {DIV} at (0,0) size 202x202 [border: (1px solid #000000)] RenderBlock {DIV} at (1,51) size 185x500 diff --git a/LayoutTests/platform/wincairo/compositing/overflow/scrollbar-painting-expected.txt b/LayoutTests/platform/wincairo/compositing/overflow/scrollbar-painting-expected.txt index f6135d943545..39778c505079 100644 --- a/LayoutTests/platform/wincairo/compositing/overflow/scrollbar-painting-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/overflow/scrollbar-painting-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x272 RenderBlock {HTML} at (0,0) size 800x272 RenderBody {BODY} at (8,16) size 784x246 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 456x19 - text run at (0,0) width 456: "You should see scrollbars on the gray square, and a resizer control below it." + RenderText {#text} at (0,0) size 474x19 + text run at (0,0) width 474: "You should see scrollbars on the gray square, and a resizer control below it." layer at (18,52) size 100x100 clip at (18,52) size 85x85 scrollWidth 500 scrollHeight 500 RenderBlock (relative positioned) {DIV} at (10,36) size 100x100 layer at (18,52) size 500x500 backgroundClip at (18,52) size 85x85 clip at (18,52) size 85x85 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/animation-inside-reflection-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/animation-inside-reflection-expected.txt index 6dd2d59abbcf..310fe1d6647e 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/animation-inside-reflection-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/animation-inside-reflection-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x346 RenderBlock {HTML} at (0,0) size 800x346 RenderBody {BODY} at (8,16) size 784x322 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 363x19 - text run at (0,0) width 363: "The top left box, and all reflections should be rotated 45deg." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "The top left box, and all reflections should be rotated 45deg." RenderBlock {DIV} at (0,302) size 784x20 - RenderText {#text} at (0,0) size 595x19 - text run at (0,0) width 595: "PASS - \"webkitTransform.0\" property for \"animated\" element at 0.5s saw something close to: 0.76" - RenderBR {BR} at (595,0) size 0x19 + RenderText {#text} at (0,0) size 622x19 + text run at (0,0) width 622: "PASS - \"webkitTransform.0\" property for \"animated\" element at 0.5s saw something close to: 0.76" + RenderBR {BR} at (622,0) size 0x19 layer at (28,56) size 122x242 RenderBlock {DIV} at (20,40) size 122x242 [border: (1px solid #000000)] layer at (39,67) size 104x104 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/compositing-change-inside-reflection-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/compositing-change-inside-reflection-expected.txt index d361a4cddb0c..1a2f46e16c63 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/compositing-change-inside-reflection-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/compositing-change-inside-reflection-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 544x19 - text run at (0,0) width 544: "Test dynamically created compositing layer inside reflection. You should see no red below." + RenderText {#text} at (0,0) size 570x19 + text run at (0,0) width 570: "Test dynamically created compositing layer inside reflection. You should see no red below." layer at (19,183) size 100x100 RenderBlock (positioned) {DIV} at (11,131) size 100x100 [bgcolor=#FF0000] layer at (8,52) size 120x120 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/deeply-nested-reflections-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/deeply-nested-reflections-expected.txt index ad6059d58f6a..b0ff297f8787 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/deeply-nested-reflections-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/deeply-nested-reflections-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x300 RenderBlock {HTML} at (0,0) size 800x300 RenderBody {BODY} at (8,16) size 784x276 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 155x19 - text run at (0,0) width 155: "Deeply nested reflections." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "Deeply nested reflections." layer at (10,52) size 234x240 RenderBlock {DIV} at (2,36) size 234x240 [border: (1px solid #000000)] layer at (13,55) size 228x234 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/load-video-in-reflection-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/load-video-in-reflection-expected.txt index 43a04d8c1dd3..b22a3b216f54 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/load-video-in-reflection-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/load-video-in-reflection-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x353 RenderBlock {HTML} at (0,0) size 800x353 RenderBody {BODY} at (8,16) size 784x329 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 473x19 - text run at (0,0) width 473: "You should see a reflected video below, rather than the red video background." + RenderText {#text} at (0,0) size 490x19 + text run at (0,0) width 490: "You should see a reflected video below, rather than the red video background." layer at (8,52) size 300x293 RenderBlock {DIV} at (0,36) size 300x293 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/masked-reflection-on-composited-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/masked-reflection-on-composited-expected.txt index 61113c8d02cf..473865acb3a0 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/masked-reflection-on-composited-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/masked-reflection-on-composited-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x276 RenderBlock {HTML} at (0,0) size 800x276 RenderBody {BODY} at (8,16) size 784x140 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 258x19 - text run at (0,0) width 258: "Reflection should be masked with gradient." + RenderText {#text} at (0,0) size 273x19 + text run at (0,0) width 273: "Reflection should be masked with gradient." layer at (28,56) size 100x100 RenderBlock {DIV} at (20,40) size 100x100 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-anchor-point-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-anchor-point-expected.txt index 147a5c6edbf0..64dfb3678b54 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-anchor-point-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-anchor-point-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x272 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 267x19 - text run at (0,0) width 267: "Left and right sides should look symmetrical." + RenderText {#text} at (0,0) size 283x19 + text run at (0,0) width 283: "Left and right sides should look symmetrical." layer at (68,56) size 122x232 RenderBlock {DIV} at (60,40) size 122x232 [border: (1px solid #000000)] layer at (79,67) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-animated-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-animated-expected.txt index 8d4d1aa86e37..0b02b4e770b1 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-animated-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-animated-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x336 RenderBlock {HTML} at (0,0) size 800x336 RenderBody {BODY} at (8,16) size 784x312 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 593x19 - text run at (0,0) width 593: "Animation on original and reflection should both be paused half way through, giving 45deg rotation." + RenderText {#text} at (0,0) size 633x19 + text run at (0,0) width 633: "Animation on original and reflection should both be paused half way through, giving 45deg rotation." RenderBlock {DIV} at (0,292) size 784x20 - RenderText {#text} at (0,0) size 570x19 - text run at (0,0) width 570: "PASS - \"webkitTransform.0\" property for \"inner\" element at 0.5s saw something close to: 0.76" - RenderBR {BR} at (570,0) size 0x19 + RenderText {#text} at (0,0) size 597x19 + text run at (0,0) width 597: "PASS - \"webkitTransform.0\" property for \"inner\" element at 0.5s saw something close to: 0.76" + RenderBR {BR} at (597,0) size 0x19 layer at (108,56) size 122x232 RenderBlock {DIV} at (100,40) size 122x232 [border: (1px solid #000000)] layer at (119,67) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-expected.txt index 28be67dfba7d..4bb7b4f8c830 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x272 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 363x19 - text run at (0,0) width 363: "You should see the original and three copies of the blue box." + RenderText {#text} at (0,0) size 380x19 + text run at (0,0) width 380: "You should see the original and three copies of the blue box." layer at (28,56) size 122x232 RenderBlock {DIV} at (20,40) size 122x232 [border: (1px solid #000000)] layer at (39,67) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-mask-change-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-mask-change-expected.txt index c13f1207cada..a45b845d12be 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-mask-change-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-mask-change-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x272 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 340x19 - text run at (0,0) width 340: "The four green squares should all have the mask applied." + RenderText {#text} at (0,0) size 358x19 + text run at (0,0) width 358: "The four green squares should all have the mask applied." layer at (28,56) size 122x232 RenderBlock {DIV} at (20,40) size 122x232 [border: (1px solid #000000)] layer at (39,67) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-on-overflow-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-on-overflow-expected.txt index 9d54578ea9d8..292a23cf0ff4 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-on-overflow-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-on-overflow-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x272 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 426x19 - text run at (0,0) width 426: "You should see the original and three copies of the green box with text." + RenderText {#text} at (0,0) size 447x19 + text run at (0,0) width 447: "You should see the original and three copies of the green box with text." layer at (28,56) size 122x232 RenderBlock {DIV} at (20,40) size 122x232 [border: (1px solid #000000)] layer at (39,67) size 100x100 @@ -14,25 +14,27 @@ layer at (39,67) size 100x100 clip at (39,67) size 85x85 scrollHeight 500 RenderBlock (relative positioned) {DIV} at (0,0) size 100x100 layer at (39,67) size 85x500 backgroundClip at (39,67) size 85x85 clip at (39,67) size 85x85 RenderBlock {DIV} at (0,0) size 85x500 - RenderText {#text} at (0,0) size 85x419 - text run at (0,0) width 79: "Lorem ipsum" - text run at (0,20) width 49: "dolor sit" - text run at (0,40) width 33: "amet," - text run at (0,60) width 69: "consectetur" - text run at (0,80) width 62: "adipisicing" - text run at (0,100) width 66: "elit, sed do" - text run at (0,120) width 50: "eiusmod" - text run at (0,140) width 43: "tempor" - text run at (0,160) width 72: "incididunt ut" - text run at (0,180) width 53: "labore et" - text run at (0,200) width 82: "dolore magna" - text run at (0,220) width 58: "aliqua. Ut" - text run at (0,240) width 47: "enim ad" - text run at (0,260) width 85: "minim veniam," - text run at (0,280) width 73: "quis nostrud" - text run at (0,300) width 69: "exercitation" - text run at (0,320) width 46: "ullamco" - text run at (0,340) width 78: "laboris nisi ut" - text run at (0,360) width 75: "aliquip ex ea" - text run at (0,380) width 61: "commodo" - text run at (0,400) width 65: "consequat." + RenderText {#text} at (0,0) size 84x459 + text run at (0,0) width 84: "Lorem ipsum" + text run at (0,20) width 51: "dolor sit" + text run at (0,40) width 34: "amet," + text run at (0,60) width 71: "consectetur" + text run at (0,80) width 68: "adipisicing" + text run at (0,100) width 68: "elit, sed do" + text run at (0,120) width 53: "eiusmod" + text run at (0,140) width 44: "tempor" + text run at (0,160) width 79: "incididunt ut" + text run at (0,180) width 54: "labore et" + text run at (0,200) width 40: "dolore" + text run at (0,220) width 42: "magna" + text run at (0,240) width 62: "aliqua. Ut" + text run at (0,260) width 50: "enim ad" + text run at (0,280) width 40: "minim" + text run at (0,300) width 80: "veniam, quis" + text run at (0,320) width 47: "nostrud" + text run at (0,340) width 73: "exercitation" + text run at (0,360) width 50: "ullamco" + text run at (0,380) width 84: "laboris nisi ut" + text run at (0,400) width 80: "aliquip ex ea" + text run at (0,420) width 63: "commodo" + text run at (0,440) width 67: "consequat." diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-opacity-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-opacity-expected.txt index 165935f61c85..118d931abb9a 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-opacity-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-opacity-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x272 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 333x19 - text run at (0,0) width 333: "The four green squares should look equally transparent." + RenderText {#text} at (0,0) size 350x19 + text run at (0,0) width 350: "The four green squares should look equally transparent." layer at (28,56) size 122x232 RenderBlock {DIV} at (20,40) size 122x232 [border: (1px solid #000000)] layer at (39,67) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-size-change-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-size-change-expected.txt index f5ccda0ae577..5393af69949b 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-size-change-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-size-change-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x348 RenderBlock {HTML} at (0,0) size 800x348 RenderBody {BODY} at (8,16) size 784x312 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The four green squares should all be lined up." + RenderText {#text} at (0,0) size 288x19 + text run at (0,0) width 288: "The four green squares should all be lined up." layer at (28,56) size 142x272 RenderBlock {DIV} at (20,40) size 142x272 [border: (1px solid #000000)] layer at (39,67) size 120x120 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transformed-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transformed-expected.txt index b583aa10d984..c43ac9c9109a 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transformed-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transformed-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x272 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 521x19 - text run at (0,0) width 521: "Test transform change on reflected elements. Left and right side should be symmetrical." + RenderText {#text} at (0,0) size 548x19 + text run at (0,0) width 548: "Test transform change on reflected elements. Left and right side should be symmetrical." layer at (28,56) size 122x232 RenderBlock {DIV} at (20,40) size 122x232 [border: (1px solid #000000)] layer at (39,67) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transformed2-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transformed2-expected.txt index 3f5a178c33fb..a2225a2efce9 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transformed2-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transformed2-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x328 RenderBlock {HTML} at (0,0) size 800x328 RenderBody {BODY} at (8,16) size 784x292 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 739x39 - text run at (0,0) width 739: "Test transform change on reflected elements, with compositing layers larger than render layers. Left and right side should be" - text run at (0,20) width 75: "symmetrical." + RenderText {#text} at (0,0) size 778x39 + text run at (0,0) width 778: "Test transform change on reflected elements, with compositing layers larger than render layers. Left and right side should be" + text run at (0,20) width 80: "symmetrical." layer at (28,76) size 122x232 RenderBlock {DIV} at (20,60) size 122x232 [border: (1px solid #000000)] layer at (39,87) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transition-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transition-expected.txt index e87174e715a2..add4e4fa6bb4 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transition-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/nested-reflection-transition-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x300 RenderBlock {HTML} at (0,0) size 800x300 RenderBody {BODY} at (8,20) size 784x272 RenderBlock {DIV} at (0,252) size 784x20 - RenderText {#text} at (0,0) size 577x19 - text run at (0,0) width 577: "PASS - \"-webkit-transform.1\" property for \"inner\" element at 0.5s saw something close to: 0.76" - RenderBR {BR} at (577,0) size 0x19 + RenderText {#text} at (0,0) size 602x19 + text run at (0,0) width 602: "PASS - \"-webkit-transform.1\" property for \"inner\" element at 0.5s saw something close to: 0.76" + RenderBR {BR} at (602,0) size 0x19 layer at (28,20) size 122x232 RenderBlock {DIV} at (20,0) size 122x232 [border: (1px solid #000000)] layer at (29,31) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/reflection-in-composited-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/reflection-in-composited-expected.txt index 0d072bc1f4e7..3344941f4717 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/reflection-in-composited-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/reflection-in-composited-expected.txt @@ -4,18 +4,18 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 391x19 - text run at (0,0) width 391: "Reflection should not be cropped by being in a composited layer." + RenderText {#text} at (0,0) size 409x19 + text run at (0,0) width 409: "Reflection should not be cropped by being in a composited layer." RenderBlock {P} at (0,292) size 784x20 - RenderText {#text} at (0,0) size 227x19 - text run at (0,0) width 227: "This is the next paragraph in the page." + RenderText {#text} at (0,0) size 240x19 + text run at (0,0) width 240: "This is the next paragraph in the page." layer at (208,78) size 342x172 RenderBlock {DIV} at (200,70) size 342x172 [border: (1px solid #000000)] RenderBlock {P} at (21,27) size 300x20 - RenderText {#text} at (0,0) size 217x19 - text run at (0,0) width 217: "This element has a composited layer" + RenderText {#text} at (0,0) size 228x19 + text run at (0,0) width 228: "This element has a composited layer" layer at (349,119) size 260x72 RenderBlock (positioned) {DIV} at (141,41) size 260x72 [bgcolor=#DDDDDD] RenderBlock {P} at (10,26) size 240x20 - RenderText {#text} at (0,0) size 211x19 - text run at (0,0) width 211: "This is a positioned, reflected child." + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "This is a positioned, reflected child." diff --git a/LayoutTests/platform/wincairo/compositing/reflections/reflection-on-composited-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/reflection-on-composited-expected.txt index 18c61c92f0f8..96093a0bc408 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/reflection-on-composited-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/reflection-on-composited-expected.txt @@ -5,11 +5,11 @@ layer at (0,0) size 800x460 RenderBody {BODY} at (8,20) size 784x320 layer at (28,20) size 200x100 RenderBlock {DIV} at (20,0) size 200x100 [bgcolor=#808080] - RenderText {#text} at (0,0) size 105x19 - text run at (0,0) width 105: "Here is some text" + RenderText {#text} at (0,0) size 109x19 + text run at (0,0) width 109: "Here is some text" layer at (8,240) size 784x100 RenderBlock {DIV} at (0,220) size 784x100 layer at (28,240) size 200x100 RenderBlock {DIV} at (20,0) size 200x100 [bgcolor=#808080] - RenderText {#text} at (0,0) size 105x19 - text run at (0,0) width 105: "Here is some text" + RenderText {#text} at (0,0) size 109x19 + text run at (0,0) width 109: "Here is some text" diff --git a/LayoutTests/platform/wincairo/compositing/reflections/reflection-opacity-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/reflection-opacity-expected.txt index ddfcb8ac51f7..34e69a554d3f 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/reflection-opacity-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/reflection-opacity-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x180 RenderBlock {HTML} at (0,0) size 800x180 RenderBody {BODY} at (8,16) size 784x156 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 740x39 - text run at (0,0) width 740: "Opacity should be applied after reflection, so you should see a green rectangle below. The overlap between the original and" - text run at (0,20) width 185: "reflection should not be visible." + RenderText {#text} at (0,0) size 776x39 + text run at (0,0) width 776: "Opacity should be applied after reflection, so you should see a green rectangle below. The overlap between the original and" + text run at (0,20) width 197: "reflection should not be visible." layer at (8,72) size 150x100 RenderBlock (relative positioned) {DIV} at (0,56) size 150x100 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/compositing/reflections/reflection-ordering-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/reflection-ordering-expected.txt index eeeb5d4c049d..480824b3c67f 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/reflection-ordering-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/reflection-ordering-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x196 RenderBlock {HTML} at (0,0) size 800x196 RenderBody {BODY} at (8,16) size 784x160 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 733x19 - text run at (0,0) width 733: "You should see a black rectangle divided into two parts; the top part should be taller (reflection should be behind original)." + RenderText {#text} at (0,0) size 767x19 + text run at (0,0) width 767: "You should see a black rectangle divided into two parts; the top part should be taller (reflection should be behind original)." layer at (28,56) size 220x120 RenderBlock {DIV} at (20,40) size 220x120 [bgcolor=#FFFFFF] [border: (10px solid #000000)] RenderText {#text} at (67,10) size 86x27 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/reflection-positioning-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/reflection-positioning-expected.txt index 9451572442d2..bb168f9e191a 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/reflection-positioning-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/reflection-positioning-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 487x19 - text run at (0,0) width 487: "Position of reflected layer should update correctly. You should see no red below." + RenderText {#text} at (0,0) size 505x19 + text run at (0,0) width 505: "Position of reflected layer should update correctly. You should see no red below." layer at (20,50) size 150x120 RenderBlock (positioned) {DIV} at (20,50) size 150x120 layer at (46,185) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/reflection-positioning2-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/reflection-positioning2-expected.txt index e7e3503f9c8d..8f7ba54b30c1 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/reflection-positioning2-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/reflection-positioning2-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 487x19 - text run at (0,0) width 487: "Position of reflected layer should update correctly. You should see no red below." + RenderText {#text} at (0,0) size 505x19 + text run at (0,0) width 505: "Position of reflected layer should update correctly. You should see no red below." layer at (50,50) size 150x120 RenderBlock (positioned) {DIV} at (50,50) size 150x120 layer at (76,185) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/reflections/simple-composited-reflections-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/simple-composited-reflections-expected.txt index 36c46fafe943..7fc61f4a37fd 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/simple-composited-reflections-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/simple-composited-reflections-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 551x19 - text run at (0,0) width 551: "Testing reflections on directly composited images. Left and right sides should look the same." + RenderText {#text} at (0,0) size 580x19 + text run at (0,0) width 580: "Testing reflections on directly composited images. Left and right sides should look the same." RenderBlock (anonymous) at (0,36) size 784x169 RenderText {#text} at (224,149) size 4x19 text run at (224,149) width 4: " " diff --git a/LayoutTests/platform/wincairo/compositing/reflections/transform-inside-reflection-expected.txt b/LayoutTests/platform/wincairo/compositing/reflections/transform-inside-reflection-expected.txt index 265d28f26a6b..b64418000873 100644 --- a/LayoutTests/platform/wincairo/compositing/reflections/transform-inside-reflection-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/reflections/transform-inside-reflection-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x328 RenderBlock {HTML} at (0,0) size 800x328 RenderBody {BODY} at (8,16) size 784x292 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 783x39 - text run at (0,0) width 783: "Transform inside nested reflections should be applied correctly. You should see four rotated green boxes, as mirror images of each" - text run at (0,20) width 35: "other." + RenderText {#text} at (0,0) size 782x39 + text run at (0,0) width 782: "Transform inside nested reflections should be applied correctly. You should see four rotated green boxes, as mirror images of" + text run at (0,20) width 68: "each other." layer at (28,76) size 122x232 RenderBlock {DIV} at (20,60) size 122x232 [border: (1px solid #000000)] layer at (39,87) size 102x102 diff --git a/LayoutTests/platform/wincairo/compositing/repaint/become-overlay-composited-layer-expected.txt b/LayoutTests/platform/wincairo/compositing/repaint/become-overlay-composited-layer-expected.txt index 42be6bd79d0d..d97ce563cbd6 100644 --- a/LayoutTests/platform/wincairo/compositing/repaint/become-overlay-composited-layer-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/repaint/become-overlay-composited-layer-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 146x19 [color=#0000EE] - RenderText {#text} at (0,0) size 146x19 - text run at (0,0) width 146: "rdar://problem/6983207" - RenderText {#text} at (146,0) size 374x19 - text run at (146,0) width 374: "Should not leave blue box behind after moving to the top right." + RenderInline {A} at (0,0) size 149x19 [color=#0000EE] + RenderText {#text} at (0,0) size 149x19 + text run at (0,0) width 149: "rdar://problem/6983207" + RenderText {#text} at (149,0) size 396x19 + text run at (149,0) width 396: "Should not leave blue box behind after moving to the top right." layer at (8,44) size 502x102 RenderBlock (relative positioned) {DIV} at (0,36) size 502x102 [border: (1px solid #000000)] layer at (259,45) size 250x100 diff --git a/LayoutTests/platform/wincairo/compositing/repaint/composited-document-element-expected.txt b/LayoutTests/platform/wincairo/compositing/repaint/composited-document-element-expected.txt index 7c5ce94386a1..3434e67d70aa 100644 --- a/LayoutTests/platform/wincairo/compositing/repaint/composited-document-element-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/repaint/composited-document-element-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x52 layer at (8,16) size 784x20 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 336x19 - text run at (0,0) width 336: "In a pixel test, you should see a plain white background." + RenderText {#text} at (0,0) size 354x19 + text run at (0,0) width 354: "In a pixel test, you should see a plain white background." diff --git a/LayoutTests/platform/wincairo/compositing/repaint/layer-repaint-expected.txt b/LayoutTests/platform/wincairo/compositing/repaint/layer-repaint-expected.txt index 49cf05fe35c6..067a58c69273 100644 --- a/LayoutTests/platform/wincairo/compositing/repaint/layer-repaint-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/repaint/layer-repaint-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x362 RenderBlock {HTML} at (0,0) size 800x362 RenderBody {BODY} at (8,16) size 784x338 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 413x19 - text run at (0,0) width 413: "Test for repaint in a composited layer. You should see no red below." + RenderText {#text} at (0,0) size 426x19 + text run at (0,0) width 426: "Test for repaint in a composited layer. You should see no red below." layer at (8,52) size 202x302 RenderBlock {DIV} at (0,36) size 202x302 [border: (1px solid #000000)] RenderBlock {DIV} at (51,51) size 100x100 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/compositing/repaint/layer-repaint-rects-expected.txt b/LayoutTests/platform/wincairo/compositing/repaint/layer-repaint-rects-expected.txt index a8abe2edf98e..05c54c334e2e 100644 --- a/LayoutTests/platform/wincairo/compositing/repaint/layer-repaint-rects-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/repaint/layer-repaint-rects-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (0,16) size 800x20 RenderBlock {P} at (0,0) size 800x20 - RenderText {#text} at (0,0) size 628x19 - text run at (0,0) width 628: "Tests repaint after a layer stops compositing. You should see no red below after the end of the transition." + RenderText {#text} at (0,0) size 653x19 + text run at (0,0) width 653: "Tests repaint after a layer stops compositing. You should see no red below after the end of the transition." layer at (0,100) size 402x232 RenderBlock (positioned) {DIV} at (0,100) size 402x232 [border: (1px solid #000000)] layer at (1,111) size 200x100 diff --git a/LayoutTests/platform/wincairo/compositing/repaint/opacity-between-absolute-expected.txt b/LayoutTests/platform/wincairo/compositing/repaint/opacity-between-absolute-expected.txt index 900a30f0ece0..8b283cc92d50 100644 --- a/LayoutTests/platform/wincairo/compositing/repaint/opacity-between-absolute-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/repaint/opacity-between-absolute-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x262 RenderBlock {HTML} at (0,0) size 800x262 RenderBody {BODY} at (8,16) size 784x238 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 402x19 - text run at (0,0) width 402: "This test should not assert, and you should see a fully green square." + RenderText {#text} at (0,0) size 423x19 + text run at (0,0) width 423: "This test should not assert, and you should see a fully green square." layer at (8,52) size 202x202 RenderBlock (relative positioned) {DIV} at (0,36) size 202x202 [border: (1px solid #000000)] layer at (29,73) size 52x52 diff --git a/LayoutTests/platform/wincairo/compositing/repaint/opacity-between-absolute2-expected.txt b/LayoutTests/platform/wincairo/compositing/repaint/opacity-between-absolute2-expected.txt index e6c0c60c1844..04b731667db8 100644 --- a/LayoutTests/platform/wincairo/compositing/repaint/opacity-between-absolute2-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/repaint/opacity-between-absolute2-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x262 RenderBlock {HTML} at (0,0) size 800x262 RenderBody {BODY} at (8,16) size 784x238 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 402x19 - text run at (0,0) width 402: "This test should not assert, and you should see a fully green square." + RenderText {#text} at (0,0) size 423x19 + text run at (0,0) width 423: "This test should not assert, and you should see a fully green square." layer at (8,52) size 202x202 RenderBlock (relative positioned) {DIV} at (0,36) size 202x202 [border: (1px solid #000000)] RenderBlock {DIV} at (21,21) size 52x52 [border: (1px solid #000000)] diff --git a/LayoutTests/platform/wincairo/compositing/self-painting-layers-expected.txt b/LayoutTests/platform/wincairo/compositing/self-painting-layers-expected.txt index 47ea081619bb..4d46fe60230e 100644 --- a/LayoutTests/platform/wincairo/compositing/self-painting-layers-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/self-painting-layers-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x431 RenderBlock {HTML} at (0,0) size 800x431 RenderBody {BODY} at (8,16) size 784x405 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 309x19 - text run at (0,0) width 309: "You should not see double text when the div scrolls" + RenderText {#text} at (0,0) size 324x19 + text run at (0,0) width 324: "You should not see double text when the div scrolls" RenderBlock {DIV} at (10,36) size 302x207 [border: (1px solid #000000)] RenderText {#text} at (0,0) size 0x0 layer at (19,53) size 300x200 @@ -16,8 +16,8 @@ layer at (18,269) size 302x152 clip at (19,270) size 285x150 scrollY 24 scrollHe RenderText {#text} at (0,6) size 107x36 text run at (0,6) width 107: "Scrolled" RenderBR {BR} at (107,6) size 0x36 - RenderText {#text} at (0,54) size 47x36 - text run at (0,54) width 47: "text" - RenderBR {BR} at (47,54) size 0x36 - RenderText {#text} at (0,102) size 62x36 - text run at (0,102) width 62: "here." + RenderText {#text} at (0,54) size 48x36 + text run at (0,54) width 48: "text" + RenderBR {BR} at (48,54) size 0x36 + RenderText {#text} at (0,102) size 63x36 + text run at (0,102) width 63: "here." diff --git a/LayoutTests/platform/wincairo/compositing/shadows/shadow-drawing-expected.txt b/LayoutTests/platform/wincairo/compositing/shadows/shadow-drawing-expected.txt index 3c23c2dc02ef..855542ccce09 100644 --- a/LayoutTests/platform/wincairo/compositing/shadows/shadow-drawing-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/shadows/shadow-drawing-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x312 RenderBlock {HTML} at (0,0) size 800x312 RenderBody {BODY} at (8,16) size 784x288 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Left and right sides should look the same." + RenderText {#text} at (0,0) size 262x19 + text run at (0,0) width 262: "Left and right sides should look the same." RenderBlock (anonymous) at (0,36) size 784x252 RenderBlock {DIV} at (50,50) size 202x152 [border: (1px solid #000000)] RenderText {#text} at (302,151) size 4x19 @@ -13,13 +13,13 @@ layer at (0,0) size 800x312 RenderText {#text} at (0,0) size 0x0 layer at (59,140) size 200x88 RenderBlock {P} at (1,38) size 200x89 [color=#0000FF] - RenderText {#text} at (24,1) size 152x86 - text run at (24,1) width 152: "Shadowed" - text run at (73,45) width 54: "text" + RenderText {#text} at (22,1) size 156x86 + text run at (22,1) width 156: "Shadowed" + text run at (72,45) width 56: "text" layer at (364,102) size 202x152 RenderBlock {DIV} at (356,50) size 202x152 [border: (1px solid #000000)] layer at (365,140) size 200x88 RenderBlock {P} at (1,38) size 200x89 [color=#0000FF] - RenderText {#text} at (24,1) size 152x86 - text run at (24,1) width 152: "Shadowed" - text run at (73,45) width 54: "text" + RenderText {#text} at (22,1) size 156x86 + text run at (22,1) width 156: "Shadowed" + text run at (72,45) width 56: "text" diff --git a/LayoutTests/platform/wincairo/compositing/sibling-positioning-expected.txt b/LayoutTests/platform/wincairo/compositing/sibling-positioning-expected.txt index 9f46e63bf5e2..0606f7d9c2ee 100644 --- a/LayoutTests/platform/wincairo/compositing/sibling-positioning-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/sibling-positioning-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x298 RenderBlock {HTML} at (0,0) size 800x298 RenderBody {BODY} at (8,8) size 784x274 RenderBlock {P} at (0,218) size 784x20 - RenderInline {A} at (0,0) size 291x19 [color=#0000EE] - RenderText {#text} at (0,0) size 291x19 - text run at (0,0) width 291: "https://bugs.webkit.org/show_bug.cgi?id=26430" + RenderInline {A} at (0,0) size 305x19 [color=#0000EE] + RenderText {#text} at (0,0) size 305x19 + text run at (0,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=26430" RenderBlock {P} at (0,254) size 784x20 - RenderText {#text} at (0,0) size 256x19 - text run at (0,0) width 256: "Green box should not move when hovered" + RenderText {#text} at (0,0) size 270x19 + text run at (0,0) width 270: "Green box should not move when hovered" layer at (8,8) size 202x202 RenderBlock (relative positioned) {DIV} at (0,0) size 202x202 [border: (1px solid #000000)] layer at (59,59) size 60x60 diff --git a/LayoutTests/platform/wincairo/compositing/text-on-large-layer-expected.txt b/LayoutTests/platform/wincairo/compositing/text-on-large-layer-expected.txt index f697da01dd3a..febad183e024 100644 --- a/LayoutTests/platform/wincairo/compositing/text-on-large-layer-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/text-on-large-layer-expected.txt @@ -5,8 +5,8 @@ layer at (0,0) size 800x8 RenderBody {BODY} at (8,8) size 784x0 layer at (3,1) size 2000x10000 RenderBlock (positioned) {DIV} at (3,1) size 2000x10000 - RenderText {#text} at (0,0) size 519x19 - text run at (0,0) width 519: "This is some text inside a very large composited layer to test that it is rendered sharply." - RenderBR {BR} at (519,0) size 0x19 - RenderText {#text} at (0,20) size 203x19 - text run at (0,20) width 203: "The test passes if this text is crisp." + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 542: "This is some text inside a very large composited layer to test that it is rendered sharply." + RenderBR {BR} at (542,0) size 0x19 + RenderText {#text} at (0,20) size 212x19 + text run at (0,20) width 212: "The test passes if this text is crisp." diff --git a/LayoutTests/platform/wincairo/compositing/transitions/scale-transition-no-start-expected.txt b/LayoutTests/platform/wincairo/compositing/transitions/scale-transition-no-start-expected.txt index d5b84c90a2a7..8750ba763b93 100644 --- a/LayoutTests/platform/wincairo/compositing/transitions/scale-transition-no-start-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/transitions/scale-transition-no-start-expected.txt @@ -4,17 +4,17 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 467x19 - text run at (0,0) width 467: "In the pixel result, the green boxes should be coincident with the black outline." + RenderText {#text} at (0,0) size 494x19 + text run at (0,0) width 494: "In the pixel result, the green boxes should be coincident with the black outline." RenderBlock {DIV} at (0,36) size 202x202 [border: (1px solid #EEEEEE)] RenderBlock {DIV} at (0,238) size 202x202 [border: (1px solid #EEEEEE)] RenderBlock {DIV} at (0,440) size 784x40 - RenderText {#text} at (0,0) size 577x19 - text run at (0,0) width 577: "PASS - \"-webkit-transform.0\" property for \"inner1\" element at 0.5s saw something close to: 1.5" - RenderBR {BR} at (577,0) size 0x19 - RenderText {#text} at (0,20) size 577x19 - text run at (0,20) width 577: "PASS - \"-webkit-transform.0\" property for \"inner2\" element at 0.5s saw something close to: 1.5" - RenderBR {BR} at (577,20) size 0x19 + RenderText {#text} at (0,0) size 602x19 + text run at (0,0) width 602: "PASS - \"-webkit-transform.0\" property for \"inner1\" element at 0.5s saw something close to: 1.5" + RenderBR {BR} at (602,0) size 0x19 + RenderText {#text} at (0,20) size 602x19 + text run at (0,20) width 602: "PASS - \"-webkit-transform.0\" property for \"inner2\" element at 0.5s saw something close to: 1.5" + RenderBR {BR} at (602,20) size 0x19 layer at (34,70) size 150x150 RenderBlock (positioned) {DIV} at (34,70) size 150x150 [border: (1px solid #000000)] layer at (59,95) size 100x100 diff --git a/LayoutTests/platform/wincairo/compositing/transitions/singular-scale-transition-expected.txt b/LayoutTests/platform/wincairo/compositing/transitions/singular-scale-transition-expected.txt index e1068798e630..17abba13f068 100644 --- a/LayoutTests/platform/wincairo/compositing/transitions/singular-scale-transition-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/transitions/singular-scale-transition-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 571x19 - text run at (0,0) width 571: "Check the pixel result to make sure that the gray square is half way through the scale animation." + RenderText {#text} at (0,0) size 602x19 + text run at (0,0) width 602: "Check the pixel result to make sure that the gray square is half way through the scale animation." RenderBlock {DIV} at (0,36) size 202x202 [border: (1px solid #000000)] RenderBlock {DIV} at (0,238) size 784x20 - RenderText {#text} at (0,0) size 569x19 - text run at (0,0) width 569: "PASS - \"-webkit-transform.0\" property for \"inner\" element at 0.5s saw something close to: 0.5" - RenderBR {BR} at (569,0) size 0x19 + RenderText {#text} at (0,0) size 594x19 + text run at (0,0) width 594: "PASS - \"-webkit-transform.0\" property for \"inner\" element at 0.5s saw something close to: 0.5" + RenderBR {BR} at (594,0) size 0x19 layer at (9,45) size 200x200 RenderBlock {DIV} at (1,1) size 200x200 [bgcolor=#808080] diff --git a/LayoutTests/platform/wincairo/compositing/webgl/webgl-background-color-expected.txt b/LayoutTests/platform/wincairo/compositing/webgl/webgl-background-color-expected.txt index a2b7e95e9b4f..95cf46fc1ad8 100644 --- a/LayoutTests/platform/wincairo/compositing/webgl/webgl-background-color-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/webgl/webgl-background-color-expected.txt @@ -7,7 +7,7 @@ layer at (0,0) size 800x537 RenderBlock (anonymous) at (0,220) size 784x245 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,481) size 784x20 - RenderText {#text} at (0,0) size 233x19 - text run at (0,0) width 233: "Top and bottom should look the same." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "Top and bottom should look the same." layer at (28,260) size 240x200 RenderHTMLCanvas {CANVAS} at (20,20) size 240x200 [bgcolor=#00008080] diff --git a/LayoutTests/platform/wincairo/compositing/webgl/webgl-reflection-expected.txt b/LayoutTests/platform/wincairo/compositing/webgl/webgl-reflection-expected.txt index ccfcec1b63dc..450174678bf5 100644 --- a/LayoutTests/platform/wincairo/compositing/webgl/webgl-reflection-expected.txt +++ b/LayoutTests/platform/wincairo/compositing/webgl/webgl-reflection-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x309 RenderBlock {HTML} at (0,0) size 800x309 RenderBody {BODY} at (8,16) size 784x285 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 294x19 - text run at (0,0) width 294: "You should see a green triangle and its reflection." + RenderText {#text} at (0,0) size 309x19 + text run at (0,0) width 309: "You should see a green triangle and its reflection." RenderBlock (anonymous) at (0,36) size 784x249 RenderText {#text} at (0,0) size 0x0 layer at (28,72) size 244x204 diff --git a/LayoutTests/platform/wincairo/css1/basic/containment-expected.txt b/LayoutTests/platform/wincairo/css1/basic/containment-expected.txt index 89d39f0b81b5..001dcbda5f10 100644 --- a/LayoutTests/platform/wincairo/css1/basic/containment-expected.txt +++ b/LayoutTests/platform/wincairo/css1/basic/containment-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1009 +layer at (0,0) size 785x1029 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1009 - RenderBlock {HTML} at (0,0) size 785x1009 - RenderBody {BODY} at (8,8) size 769x993 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1029 + RenderBlock {HTML} at (0,0) size 785x1029 + RenderBody {BODY} at (8,8) size 769x1013 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x160 RenderText {#text} at (0,0) size 728x160 text run at (0,0) width 624: "" @@ -29,182 +29,183 @@ layer at (0,0) size 785x1009 text run at (0,144) width 24: "-->" text run at (24,144) width 0: " " RenderBlock {P} at (0,227) size 769x20 - RenderText {#text} at (0,0) size 383x19 - text run at (0,0) width 383: "This sentence should be underlined due to the linked style sheet " + RenderText {#text} at (0,0) size 404x19 + text run at (0,0) width 404: "This sentence should be underlined due to the linked style sheet " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (383,3) size 96x16 - text run at (383,3) width 96: "linktest.css" - RenderText {#text} at (479,0) size 242x19 - text run at (479,0) width 242: ", the reference to which is shown above." + RenderText {#text} at (404,3) size 96x16 + text run at (404,3) width 96: "linktest.css" + RenderText {#text} at (500,0) size 254x19 + text run at (500,0) width 254: ", the reference to which is shown above." RenderBlock {P} at (0,263) size 769x40 - RenderText {#text} at (0,0) size 420x19 - text run at (0,0) width 420: "This sentence should NOT be underlined due to the linked style sheet " + RenderText {#text} at (0,0) size 442x19 + text run at (0,0) width 442: "This sentence should NOT be underlined due to the linked style sheet " RenderInline {CODE} at (0,0) size 104x16 - RenderText {#text} at (420,3) size 104x16 - text run at (420,3) width 104: "linktest2.css" - RenderText {#text} at (524,0) size 8x19 - text run at (524,0) width 8: ", " - RenderInline {STRONG} at (0,0) size 42x19 - RenderText {#text} at (532,0) size 42x19 - text run at (532,0) width 42: "unless" - RenderText {#text} at (574,0) size 713x39 - text run at (574,0) width 139: " the external style sheet" - text run at (0,20) width 309: "\"Alternate SS\" has been selected via the user agent." + RenderText {#text} at (442,3) size 104x16 + text run at (442,3) width 104: "linktest2.css" + RenderText {#text} at (546,0) size 8x19 + text run at (546,0) width 8: ", " + RenderInline {STRONG} at (0,0) size 41x19 + RenderText {#text} at (554,0) size 41x19 + text run at (554,0) width 41: "unless" + RenderText {#text} at (595,0) size 741x39 + text run at (595,0) width 146: " the external style sheet" + text run at (0,20) width 325: "\"Alternate SS\" has been selected via the user agent." RenderBlock {UL} at (0,319) size 769x60 [color=#FF0000] RenderListItem {LI} at (40,0) size 729x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 373x19 - text run at (0,0) width 373: "This sentence should be green due to an imported style sheet [" + RenderText {#text} at (0,0) size 390x19 + text run at (0,0) width 390: "This sentence should be green due to an imported style sheet [" RenderInline {CODE} at (0,0) size 208x16 - RenderText {#text} at (373,3) size 208x16 - text run at (373,3) width 208: "@import url(imptest1.css);" - RenderText {#text} at (581,0) size 9x19 - text run at (581,0) width 9: "]." + RenderText {#text} at (390,3) size 208x16 + text run at (390,3) width 208: "@import url(imptest1.css);" + RenderText {#text} at (598,0) size 9x19 + text run at (598,0) width 9: "]." RenderListItem {LI} at (40,20) size 729x20 [color=#800080] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 378x19 - text run at (0,0) width 378: "This sentence should be purple due to an imported style sheet [" + RenderText {#text} at (0,0) size 395x19 + text run at (0,0) width 395: "This sentence should be purple due to an imported style sheet [" RenderInline {CODE} at (0,0) size 184x16 - RenderText {#text} at (378,3) size 184x16 - text run at (378,3) width 184: "@import \"imptest1a.css\"" - RenderText {#text} at (562,0) size 9x19 - text run at (562,0) width 9: "]." + RenderText {#text} at (395,3) size 184x16 + text run at (395,3) width 184: "@import \"imptest1a.css\"" + RenderText {#text} at (579,0) size 9x19 + text run at (579,0) width 9: "]." RenderListItem {LI} at (40,40) size 729x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 374x19 - text run at (0,0) width 374: "This sentence should be green thanks to the STYLE attribute [" + RenderText {#text} at (0,0) size 393x19 + text run at (0,0) width 393: "This sentence should be green thanks to the STYLE attribute [" RenderInline {CODE} at (0,0) size 168x16 - RenderText {#text} at (374,3) size 168x16 - text run at (374,3) width 168: "STYLE=\"color: green;\"" - RenderText {#text} at (542,0) size 9x19 - text run at (542,0) width 9: "]." + RenderText {#text} at (393,3) size 168x16 + text run at (393,3) width 168: "STYLE=\"color: green;\"" + RenderText {#text} at (561,0) size 9x19 + text run at (561,0) width 9: "]." RenderBlock {P} at (0,395) size 769x20 [color=#800080] - RenderText {#text} at (0,0) size 476x19 - text run at (0,0) width 476: "This sentence should be purple, and it doesn't have a terminating paragraph tag." + RenderText {#text} at (0,0) size 500x19 + text run at (0,0) width 500: "This sentence should be purple, and it doesn't have a terminating paragraph tag." RenderBlock {OL} at (0,431) size 769x60 RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This list should NOT be purple." + RenderText {#text} at (0,0) size 201x19 + text run at (0,0) width 201: "This list should NOT be purple." RenderListItem {LI} at (40,20) size 729x20 RenderListMarker at (-21,0) size 16x19: "2" - RenderText {#text} at (0,0) size 166x19 - text run at (0,0) width 166: "It should, instead, be black." + RenderText {#text} at (0,0) size 172x19 + text run at (0,0) width 172: "It should, instead, be black." RenderListItem {LI} at (40,40) size 729x20 RenderListMarker at (-21,0) size 16x19: "3" - RenderText {#text} at (0,0) size 483x19 - text run at (0,0) width 483: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." + RenderText {#text} at (0,0) size 501x19 + text run at (0,0) width 501: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." RenderBlock {P} at (0,507) size 769x40 - RenderText {#text} at (0,0) size 668x19 - text run at (0,0) width 188: "This sentence should be black. " - text run at (188,0) width 480: "If it is red, then the browser has inappropriately imported the styles from the file " + RenderText {#text} at (0,0) size 697x19 + text run at (0,0) width 197: "This sentence should be black. " + text run at (197,0) width 500: "If it is red, then the browser has inappropriately imported the styles from the file" RenderInline {TT} at (0,0) size 96x16 - RenderText {#text} at (668,3) size 96x16 - text run at (668,3) width 96: "imptest2.css" - RenderText {#text} at (0,20) size 29x19 - text run at (0,20) width 29: "(see " - RenderInline {A} at (0,0) size 66x19 [color=#0000FF] - RenderText {#text} at (29,20) size 66x19 - text run at (29,20) width 66: "section 3.0" - RenderText {#text} at (95,20) size 264x19 - text run at (95,20) width 264: " of the CSS1 specification for more details)." + RenderText {#text} at (0,23) size 96x16 + text run at (0,23) width 96: "imptest2.css" + RenderText {#text} at (96,20) size 33x19 + text run at (96,20) width 33: " (see " + RenderInline {A} at (0,0) size 68x19 [color=#0000FF] + RenderText {#text} at (129,20) size 68x19 + text run at (129,20) width 68: "section 3.0" + RenderText {#text} at (197,20) size 275x19 + text run at (197,20) width 275: " of the CSS1 specification for more details)." RenderBlock {P} at (0,563) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This paragraph should be green." - RenderTable {TABLE} at (0,599) size 769x394 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x392 + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This paragraph should be green." + RenderTable {TABLE} at (0,599) size 769x414 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x412 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x364 - RenderTableCell {TD} at (0,196) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x384 + RenderTableCell {TD} at (0,206) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x364 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 383x19 - text run at (0,0) width 383: "This sentence should be underlined due to the linked style sheet " + RenderTableCell {TD} at (12,28) size 755x384 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x40 + RenderText {#text} at (0,0) size 404x19 + text run at (0,0) width 404: "This sentence should be underlined due to the linked style sheet " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (383,3) size 96x16 - text run at (383,3) width 96: "linktest.css" - RenderText {#text} at (479,0) size 242x19 - text run at (479,0) width 242: ", the reference to which is shown above." - RenderBlock {P} at (4,40) size 747x40 - RenderText {#text} at (0,0) size 420x19 - text run at (0,0) width 420: "This sentence should NOT be underlined due to the linked style sheet " + RenderText {#text} at (404,3) size 96x16 + text run at (404,3) width 96: "linktest.css" + RenderText {#text} at (500,0) size 708x39 + text run at (500,0) width 208: ", the reference to which is shown" + text run at (0,20) width 42: "above." + RenderBlock {P} at (4,60) size 747x40 + RenderText {#text} at (0,0) size 442x19 + text run at (0,0) width 442: "This sentence should NOT be underlined due to the linked style sheet " RenderInline {CODE} at (0,0) size 104x16 - RenderText {#text} at (420,3) size 104x16 - text run at (420,3) width 104: "linktest2.css" - RenderText {#text} at (524,0) size 8x19 - text run at (524,0) width 8: ", " - RenderInline {STRONG} at (0,0) size 42x19 - RenderText {#text} at (532,0) size 42x19 - text run at (532,0) width 42: "unless" - RenderText {#text} at (574,0) size 713x39 - text run at (574,0) width 139: " the external style sheet" - text run at (0,20) width 309: "\"Alternate SS\" has been selected via the user agent." - RenderBlock {UL} at (4,96) size 747x60 [color=#FF0000] + RenderText {#text} at (442,3) size 104x16 + text run at (442,3) width 104: "linktest2.css" + RenderText {#text} at (546,0) size 8x19 + text run at (546,0) width 8: ", " + RenderInline {STRONG} at (0,0) size 41x19 + RenderText {#text} at (554,0) size 41x19 + text run at (554,0) width 41: "unless" + RenderText {#text} at (595,0) size 741x39 + text run at (595,0) width 146: " the external style sheet" + text run at (0,20) width 325: "\"Alternate SS\" has been selected via the user agent." + RenderBlock {UL} at (4,116) size 747x60 [color=#FF0000] RenderListItem {LI} at (40,0) size 707x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 373x19 - text run at (0,0) width 373: "This sentence should be green due to an imported style sheet [" + RenderText {#text} at (0,0) size 390x19 + text run at (0,0) width 390: "This sentence should be green due to an imported style sheet [" RenderInline {CODE} at (0,0) size 208x16 - RenderText {#text} at (373,3) size 208x16 - text run at (373,3) width 208: "@import url(imptest1.css);" - RenderText {#text} at (581,0) size 9x19 - text run at (581,0) width 9: "]." + RenderText {#text} at (390,3) size 208x16 + text run at (390,3) width 208: "@import url(imptest1.css);" + RenderText {#text} at (598,0) size 9x19 + text run at (598,0) width 9: "]." RenderListItem {LI} at (40,20) size 707x20 [color=#800080] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 378x19 - text run at (0,0) width 378: "This sentence should be purple due to an imported style sheet [" + RenderText {#text} at (0,0) size 395x19 + text run at (0,0) width 395: "This sentence should be purple due to an imported style sheet [" RenderInline {CODE} at (0,0) size 184x16 - RenderText {#text} at (378,3) size 184x16 - text run at (378,3) width 184: "@import \"imptest1a.css\"" - RenderText {#text} at (562,0) size 9x19 - text run at (562,0) width 9: "]." + RenderText {#text} at (395,3) size 184x16 + text run at (395,3) width 184: "@import \"imptest1a.css\"" + RenderText {#text} at (579,0) size 9x19 + text run at (579,0) width 9: "]." RenderListItem {LI} at (40,40) size 707x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 374x19 - text run at (0,0) width 374: "This sentence should be green thanks to the STYLE attribute [" + RenderText {#text} at (0,0) size 393x19 + text run at (0,0) width 393: "This sentence should be green thanks to the STYLE attribute [" RenderInline {CODE} at (0,0) size 168x16 - RenderText {#text} at (374,3) size 168x16 - text run at (374,3) width 168: "STYLE=\"color: green;\"" - RenderText {#text} at (542,0) size 9x19 - text run at (542,0) width 9: "]." - RenderBlock {P} at (4,172) size 747x20 [color=#800080] - RenderText {#text} at (0,0) size 476x19 - text run at (0,0) width 476: "This sentence should be purple, and it doesn't have a terminating paragraph tag." - RenderBlock {OL} at (4,208) size 747x60 + RenderText {#text} at (393,3) size 168x16 + text run at (393,3) width 168: "STYLE=\"color: green;\"" + RenderText {#text} at (561,0) size 9x19 + text run at (561,0) width 9: "]." + RenderBlock {P} at (4,192) size 747x20 [color=#800080] + RenderText {#text} at (0,0) size 500x19 + text run at (0,0) width 500: "This sentence should be purple, and it doesn't have a terminating paragraph tag." + RenderBlock {OL} at (4,228) size 747x60 RenderListItem {LI} at (40,0) size 707x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This list should NOT be purple." + RenderText {#text} at (0,0) size 201x19 + text run at (0,0) width 201: "This list should NOT be purple." RenderListItem {LI} at (40,20) size 707x20 RenderListMarker at (-21,0) size 16x19: "2" - RenderText {#text} at (0,0) size 166x19 - text run at (0,0) width 166: "It should, instead, be black." + RenderText {#text} at (0,0) size 172x19 + text run at (0,0) width 172: "It should, instead, be black." RenderListItem {LI} at (40,40) size 707x20 RenderListMarker at (-21,0) size 16x19: "3" - RenderText {#text} at (0,0) size 483x19 - text run at (0,0) width 483: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." - RenderBlock {P} at (4,284) size 747x40 - RenderText {#text} at (0,0) size 664x19 - text run at (0,0) width 188: "This sentence should be black. " - text run at (188,0) width 476: "If it is red, then the browser has inappropriately imported the styles from the file" + RenderText {#text} at (0,0) size 501x19 + text run at (0,0) width 501: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." + RenderBlock {P} at (4,304) size 747x40 + RenderText {#text} at (0,0) size 697x19 + text run at (0,0) width 197: "This sentence should be black. " + text run at (197,0) width 500: "If it is red, then the browser has inappropriately imported the styles from the file" RenderInline {TT} at (0,0) size 96x16 RenderText {#text} at (0,23) size 96x16 text run at (0,23) width 96: "imptest2.css" RenderText {#text} at (96,20) size 33x19 text run at (96,20) width 33: " (see " - RenderInline {A} at (0,0) size 66x19 [color=#0000FF] - RenderText {#text} at (129,20) size 66x19 - text run at (129,20) width 66: "section 3.0" - RenderText {#text} at (195,20) size 264x19 - text run at (195,20) width 264: " of the CSS1 specification for more details)." - RenderBlock {P} at (4,340) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This paragraph should be green." + RenderInline {A} at (0,0) size 68x19 [color=#0000FF] + RenderText {#text} at (129,20) size 68x19 + text run at (129,20) width 68: "section 3.0" + RenderText {#text} at (197,20) size 275x19 + text run at (197,20) width 275: " of the CSS1 specification for more details)." + RenderBlock {P} at (4,360) size 747x20 [color=#008000] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This paragraph should be green." layer at (8,217) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,209) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/basic/contextual_selectors-expected.txt b/LayoutTests/platform/wincairo/css1/basic/contextual_selectors-expected.txt index 1a1520a29182..b2cb1184fa3d 100644 --- a/LayoutTests/platform/wincairo/css1/basic/contextual_selectors-expected.txt +++ b/LayoutTests/platform/wincairo/css1/basic/contextual_selectors-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x64 RenderText {#text} at (0,0) size 472x64 text run at (0,0) width 288: "P {color: navy; font-family: serif;}" @@ -16,68 +16,68 @@ layer at (0,0) size 800x600 text run at (224,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 591x19 - text run at (0,0) width 591: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." + RenderText {#text} at (0,0) size 625x19 + text run at (0,0) width 625: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." RenderBlock {P} at (0,167) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 532x19 - text run at (0,0) width 532: "This sentence should be normal for its section, except for the last word, which should be " + RenderText {#text} at (0,0) size 559x19 + text run at (0,0) width 559: "This sentence should be normal for its section, except for the last word, which should be " RenderInline {EM} at (0,0) size 36x19 [color=#008000] - RenderText {#text} at (532,0) size 36x19 - text run at (532,0) width 36: "green" - RenderText {#text} at (568,0) size 4x19 - text run at (568,0) width 4: "." + RenderText {#text} at (559,0) size 36x19 + text run at (559,0) width 36: "green" + RenderText {#text} at (595,0) size 4x19 + text run at (595,0) width 4: "." RenderBlock {UL} at (0,203) size 784x40 RenderListItem {LI} at (40,0) size 744x40 RenderBlock (anonymous) at (0,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderInline {EM} at (0,0) size 38x19 [color=#008000] - RenderText {#text} at (0,0) size 38x19 - text run at (0,0) width 38: "Hello." - RenderText {#text} at (38,0) size 376x19 - text run at (38,0) width 4: " " - text run at (42,0) width 372: "The first \"hello\" should be green, but this part should be black." + RenderInline {EM} at (0,0) size 39x19 [color=#008000] + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Hello." + RenderText {#text} at (39,0) size 399x19 + text run at (39,0) width 4: " " + text run at (43,0) width 395: "The first \"hello\" should be green, but this part should be black." RenderBlock {UL} at (0,20) size 744x20 RenderListItem {LI} at (40,0) size 704x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." - RenderTable {TABLE} at (0,259) size 699x165 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 697x163 - RenderTableRow {TR} at (0,0) size 697x28 - RenderTableCell {TD} at (0,0) size 697x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 697x135 + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." + RenderTable {TABLE} at (0,259) size 722x165 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 720x163 + RenderTableRow {TR} at (0,0) size 720x28 + RenderTableCell {TD} at (0,0) size 720x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 720x135 RenderTableCell {TD} at (0,81) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 685x135 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 677x19 [color=#800080] - RenderText {#text} at (0,0) size 677x18 - text run at (0,0) width 677: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." - RenderBlock {P} at (4,39) size 677x20 [color=#800080] - RenderText {#text} at (0,1) size 603x18 - text run at (0,1) width 603: "This sentence should be normal for its section, except for the last word, which should be " + RenderTableCell {TD} at (12,28) size 708x135 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 700x19 [color=#800080] + RenderText {#text} at (0,0) size 700x18 + text run at (0,0) width 700: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." + RenderBlock {P} at (4,39) size 700x20 [color=#800080] + RenderText {#text} at (0,1) size 623x18 + text run at (0,1) width 623: "This sentence should be normal for its section, except for the last word, which should be " RenderInline {EM} at (0,0) size 41x19 [color=#008000] - RenderText {#text} at (603,0) size 41x19 - text run at (603,0) width 41: "green" - RenderText {#text} at (644,1) size 4x18 - text run at (644,1) width 4: "." - RenderBlock {UL} at (4,75) size 677x40 - RenderListItem {LI} at (40,0) size 637x40 - RenderBlock (anonymous) at (0,0) size 637x20 + RenderText {#text} at (623,0) size 41x19 + text run at (623,0) width 41: "green" + RenderText {#text} at (664,1) size 4x18 + text run at (664,1) width 4: "." + RenderBlock {UL} at (4,75) size 700x40 + RenderListItem {LI} at (40,0) size 660x40 + RenderBlock (anonymous) at (0,0) size 660x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderInline {EM} at (0,0) size 38x19 [color=#008000] - RenderText {#text} at (0,0) size 38x19 - text run at (0,0) width 38: "Hello." - RenderText {#text} at (38,0) size 376x19 - text run at (38,0) width 4: " " - text run at (42,0) width 372: "The first \"hello\" should be green, but this part should be black." - RenderBlock {UL} at (0,20) size 637x20 - RenderListItem {LI} at (40,0) size 597x20 [color=#008000] + RenderInline {EM} at (0,0) size 39x19 [color=#008000] + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Hello." + RenderText {#text} at (39,0) size 399x19 + text run at (39,0) width 4: " " + text run at (43,0) width 395: "The first \"hello\" should be green, but this part should be black." + RenderBlock {UL} at (0,20) size 660x20 + RenderListItem {LI} at (40,0) size 620x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." layer at (8,121) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/basic/grouping-expected.txt b/LayoutTests/platform/wincairo/css1/basic/grouping-expected.txt index a896026fef29..c984aac72586 100644 --- a/LayoutTests/platform/wincairo/css1/basic/grouping-expected.txt +++ b/LayoutTests/platform/wincairo/css1/basic/grouping-expected.txt @@ -4,42 +4,42 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x32 RenderText {#text} at (0,0) size 272x32 text run at (0,0) width 272: ".one, .two, .three {color: green;}" text run at (272,0) width 0: " " text run at (0,16) width 0: " " RenderBlock {P} at (0,99) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,135) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,171) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - RenderTable {TABLE} at (0,207) size 206x130 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 204x128 - RenderTableRow {TR} at (0,0) size 204x28 - RenderTableCell {TD} at (0,0) size 204x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 204x100 + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." + RenderTable {TABLE} at (0,207) size 216x130 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 214x128 + RenderTableRow {TR} at (0,0) size 214x28 + RenderTableCell {TD} at (0,0) size 214x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 214x100 RenderTableCell {TD} at (0,64) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 192x100 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 184x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - RenderBlock {P} at (4,40) size 184x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - RenderBlock {P} at (4,76) size 184x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderTableCell {TD} at (12,28) size 202x100 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 194x20 [color=#008000] + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." + RenderBlock {P} at (4,40) size 194x20 [color=#008000] + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." + RenderBlock {P} at (4,76) size 194x20 [color=#008000] + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." layer at (8,89) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,81) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/basic/id_as_selector-expected.txt b/LayoutTests/platform/wincairo/css1/basic/id_as_selector-expected.txt index d3117634aee0..45e05daaace2 100644 --- a/LayoutTests/platform/wincairo/css1/basic/id_as_selector-expected.txt +++ b/LayoutTests/platform/wincairo/css1/basic/id_as_selector-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x659 RenderBlock {HTML} at (0,0) size 785x659 RenderBody {BODY} at (8,8) size 769x643 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x128 RenderText {#text} at (0,0) size 272x128 text run at (0,0) width 160: "#one {color: green;}" @@ -24,19 +24,19 @@ layer at (0,0) size 785x659 text run at (240,96) width 0: " " text run at (0,112) width 240: "P#six, P#six2 {color: purple;}" RenderBlock {P} at (0,195) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,231) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,267) size 769x20 [color=#0000FF] - RenderText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This paragraph should be blue [" + RenderText {#text} at (0,0) size 200x19 + text run at (0,0) width 200: "This paragraph should be blue [" RenderInline {TT} at (0,0) size 64x16 - RenderText {#text} at (190,3) size 64x16 - text run at (190,3) width 64: "ID=\"two\"" - RenderText {#text} at (254,0) size 9x19 - text run at (254,0) width 9: "]." + RenderText {#text} at (200,3) size 64x16 + text run at (200,3) width 64: "ID=\"two\"" + RenderText {#text} at (264,0) size 9x19 + text run at (264,0) width 9: "]." RenderBlock {PRE} at (0,303) size 769x16 RenderText {#text} at (0,0) size 392x16 text run at (0,0) width 392: "This sentence should NOT be blue [PRE ID=\"two2\"]." @@ -48,34 +48,34 @@ layer at (0,0) size 785x659 RenderBlock {UL} at (0,364) size 769x20 RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 226x19 - text run at (0,0) width 226: "This sentence should NOT be purple." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "This sentence should NOT be purple." RenderTable {TABLE} at (0,400) size 422x243 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 420x241 RenderTableRow {TR} at (0,0) size 420x28 RenderTableCell {TD} at (0,0) size 420x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 420x213 RenderTableCell {TD} at (0,120) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 408x213 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 400x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (4,40) size 400x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (4,76) size 400x20 [color=#0000FF] - RenderText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This paragraph should be blue [" + RenderText {#text} at (0,0) size 200x19 + text run at (0,0) width 200: "This paragraph should be blue [" RenderInline {TT} at (0,0) size 72x16 - RenderText {#text} at (190,3) size 72x16 - text run at (190,3) width 72: "ID=\"five\"" - RenderText {#text} at (262,0) size 9x19 - text run at (262,0) width 9: "]." + RenderText {#text} at (200,3) size 72x16 + text run at (200,3) width 72: "ID=\"five\"" + RenderText {#text} at (272,0) size 9x19 + text run at (272,0) width 9: "]." RenderBlock {PRE} at (4,112) size 400x16 RenderText {#text} at (0,0) size 400x16 text run at (0,0) width 400: "This sentence should NOT be blue [PRE ID=\"five2\"]." @@ -87,7 +87,7 @@ layer at (0,0) size 785x659 RenderBlock {UL} at (4,173) size 400x20 RenderListItem {LI} at (40,0) size 360x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 226x19 - text run at (0,0) width 226: "This sentence should NOT be purple." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "This sentence should NOT be purple." layer at (8,185) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,177) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/basic/inheritance-expected.txt b/LayoutTests/platform/wincairo/css1/basic/inheritance-expected.txt index 4823a30201f2..c34691dabd58 100644 --- a/LayoutTests/platform/wincairo/css1/basic/inheritance-expected.txt +++ b/LayoutTests/platform/wincairo/css1/basic/inheritance-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x767 RenderBlock {HTML} at (0,0) size 785x768 RenderBody {BODY} at (8,8) size 769x752 [color=#008000] [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x112 RenderText {#text} at (0,0) size 272x112 text run at (0,0) width 160: "BODY {color: green;}" @@ -23,168 +23,168 @@ layer at (0,0) size 785x767 text run at (0,96) width 184: ".three {color: purple;}" text run at (184,96) width 0: " " RenderBlock {H3} at (0,181) size 769x25 [color=#0000FF] - RenderText {#text} at (0,0) size 221x22 - text run at (0,0) width 221: "This sentence should show " - RenderInline {STRONG} at (0,0) size 34x22 - RenderText {#text} at (221,0) size 34x22 - text run at (221,0) width 34: "blue" - RenderText {#text} at (255,0) size 40x22 - text run at (255,0) width 40: " and " - RenderInline {EM} at (0,0) size 52x22 [color=#800080] - RenderText {#text} at (295,1) size 52x22 - text run at (295,1) width 52: "purple" - RenderText {#text} at (347,0) size 5x22 - text run at (347,0) width 5: "." + RenderText {#text} at (0,0) size 220x22 + text run at (0,0) width 220: "This sentence should show " + RenderInline {STRONG} at (0,0) size 35x22 + RenderText {#text} at (220,0) size 35x22 + text run at (220,0) width 35: "blue" + RenderText {#text} at (255,0) size 42x22 + text run at (255,0) width 42: " and " + RenderInline {EM} at (0,0) size 51x22 [color=#800080] + RenderText {#text} at (297,1) size 51x22 + text run at (297,1) width 51: "purple" + RenderText {#text} at (348,0) size 5x22 + text run at (348,0) width 5: "." RenderBlock {H3} at (0,224) size 769x25 [color=#0000FF] - RenderText {#text} at (0,0) size 198x22 - text run at (0,0) width 198: "This sentence should be " - RenderInline {SPAN} at (0,0) size 35x22 - RenderText {#text} at (198,1) size 35x22 - text run at (198,1) width 35: "blue" - RenderText {#text} at (233,0) size 100x22 - text run at (233,0) width 100: " throughout." + RenderText {#text} at (0,0) size 197x22 + text run at (0,0) width 197: "This sentence should be " + RenderInline {SPAN} at (0,0) size 34x22 + RenderText {#text} at (197,1) size 34x22 + text run at (197,1) width 34: "blue" + RenderText {#text} at (231,0) size 104x22 + text run at (231,0) width 104: " throughout." RenderBlock {P} at (0,267) size 769x21 - RenderText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "This should be green except for the " + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "This should be green except for the " RenderInline {EM} at (0,0) size 117x19 [color=#800080] - RenderText {#text} at (215,0) size 117x19 - text run at (215,0) width 117: "emphasized words" - RenderText {#text} at (332,0) size 151x19 - text run at (332,0) width 151: ", which should be purple." + RenderText {#text} at (226,0) size 117x19 + text run at (226,0) width 117: "emphasized words" + RenderText {#text} at (343,0) size 160x19 + text run at (343,0) width 160: ", which should be purple." RenderBlock {H3} at (0,305) size 769x24 [color=#0000FF] - RenderText {#text} at (0,0) size 288x22 - text run at (0,0) width 288: "This should be blue and underlined." + RenderText {#text} at (0,0) size 296x22 + text run at (0,0) width 296: "This should be blue and underlined." RenderBlock {P} at (0,347) size 769x21 - RenderText {#text} at (0,0) size 273x19 - text run at (0,0) width 273: "This sentence should be underlined, including " + RenderText {#text} at (0,0) size 293x19 + text run at (0,0) width 293: "This sentence should be underlined, including " RenderInline {TT} at (0,0) size 72x16 - RenderText {#text} at (273,3) size 72x16 - text run at (273,3) width 72: "this part" - RenderText {#text} at (345,0) size 8x19 - text run at (345,0) width 8: ", " - RenderInline {I} at (0,0) size 54x19 - RenderText {#text} at (353,0) size 54x19 - text run at (353,0) width 54: "this part" - RenderText {#text} at (407,0) size 8x19 - text run at (407,0) width 8: ", " - RenderInline {EM} at (0,0) size 54x19 [color=#800080] - RenderText {#text} at (415,0) size 54x19 - text run at (415,0) width 54: "this part" - RenderText {#text} at (469,0) size 34x19 - text run at (469,0) width 34: ", and " - RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (503,0) size 55x19 - text run at (503,0) width 55: "this part" - RenderText {#text} at (558,0) size 4x19 - text run at (558,0) width 4: "." + RenderText {#text} at (293,3) size 72x16 + text run at (293,3) width 72: "this part" + RenderText {#text} at (365,0) size 8x19 + text run at (365,0) width 8: ", " + RenderInline {I} at (0,0) size 52x19 + RenderText {#text} at (373,0) size 52x19 + text run at (373,0) width 52: "this part" + RenderText {#text} at (425,0) size 8x19 + text run at (425,0) width 8: ", " + RenderInline {EM} at (0,0) size 52x19 [color=#800080] + RenderText {#text} at (433,0) size 52x19 + text run at (433,0) width 52: "this part" + RenderText {#text} at (485,0) size 35x19 + text run at (485,0) width 35: ", and " + RenderInline {STRONG} at (0,0) size 57x19 + RenderText {#text} at (520,0) size 57x19 + text run at (520,0) width 57: "this part" + RenderText {#text} at (577,0) size 4x19 + text run at (577,0) width 4: "." RenderBlock {P} at (0,383) size 769x21 [color=#000080] - RenderText {#text} at (0,0) size 414x19 - text run at (0,0) width 414: "This sentence should also be underlined, as well as dark blue (navy), " + RenderText {#text} at (0,0) size 436x19 + text run at (0,0) width 436: "This sentence should also be underlined, as well as dark blue (navy), " RenderInline {TT} at (0,0) size 152x16 - RenderText {#text} at (414,3) size 152x16 - text run at (414,3) width 152: "including this part" - RenderText {#text} at (566,0) size 4x19 - text run at (566,0) width 4: "." + RenderText {#text} at (436,3) size 152x16 + text run at (436,3) width 152: "including this part" + RenderText {#text} at (588,0) size 4x19 + text run at (588,0) width 4: "." RenderBlock {P} at (0,419) size 769x21 [color=#800080] - RenderText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "This sentence should be purple, including " - RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (249,0) size 55x19 - text run at (249,0) width 55: "this part" - RenderText {#text} at (304,0) size 30x19 - text run at (304,0) width 30: " and " - RenderInline {SPAN} at (0,0) size 164x19 - RenderText {#text} at (334,0) size 164x19 - text run at (334,0) width 164: "this part (which is spanned)" - RenderText {#text} at (498,0) size 4x19 - text run at (498,0) width 4: "." - RenderTable {TABLE} at (0,455) size 592x297 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 590x294 - RenderTableRow {TR} at (0,0) size 590x28 - RenderTableCell {TD} at (0,0) size 590x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 590x266 + RenderText {#text} at (0,0) size 266x19 + text run at (0,0) width 266: "This sentence should be purple, including " + RenderInline {STRONG} at (0,0) size 57x19 + RenderText {#text} at (266,0) size 57x19 + text run at (266,0) width 57: "this part" + RenderText {#text} at (323,0) size 31x19 + text run at (323,0) width 31: " and " + RenderInline {SPAN} at (0,0) size 173x19 + RenderText {#text} at (354,0) size 173x19 + text run at (354,0) width 173: "this part (which is spanned)" + RenderText {#text} at (527,0) size 4x19 + text run at (527,0) width 4: "." + RenderTable {TABLE} at (0,455) size 614x297 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 612x294 + RenderTableRow {TR} at (0,0) size 612x28 + RenderTableCell {TD} at (0,0) size 612x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 612x266 RenderTableCell {TD} at (0,146) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 578x266 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {H3} at (4,4) size 570x24 [color=#0000FF] - RenderText {#text} at (0,0) size 221x22 - text run at (0,0) width 221: "This sentence should show " - RenderInline {STRONG} at (0,0) size 34x22 - RenderText {#text} at (221,0) size 34x22 - text run at (221,0) width 34: "blue" - RenderText {#text} at (255,0) size 40x22 - text run at (255,0) width 40: " and " - RenderInline {EM} at (0,0) size 52x22 [color=#800080] - RenderText {#text} at (295,1) size 52x22 - text run at (295,1) width 52: "purple" - RenderText {#text} at (347,0) size 5x22 - text run at (347,0) width 5: "." - RenderBlock {H3} at (4,46) size 570x25 [color=#0000FF] - RenderText {#text} at (0,0) size 198x22 - text run at (0,0) width 198: "This sentence should be " - RenderInline {SPAN} at (0,0) size 35x22 - RenderText {#text} at (198,1) size 35x22 - text run at (198,1) width 35: "blue" - RenderText {#text} at (233,0) size 100x22 - text run at (233,0) width 100: " throughout." - RenderBlock {P} at (4,89) size 570x21 - RenderText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "This should be green except for the " + RenderTableCell {TD} at (12,28) size 600x266 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {H3} at (4,4) size 592x24 [color=#0000FF] + RenderText {#text} at (0,0) size 220x22 + text run at (0,0) width 220: "This sentence should show " + RenderInline {STRONG} at (0,0) size 35x22 + RenderText {#text} at (220,0) size 35x22 + text run at (220,0) width 35: "blue" + RenderText {#text} at (255,0) size 42x22 + text run at (255,0) width 42: " and " + RenderInline {EM} at (0,0) size 51x22 [color=#800080] + RenderText {#text} at (297,1) size 51x22 + text run at (297,1) width 51: "purple" + RenderText {#text} at (348,0) size 5x22 + text run at (348,0) width 5: "." + RenderBlock {H3} at (4,46) size 592x25 [color=#0000FF] + RenderText {#text} at (0,0) size 197x22 + text run at (0,0) width 197: "This sentence should be " + RenderInline {SPAN} at (0,0) size 34x22 + RenderText {#text} at (197,1) size 34x22 + text run at (197,1) width 34: "blue" + RenderText {#text} at (231,0) size 104x22 + text run at (231,0) width 104: " throughout." + RenderBlock {P} at (4,89) size 592x21 + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "This should be green except for the " RenderInline {EM} at (0,0) size 117x19 [color=#800080] - RenderText {#text} at (215,0) size 117x19 - text run at (215,0) width 117: "emphasized words" - RenderText {#text} at (332,0) size 151x19 - text run at (332,0) width 151: ", which should be purple." - RenderBlock {H3} at (4,128) size 570x24 [color=#0000FF] - RenderText {#text} at (0,0) size 288x22 - text run at (0,0) width 288: "This should be blue and underlined." - RenderBlock {P} at (4,169) size 570x21 - RenderText {#text} at (0,0) size 273x19 - text run at (0,0) width 273: "This sentence should be underlined, including " + RenderText {#text} at (226,0) size 117x19 + text run at (226,0) width 117: "emphasized words" + RenderText {#text} at (343,0) size 160x19 + text run at (343,0) width 160: ", which should be purple." + RenderBlock {H3} at (4,128) size 592x24 [color=#0000FF] + RenderText {#text} at (0,0) size 296x22 + text run at (0,0) width 296: "This should be blue and underlined." + RenderBlock {P} at (4,169) size 592x21 + RenderText {#text} at (0,0) size 293x19 + text run at (0,0) width 293: "This sentence should be underlined, including " RenderInline {TT} at (0,0) size 72x16 - RenderText {#text} at (273,3) size 72x16 - text run at (273,3) width 72: "this part" - RenderText {#text} at (345,0) size 8x19 - text run at (345,0) width 8: ", " - RenderInline {I} at (0,0) size 54x19 - RenderText {#text} at (353,0) size 54x19 - text run at (353,0) width 54: "this part" - RenderText {#text} at (407,0) size 8x19 - text run at (407,0) width 8: ", " - RenderInline {EM} at (0,0) size 54x19 [color=#800080] - RenderText {#text} at (415,0) size 54x19 - text run at (415,0) width 54: "this part" - RenderText {#text} at (469,0) size 34x19 - text run at (469,0) width 34: ", and " - RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (503,0) size 55x19 - text run at (503,0) width 55: "this part" - RenderText {#text} at (558,0) size 4x19 - text run at (558,0) width 4: "." - RenderBlock {P} at (4,205) size 570x21 [color=#000080] - RenderText {#text} at (0,0) size 414x19 - text run at (0,0) width 414: "This sentence should also be underlined, as well as dark blue (navy), " + RenderText {#text} at (293,3) size 72x16 + text run at (293,3) width 72: "this part" + RenderText {#text} at (365,0) size 8x19 + text run at (365,0) width 8: ", " + RenderInline {I} at (0,0) size 52x19 + RenderText {#text} at (373,0) size 52x19 + text run at (373,0) width 52: "this part" + RenderText {#text} at (425,0) size 8x19 + text run at (425,0) width 8: ", " + RenderInline {EM} at (0,0) size 52x19 [color=#800080] + RenderText {#text} at (433,0) size 52x19 + text run at (433,0) width 52: "this part" + RenderText {#text} at (485,0) size 35x19 + text run at (485,0) width 35: ", and " + RenderInline {STRONG} at (0,0) size 57x19 + RenderText {#text} at (520,0) size 57x19 + text run at (520,0) width 57: "this part" + RenderText {#text} at (577,0) size 4x19 + text run at (577,0) width 4: "." + RenderBlock {P} at (4,205) size 592x21 [color=#000080] + RenderText {#text} at (0,0) size 436x19 + text run at (0,0) width 436: "This sentence should also be underlined, as well as dark blue (navy), " RenderInline {TT} at (0,0) size 152x16 - RenderText {#text} at (414,3) size 152x16 - text run at (414,3) width 152: "including this part" - RenderText {#text} at (566,0) size 4x19 - text run at (566,0) width 4: "." - RenderBlock {P} at (4,241) size 570x21 [color=#800080] - RenderText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "This sentence should be purple, including " - RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (249,0) size 55x19 - text run at (249,0) width 55: "this part" - RenderText {#text} at (304,0) size 30x19 - text run at (304,0) width 30: " and " - RenderInline {SPAN} at (0,0) size 164x19 - RenderText {#text} at (334,0) size 164x19 - text run at (334,0) width 164: "this part (which is spanned)" - RenderText {#text} at (498,0) size 4x19 - text run at (498,0) width 4: "." + RenderText {#text} at (436,3) size 152x16 + text run at (436,3) width 152: "including this part" + RenderText {#text} at (588,0) size 4x19 + text run at (588,0) width 4: "." + RenderBlock {P} at (4,241) size 592x21 [color=#800080] + RenderText {#text} at (0,0) size 266x19 + text run at (0,0) width 266: "This sentence should be purple, including " + RenderInline {STRONG} at (0,0) size 57x19 + RenderText {#text} at (266,0) size 57x19 + text run at (266,0) width 57: "this part" + RenderText {#text} at (323,0) size 31x19 + text run at (323,0) width 31: " and " + RenderInline {SPAN} at (0,0) size 173x19 + RenderText {#text} at (354,0) size 173x19 + text run at (354,0) width 173: "this part (which is spanned)" + RenderText {#text} at (527,0) size 4x19 + text run at (527,0) width 4: "." layer at (8,169) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,161) size 769x2 [border: (1px inset #008000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/acid_test-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/acid_test-expected.txt index a6fcb9858f92..79e6fabdcbcc 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/acid_test-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/acid_test-expected.txt @@ -1,70 +1,68 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x433 - RenderBlock {HTML} at (0,0) size 800x433 [color=#FFFFFF] [bgcolor=#0000FF] - RenderBody {BODY} at (15,15) size 490x403 [bgcolor=#FFFFFF] [border: (5px solid #000000)] +layer at (0,0) size 800x420 + RenderBlock {HTML} at (0,0) size 800x420 [color=#FFFFFF] [bgcolor=#0000FF] + RenderBody {BODY} at (15,15) size 490x390 [bgcolor=#FFFFFF] [border: (5px solid #000000)] RenderBlock {DL} at (5,5) size 480x10 RenderBlock (floating) {DT} at (5,5) size 80x310 [bgcolor=#CC0000] [border: (5px solid #000000)] - RenderText {#text} at (15,14) size 35x12 - text run at (15,14) width 35: "toggle" + RenderText {#text} at (15,14) size 31x12 + text run at (15,14) width 31: "toggle" RenderBlock (floating) {DD} at (95,5) size 380x310 [border: (10px solid #000000)] RenderBlock {UL} at (20,20) size 340x0 RenderBlock (floating) {LI} at (0,0) size 80x120 [color=#000000] [bgcolor=#FFCC00] [border: (5px solid #000000)] - RenderText {#text} at (15,14) size 42x12 - text run at (15,14) width 42: "the way" + RenderText {#text} at (15,14) size 40x12 + text run at (15,14) width 40: "the way" RenderBlock (floating) {LI} at (90,0) size 160x110 [bgcolor=#000000] RenderBlock {P} at (10,10) size 140x10 - RenderText {#text} at (0,-1) size 81x12 - text run at (0,-1) width 81: "the world ends" + RenderText {#text} at (0,-1) size 74x12 + text run at (0,-1) width 74: "the world ends" RenderBlock (anonymous) at (10,20) size 140x0 RenderInline {FORM} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (10,20) size 140x42 RenderBlock {P} at (0,0) size 140x21 - RenderText {#text} at (0,5) size 32x12 - text run at (0,5) width 32: "bang " - RenderBlock {INPUT} at (34,3) size 12x12 [color=#000000] + RenderText {#text} at (0,5) size 28x12 + text run at (0,5) width 28: "bang " + RenderBlock {INPUT} at (30,3) size 12x12 [color=#000000] RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,21) size 140x21 - RenderText {#text} at (0,5) size 50x12 - text run at (0,5) width 50: "whimper " - RenderBlock {INPUT} at (52,3) size 12x12 [color=#000000] + RenderText {#text} at (0,5) size 47x12 + text run at (0,5) width 47: "whimper " + RenderBlock {INPUT} at (49,3) size 12x12 [color=#000000] RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (10,62) size 140x0 RenderInline {FORM} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderBlock (floating) {LI} at (259,0) size 81x120 [color=#000000] [bgcolor=#FFCC00] [border: (5px solid #000000)] - RenderText {#text} at (15,14) size 32x22 - text run at (15,14) width 32: "i grow" - text run at (15,24) width 17: "old" + RenderText {#text} at (15,14) size 50x12 + text run at (15,14) width 50: "i grow old" RenderBlock (floating) {LI} at (0,130) size 120x120 [bgcolor=#000000] - RenderText {#text} at (10,9) size 34x12 - text run at (10,9) width 34: "pluot?" + RenderText {#text} at (10,9) size 30x12 + text run at (10,9) width 30: "pluot?" RenderBlock (floating) {BLOCKQUOTE} at (160,150) size 70x140 [color=#000000] [bgcolor=#FFCC00] [border: (10px solid #000000) (15px solid #000000) (20px solid #000000) (5px solid #000000)] RenderBlock {ADDRESS} at (5,20) size 50x20 - RenderText {#text} at (0,-1) size 38x22 - text run at (0,-1) width 18: "bar" - text run at (0,9) width 38: "maids," + RenderText {#text} at (0,-1) size 34x22 + text run at (0,-1) width 16: "bar" + text run at (0,9) width 34: "maids," RenderBlock (floating) {H1} at (240,150) size 120x120 [bgcolor=#000000] - RenderText {#text} at (10,9) size 73x22 - text run at (10,9) width 64: "sing to me," - text run at (10,19) width 73: "erbarme dich" - RenderBlock {P} at (5,320) size 480x78 [color=#000000] - RenderText {#text} at (0,0) size 479x38 - text run at (0,0) width 419: "This is a nonsensical document, but syntactically valid HTML 4.0. All 100%-" - text run at (0,13) width 479: "conformant CSS1 agents should be able to render the document elements above this" - text run at (0,26) width 290: "paragraph indistinguishably (to the pixel) from this " - RenderInline {A} at (0,0) size 113x12 [color=#0000EE] - RenderText {#text} at (290,26) size 113x12 - text run at (290,26) width 113: "reference rendering," - RenderText {#text} at (403,26) size 475x51 - text run at (403,26) width 4: " " - text run at (407,26) width 68: "(except font" - text run at (0,39) width 435: "rasterization and form widgets). All discrepancies should be traceable to CSS1" - text run at (0,52) width 467: "implementation shortcomings. Once you have finished evaluating this test, you can" - text run at (0,65) width 74: "return to the " - RenderInline {A} at (0,0) size 68x12 [color=#0000EE] - RenderText {#text} at (74,65) size 68x12 - text run at (74,65) width 68: "parent page" - RenderText {#text} at (142,65) size 4x12 - text run at (142,65) width 4: "." + RenderText {#text} at (10,9) size 66x22 + text run at (10,9) width 58: "sing to me," + text run at (10,19) width 66: "erbarme dich" + RenderBlock {P} at (5,320) size 480x65 [color=#000000] + RenderText {#text} at (0,0) size 480x38 + text run at (0,0) width 473: "This is a nonsensical document, but syntactically valid HTML 4.0. All 100%-conformant CSS1" + text run at (0,13) width 480: "agents should be able to render the document elements above this paragraph indistinguishably" + text run at (0,26) width 122: "(to the pixel) from this " + RenderInline {A} at (0,0) size 102x12 [color=#0000EE] + RenderText {#text} at (122,26) size 102x12 + text run at (122,26) width 102: "reference rendering," + RenderText {#text} at (224,26) size 474x38 + text run at (224,26) width 4: " " + text run at (228,26) width 246: "(except font rasterization and form widgets). All" + text run at (0,39) width 449: "discrepancies should be traceable to CSS1 implementation shortcomings. Once you have" + text run at (0,52) width 259: "finished evaluating this test, you can return to the " + RenderInline {A} at (0,0) size 60x12 [color=#0000EE] + RenderText {#text} at (259,52) size 60x12 + text run at (259,52) width 60: "parent page" + RenderText {#text} at (319,52) size 4x12 + text run at (319,52) width 4: "." diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border-expected.txt index 9fe4b2cf04dd..c362c4dacb0d 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1395 +layer at (0,0) size 785x1475 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1395 - RenderBlock {HTML} at (0,0) size 785x1395 - RenderBody {BODY} at (8,8) size 769x1379 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1475 + RenderBlock {HTML} at (0,0) size 785x1475 + RenderBody {BODY} at (8,8) size 769x1459 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x144 RenderText {#text} at (0,0) size 272x144 text run at (0,0) width 272: ".one {border: medium black solid;}" @@ -27,158 +27,161 @@ layer at (0,0) size 785x1395 text run at (0,128) width 232: "TD {border: 2px solid green;}" text run at (232,128) width 0: " " RenderBlock {P} at (0,211) size 769x40 - RenderText {#text} at (0,0) size 758x39 - text run at (0,0) width 597: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " - text run at (597,0) width 161: "This border applies only to" - text run at (0,20) width 254: "the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 748x39 + text run at (0,0) width 627: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " + text run at (627,0) width 121: "This border applies" + text run at (0,20) width 317: "only to the cells, not the rows which contain them." RenderBlock {P} at (0,267) size 769x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 459x19 - text run at (3,3) width 459: "This paragraph should have a medium black solid border all the way around." + RenderText {#text} at (3,3) size 483x19 + text run at (3,3) width 483: "This paragraph should have a medium black solid border all the way around." RenderBlock {P} at (0,309) size 769x22 [border: (1px ridge #800000)] - RenderText {#text} at (1,1) size 456x19 - text run at (1,1) width 456: "This paragraph should have a thin maroon ridged border all the way around." + RenderText {#text} at (1,1) size 480x19 + text run at (1,1) width 480: "This paragraph should have a thin maroon ridged border all the way around." RenderBlock {P} at (0,347) size 769x40 [border: (10px outset #008080)] - RenderText {#text} at (10,10) size 495x19 - text run at (10,10) width 495: "This paragraph should have a ten-pixel-wide teal outset border all the way around." + RenderText {#text} at (10,10) size 518x19 + text run at (10,10) width 518: "This paragraph should have a ten-pixel-wide teal outset border all the way around." RenderBlock {P} at (0,403) size 769x40 [border: (10px inset #808000)] - RenderText {#text} at (10,10) size 493x19 - text run at (10,10) width 493: "This paragraph should have a ten-pixel-wide olive inset border all the way around." + RenderText {#text} at (10,10) size 519x19 + text run at (10,10) width 519: "This paragraph should have a ten-pixel-wide olive inset border all the way around." RenderBlock {P} at (0,459) size 769x20 - RenderText {#text} at (0,0) size 333x19 - text run at (0,0) width 333: "This paragraph should have no border around it, as the " + RenderText {#text} at (0,0) size 348x19 + text run at (0,0) width 348: "This paragraph should have no border around it, as the " RenderInline {TT} at (0,0) size 96x16 - RenderText {#text} at (333,3) size 96x16 - text run at (333,3) width 96: "border-style" - RenderText {#text} at (429,0) size 307x19 - text run at (429,0) width 307: " was not set, and it should not be offset in any way." - RenderBlock {P} at (0,495) size 769x26 [border: (3px double #800000)] - RenderText {#text} at (3,3) size 508x19 - text run at (3,3) width 508: "This paragraph should have a medium maroon double border around it, even though " + RenderText {#text} at (348,3) size 96x16 + text run at (348,3) width 96: "border-style" + RenderText {#text} at (444,0) size 322x19 + text run at (444,0) width 322: " was not set, and it should not be offset in any way." + RenderBlock {P} at (0,495) size 769x46 [border: (3px double #800000)] + RenderText {#text} at (3,3) size 535x19 + text run at (3,3) width 535: "This paragraph should have a medium maroon double border around it, even though " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (511,6) size 96x16 - text run at (511,6) width 96: "border-width" - RenderText {#text} at (607,3) size 132x19 - text run at (607,3) width 132: " was not explicitly set." - RenderBlock {P} at (0,537) size 769x20 - RenderText {#text} at (0,0) size 590x19 - text run at (0,0) width 590: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - RenderBlock {P} at (0,573) size 769x20 - RenderInline {A} at (0,0) size 23x19 - RenderText {#text} at (0,0) size 23x19 - text run at (0,0) width 23: "The" - RenderText {#text} at (23,0) size 677x19 - text run at (23,0) width 677: " following image is also an anchor which points to a target on this page, but it should not have a border around it: " + RenderText {#text} at (538,6) size 96x16 + text run at (538,6) width 96: "border-width" + RenderText {#text} at (634,3) size 746x39 + text run at (634,3) width 115: " was not explicitly" + text run at (3,23) width 21: "set." + RenderBlock {P} at (0,557) size 769x20 + RenderText {#text} at (0,0) size 621x19 + text run at (0,0) width 621: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." + RenderBlock {P} at (0,593) size 769x20 + RenderInline {A} at (0,0) size 25x19 + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "The" + RenderText {#text} at (25,0) size 715x19 + text run at (25,0) width 715: " following image is also an anchor which points to a target on this page, but it should not have a border around it: " RenderInline {A} at (0,0) size 15x19 [color=#0000FF] - RenderImage {IMG} at (700,0) size 15x15 - RenderText {#text} at (715,0) size 4x19 - text run at (715,0) width 4: "." - RenderTable {TABLE} at (0,609) size 769x121 [border: (1px outset #808080)] + RenderImage {IMG} at (740,0) size 15x15 + RenderText {#text} at (755,0) size 4x19 + text run at (755,0) width 4: "." + RenderTable {TABLE} at (0,629) size 769x121 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x119 RenderTableRow {TR} at (0,5) size 767x46 RenderTableCell {TD} at (5,5) size 758x46 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,3) size 746x39 - text run at (3,3) width 384: "Every cell in this table should have a 2-pixel solid green border. " - text run at (387,3) width 362: "This is also true of the table-testing section in the second half" - text run at (3,23) width 96: "of the test page." + RenderText {#text} at (3,3) size 710x39 + text run at (3,3) width 404: "Every cell in this table should have a 2-pixel solid green border. " + text run at (407,3) width 306: "This is also true of the table-testing section in the" + text run at (3,23) width 175: "second half of the test page." RenderTableRow {TR} at (0,56) size 767x58 - RenderTableCell {TD} at (5,72) size 193x26 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,3) size 50x19 - text run at (3,3) width 50: "Cell one" - RenderTableCell {TD} at (202,56) size 561x58 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,3) size 554x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (3,23) size 157x32 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 155x30 - RenderTableRow {TR} at (0,2) size 155x26 - RenderTableCell {TD} at (2,2) size 151x26 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (3,3) size 145x19 - text run at (3,3) width 145: "Nested single-cell table!" - RenderBlock {P} at (0,746) size 769x20 - RenderText {#text} at (0,0) size 163x19 - text run at (0,0) width 163: "This is an unstyled element." - RenderTable {TABLE} at (0,782) size 769x597 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x595 + RenderTableCell {TD} at (5,72) size 195x26 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,3) size 53x19 + text run at (3,3) width 53: "Cell one" + RenderTableCell {TD} at (204,56) size 559x58 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,3) size 552x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (3,23) size 163x32 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 161x30 + RenderTableRow {TR} at (0,2) size 161x26 + RenderTableCell {TD} at (2,2) size 157x26 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (3,3) size 151x19 + text run at (3,3) width 151: "Nested single-cell table!" + RenderBlock {P} at (0,766) size 769x20 + RenderText {#text} at (0,0) size 175x19 + text run at (0,0) width 175: "This is an unstyled element." + RenderTable {TABLE} at (0,802) size 769x657 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x655 RenderTableRow {TR} at (0,0) size 767x30 RenderTableCell {TD} at (0,0) size 767x30 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (5,5) size 159x19 - text run at (5,5) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,30) size 767x565 - RenderTableCell {TD} at (0,297) size 14x31 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (5,5) size 160x19 + text run at (5,5) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,30) size 767x625 + RenderTableCell {TD} at (0,327) size 14x31 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (5,4) size 4x21 text run at (5,5) width 4: " " - RenderTableCell {TD} at (14,30) size 753x565 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (14,30) size 753x625 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (5,5) size 743x40 - RenderText {#text} at (0,0) size 742x39 - text run at (0,0) width 597: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " - text run at (597,0) width 145: "This border applies only" - text run at (0,20) width 270: "to the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 700x39 + text run at (0,0) width 627: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " + text run at (627,0) width 73: "This border" + text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." RenderBlock {P} at (5,61) size 743x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 459x19 - text run at (3,3) width 459: "This paragraph should have a medium black solid border all the way around." + RenderText {#text} at (3,3) size 483x19 + text run at (3,3) width 483: "This paragraph should have a medium black solid border all the way around." RenderBlock {P} at (5,103) size 743x22 [border: (1px ridge #800000)] - RenderText {#text} at (1,1) size 456x19 - text run at (1,1) width 456: "This paragraph should have a thin maroon ridged border all the way around." + RenderText {#text} at (1,1) size 480x19 + text run at (1,1) width 480: "This paragraph should have a thin maroon ridged border all the way around." RenderBlock {P} at (5,141) size 743x40 [border: (10px outset #008080)] - RenderText {#text} at (10,10) size 495x19 - text run at (10,10) width 495: "This paragraph should have a ten-pixel-wide teal outset border all the way around." + RenderText {#text} at (10,10) size 518x19 + text run at (10,10) width 518: "This paragraph should have a ten-pixel-wide teal outset border all the way around." RenderBlock {P} at (5,197) size 743x40 [border: (10px inset #808000)] - RenderText {#text} at (10,10) size 493x19 - text run at (10,10) width 493: "This paragraph should have a ten-pixel-wide olive inset border all the way around." - RenderBlock {P} at (5,253) size 743x20 - RenderText {#text} at (0,0) size 333x19 - text run at (0,0) width 333: "This paragraph should have no border around it, as the " + RenderText {#text} at (10,10) size 519x19 + text run at (10,10) width 519: "This paragraph should have a ten-pixel-wide olive inset border all the way around." + RenderBlock {P} at (5,253) size 743x40 + RenderText {#text} at (0,0) size 348x19 + text run at (0,0) width 348: "This paragraph should have no border around it, as the " RenderInline {TT} at (0,0) size 96x16 - RenderText {#text} at (333,3) size 96x16 - text run at (333,3) width 96: "border-style" - RenderText {#text} at (429,0) size 307x19 - text run at (429,0) width 307: " was not set, and it should not be offset in any way." - RenderBlock {P} at (5,289) size 743x26 [border: (3px double #800000)] - RenderText {#text} at (3,3) size 508x19 - text run at (3,3) width 508: "This paragraph should have a medium maroon double border around it, even though " + RenderText {#text} at (348,3) size 96x16 + text run at (348,3) width 96: "border-style" + RenderText {#text} at (444,0) size 732x39 + text run at (444,0) width 288: " was not set, and it should not be offset in any" + text run at (0,20) width 30: "way." + RenderBlock {P} at (5,309) size 743x46 [border: (3px double #800000)] + RenderText {#text} at (3,3) size 535x19 + text run at (3,3) width 535: "This paragraph should have a medium maroon double border around it, even though " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (511,6) size 96x16 - text run at (511,6) width 96: "border-width" - RenderText {#text} at (607,3) size 132x19 - text run at (607,3) width 132: " was not explicitly set." - RenderBlock {P} at (5,331) size 743x20 - RenderText {#text} at (0,0) size 590x19 - text run at (0,0) width 590: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - RenderBlock {P} at (5,367) size 743x20 - RenderInline {A} at (0,0) size 23x19 - RenderText {#text} at (0,0) size 23x19 - text run at (0,0) width 23: "The" - RenderText {#text} at (23,0) size 677x19 - text run at (23,0) width 677: " following image is also an anchor which points to a target on this page, but it should not have a border around it: " + RenderText {#text} at (538,6) size 96x16 + text run at (538,6) width 96: "border-width" + RenderText {#text} at (634,3) size 684x39 + text run at (634,3) width 53: " was not" + text run at (3,23) width 83: "explicitly set." + RenderBlock {P} at (5,371) size 743x20 + RenderText {#text} at (0,0) size 621x19 + text run at (0,0) width 621: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." + RenderBlock {P} at (5,407) size 743x40 + RenderInline {A} at (0,0) size 25x19 + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "The" + RenderText {#text} at (25,0) size 711x19 + text run at (25,0) width 711: " following image is also an anchor which points to a target on this page, but it should not have a border around it:" RenderInline {A} at (0,0) size 15x19 [color=#0000FF] - RenderImage {IMG} at (700,0) size 15x15 - RenderText {#text} at (715,0) size 4x19 - text run at (715,0) width 4: "." - RenderTable {TABLE} at (5,403) size 743x121 [border: (1px outset #808080)] + RenderImage {IMG} at (0,20) size 15x15 + RenderText {#text} at (15,20) size 4x19 + text run at (15,20) width 4: "." + RenderTable {TABLE} at (5,463) size 743x121 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 741x119 RenderTableRow {TR} at (0,5) size 741x46 RenderTableCell {TD} at (5,5) size 732x46 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,3) size 721x39 - text run at (3,3) width 384: "Every cell in this table should have a 2-pixel solid green border. " - text run at (387,3) width 337: "This is also true of the table-testing section in the second" - text run at (3,23) width 121: "half of the test page." + RenderText {#text} at (3,3) size 710x39 + text run at (3,3) width 404: "Every cell in this table should have a 2-pixel solid green border. " + text run at (407,3) width 306: "This is also true of the table-testing section in the" + text run at (3,23) width 175: "second half of the test page." RenderTableRow {TR} at (0,56) size 741x58 - RenderTableCell {TD} at (5,72) size 186x26 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,3) size 50x19 - text run at (3,3) width 50: "Cell one" - RenderTableCell {TD} at (195,56) size 542x58 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,3) size 535x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (3,23) size 157x32 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 155x30 - RenderTableRow {TR} at (0,2) size 155x26 - RenderTableCell {TD} at (2,2) size 151x26 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (3,3) size 145x19 - text run at (3,3) width 145: "Nested single-cell table!" - RenderBlock {P} at (5,540) size 743x20 - RenderText {#text} at (0,0) size 163x19 - text run at (0,0) width 163: "This is an unstyled element." + RenderTableCell {TD} at (5,72) size 188x26 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,3) size 53x19 + text run at (3,3) width 53: "Cell one" + RenderTableCell {TD} at (197,56) size 540x58 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,3) size 533x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (3,23) size 163x32 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 161x30 + RenderTableRow {TR} at (0,2) size 161x26 + RenderTableCell {TD} at (2,2) size 157x26 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (3,3) size 151x19 + text run at (3,3) width 151: "Nested single-cell table!" + RenderBlock {P} at (5,600) size 743x20 + RenderText {#text} at (0,0) size 175x19 + text run at (0,0) width 175: "This is an unstyled element." layer at (8,201) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,193) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_bottom-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_bottom-expected.txt index ef2bff3716d5..1abbbeb0e061 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_bottom-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_bottom-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1063 RenderBlock {HTML} at (0,0) size 785x1063 RenderBody {BODY} at (8,8) size 769x1047 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x64 RenderText {#text} at (0,0) size 344x64 text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}" @@ -17,148 +17,148 @@ layer at (0,0) size 785x1063 text run at (0,48) width 288: "TD {border-bottom: green 2px solid;}" text run at (288,48) width 0: " " RenderBlock {P} at (0,131) size 769x40 - RenderText {#text} at (0,0) size 745x39 - text run at (0,0) width 629: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " - text run at (629,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 731x39 + text run at (0,0) width 658: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " + text run at (658,0) width 73: "This border" + text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." RenderBlock {P} at (0,187) size 769x30 [border: none (10px double #800080) none] - RenderText {#text} at (0,0) size 421x19 - text run at (0,0) width 421: "This paragraph should have a purple, double, 10-pixel bottom border." + RenderText {#text} at (0,0) size 437x19 + text run at (0,0) width 437: "This paragraph should have a purple, double, 10-pixel bottom border." RenderBlock {P} at (0,233) size 769x21 [border: none (1px solid #800080) none] - RenderText {#text} at (0,0) size 339x19 - text run at (0,0) width 339: "This paragraph should have a thin purple bottom border." + RenderText {#text} at (0,0) size 354x19 + text run at (0,0) width 354: "This paragraph should have a thin purple bottom border." RenderTable {TABLE} at (0,270) size 769x118 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x116 RenderTableRow {TR} at (0,5) size 767x45 RenderTableCell {TD} at (5,5) size 758x45 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,2) size 721x39 - text run at (2,2) width 431: "Every cell in this table should have a 2-pixel solid green bottom border. " - text run at (433,2) width 290: "This is also true of the table-testing section in the" - text run at (2,22) width 168: "second half of the test page." + RenderText {#text} at (2,2) size 735x39 + text run at (2,2) width 452: "Every cell in this table should have a 2-pixel solid green bottom border. " + text run at (454,2) width 283: "This is also true of the table-testing section in" + text run at (2,22) width 198: "the second half of the test page." RenderTableRow {TR} at (0,55) size 767x56 - RenderTableCell {TD} at (5,70) size 191x26 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,1) size 50x21 - text run at (2,2) width 50: "Cell one" - RenderTableCell {TD} at (200,55) size 563x56 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,2) size 558x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (2,22) size 155x31 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 153x29 - RenderTableRow {TR} at (0,2) size 153x25 - RenderTableCell {TD} at (2,2) size 149x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 145x19 - text run at (2,2) width 145: "Nested single-cell table!" + RenderTableCell {TD} at (5,70) size 194x26 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,1) size 53x21 + text run at (2,2) width 53: "Cell one" + RenderTableCell {TD} at (203,55) size 560x56 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,2) size 555x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (2,22) size 161x31 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 159x29 + RenderTableRow {TR} at (0,2) size 159x25 + RenderTableCell {TD} at (2,2) size 155x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 151x19 + text run at (2,2) width 151: "Nested single-cell table!" RenderBlock {UL} at (0,404) size 769x149 RenderListItem {LI} at (40,0) size 729x83 [border: none (3px solid #000000) none] RenderBlock (anonymous) at (0,0) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "This is a list item..." RenderBlock {UL} at (0,20) size 729x60 RenderListItem {LI} at (40,0) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." + RenderText {#text} at (0,0) size 73x19 + text run at (0,0) width 73: "...and this..." RenderListItem {LI} at (40,20) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." + RenderText {#text} at (0,0) size 115x19 + text run at (0,0) width 115: "...is a second list..." RenderListItem {LI} at (40,40) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." + RenderText {#text} at (0,0) size 176x19 + text run at (0,0) width 176: "...nested within the list item." RenderListItem {LI} at (40,83) size 729x23 [border: none (3px solid #000000) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "This is a second list item." + RenderText {#text} at (0,0) size 158x19 + text run at (0,0) width 158: "This is a second list item." RenderListItem {LI} at (40,106) size 729x43 [border: none (3px solid #000000) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 694x39 - text run at (0,0) width 694: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means that it" - text run at (0,20) width 89: "should appear " - RenderInline {EM} at (0,0) size 51x19 - RenderText {#text} at (89,20) size 51x19 - text run at (89,20) width 51: "beneath" - RenderText {#text} at (140,20) size 365x19 - text run at (140,20) width 365: " the nested list (below the line \"...nested within the list item.\")." + RenderText {#text} at (0,0) size 722x39 + text run at (0,0) width 722: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means that" + text run at (0,20) width 104: "it should appear " + RenderInline {EM} at (0,0) size 50x19 + RenderText {#text} at (104,20) size 50x19 + text run at (104,20) width 50: "beneath" + RenderText {#text} at (154,20) size 390x19 + text run at (154,20) width 390: " the nested list (below the line \"...nested within the list item.\")." RenderTable {TABLE} at (0,569) size 769x478 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x476 RenderTableRow {TR} at (0,0) size 767x29 RenderTableCell {TD} at (0,0) size 767x29 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,29) size 767x447 RenderTableCell {TD} at (0,238) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,29) size 755x447 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x40 - RenderText {#text} at (0,0) size 745x39 - text run at (0,0) width 629: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " - text run at (629,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 731x39 + text run at (0,0) width 658: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " + text run at (658,0) width 73: "This border" + text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." RenderBlock {P} at (4,60) size 747x30 [border: none (10px double #800080) none] - RenderText {#text} at (0,0) size 421x19 - text run at (0,0) width 421: "This paragraph should have a purple, double, 10-pixel bottom border." + RenderText {#text} at (0,0) size 437x19 + text run at (0,0) width 437: "This paragraph should have a purple, double, 10-pixel bottom border." RenderBlock {P} at (4,106) size 747x21 [border: none (1px solid #800080) none] - RenderText {#text} at (0,0) size 339x19 - text run at (0,0) width 339: "This paragraph should have a thin purple bottom border." + RenderText {#text} at (0,0) size 354x19 + text run at (0,0) width 354: "This paragraph should have a thin purple bottom border." RenderTable {TABLE} at (4,143) size 747x118 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 745x116 RenderTableRow {TR} at (0,5) size 745x45 RenderTableCell {TD} at (5,5) size 736x45 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,2) size 721x39 - text run at (2,2) width 431: "Every cell in this table should have a 2-pixel solid green bottom border. " - text run at (433,2) width 290: "This is also true of the table-testing section in the" - text run at (2,22) width 168: "second half of the test page." + RenderText {#text} at (2,2) size 719x39 + text run at (2,2) width 452: "Every cell in this table should have a 2-pixel solid green bottom border. " + text run at (454,2) width 267: "This is also true of the table-testing section" + text run at (2,22) width 214: "in the second half of the test page." RenderTableRow {TR} at (0,55) size 745x56 - RenderTableCell {TD} at (5,70) size 186x26 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,1) size 50x21 - text run at (2,2) width 50: "Cell one" - RenderTableCell {TD} at (195,55) size 546x56 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,2) size 541x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (2,22) size 155x31 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 153x29 - RenderTableRow {TR} at (0,2) size 153x25 - RenderTableCell {TD} at (2,2) size 149x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 145x19 - text run at (2,2) width 145: "Nested single-cell table!" + RenderTableCell {TD} at (5,70) size 188x26 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,1) size 53x21 + text run at (2,2) width 53: "Cell one" + RenderTableCell {TD} at (197,55) size 544x56 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,2) size 539x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (2,22) size 161x31 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 159x29 + RenderTableRow {TR} at (0,2) size 159x25 + RenderTableCell {TD} at (2,2) size 155x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 151x19 + text run at (2,2) width 151: "Nested single-cell table!" RenderBlock {UL} at (4,277) size 747x149 RenderListItem {LI} at (40,0) size 707x83 [border: none (3px solid #000000) none] RenderBlock (anonymous) at (0,0) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "This is a list item..." RenderBlock {UL} at (0,20) size 707x60 RenderListItem {LI} at (40,0) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." + RenderText {#text} at (0,0) size 73x19 + text run at (0,0) width 73: "...and this..." RenderListItem {LI} at (40,20) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." + RenderText {#text} at (0,0) size 115x19 + text run at (0,0) width 115: "...is a second list..." RenderListItem {LI} at (40,40) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." + RenderText {#text} at (0,0) size 176x19 + text run at (0,0) width 176: "...nested within the list item." RenderListItem {LI} at (40,83) size 707x23 [border: none (3px solid #000000) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "This is a second list item." + RenderText {#text} at (0,0) size 158x19 + text run at (0,0) width 158: "This is a second list item." RenderListItem {LI} at (40,106) size 707x43 [border: none (3px solid #000000) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 694x39 - text run at (0,0) width 694: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means that it" - text run at (0,20) width 89: "should appear " - RenderInline {EM} at (0,0) size 51x19 - RenderText {#text} at (89,20) size 51x19 - text run at (89,20) width 51: "beneath" - RenderText {#text} at (140,20) size 365x19 - text run at (140,20) width 365: " the nested list (below the line \"...nested within the list item.\")." + RenderText {#text} at (0,0) size 695x39 + text run at (0,0) width 695: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means" + text run at (0,20) width 131: "that it should appear " + RenderInline {EM} at (0,0) size 50x19 + RenderText {#text} at (131,20) size 50x19 + text run at (131,20) width 50: "beneath" + RenderText {#text} at (181,20) size 390x19 + text run at (181,20) width 390: " the nested list (below the line \"...nested within the list item.\")." layer at (8,121) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_inline-expected.txt index 2fdc80e41367..c9a23b34487c 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 328x48 text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}" @@ -14,48 +14,47 @@ layer at (0,0) size 800x600 text run at (320,16) width 0: " " text run at (0,32) width 0: " " RenderBlock {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - RenderInline {SPAN} at (0,0) size 55x29 [border: none (10px double #800080) none] - RenderText {#text} at (627,0) size 55x19 - text run at (627,0) width 55: "class one" - RenderText {#text} at (682,0) size 768x39 - text run at (682,0) width 86: ", which should" - text run at (0,20) width 306: "have a 10-pixel purple double bottom border; and " - RenderInline {SPAN} at (0,0) size 56x20 [border: none (1px solid #800080) none] - RenderText {#text} at (306,20) size 56x19 - text run at (306,20) width 56: "class two" - RenderText {#text} at (362,20) size 778x39 - text run at (362,20) width 328: ", which should have a thin solid purple bottom border. " - text run at (690,20) width 88: "The line-height" - text run at (0,40) width 310: "of the parent element should not change on any line." + RenderText {#text} at (0,0) size 666x19 + text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " + RenderInline {SPAN} at (0,0) size 57x29 [border: none (10px double #800080) none] + RenderText {#text} at (666,0) size 57x19 + text run at (666,0) width 57: "class one" + RenderText {#text} at (723,0) size 770x39 + text run at (723,0) width 47: ", which" + text run at (0,20) width 362: "should have a 10-pixel purple double bottom border; and " + RenderInline {SPAN} at (0,0) size 58x20 [border: none (1px solid #800080) none] + RenderText {#text} at (362,20) size 58x19 + text run at (362,20) width 58: "class two" + RenderText {#text} at (420,20) size 760x39 + text run at (420,20) width 340: ", which should have a thin solid purple bottom border." + text run at (0,40) width 429: "The line-height of the parent element should not change on any line." RenderTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x96 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x68 RenderTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - RenderInline {SPAN} at (0,0) size 55x29 [border: none (10px double #800080) none] - RenderText {#text} at (627,0) size 55x19 - text run at (627,0) width 55: "class one" - RenderText {#text} at (682,0) size 725x39 - text run at (682,0) width 43: ", which" - text run at (0,20) width 349: "should have a 10-pixel purple double bottom border; and " - RenderInline {SPAN} at (0,0) size 56x20 [border: none (1px solid #800080) none] - RenderText {#text} at (349,20) size 56x19 - text run at (349,20) width 56: "class two" - RenderText {#text} at (405,20) size 756x39 - text run at (405,20) width 328: ", which should have a thin solid purple bottom border. " - text run at (733,20) width 23: "The" - text run at (0,40) width 375: "line-height of the parent element should not change on any line." + RenderText {#text} at (0,0) size 666x19 + text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " + RenderInline {SPAN} at (0,0) size 57x29 [border: none (10px double #800080) none] + RenderText {#text} at (666,0) size 57x19 + text run at (666,0) width 57: "class one" + RenderText {#text} at (723,0) size 727x39 + text run at (723,0) width 4: "," + text run at (0,20) width 405: "which should have a 10-pixel purple double bottom border; and " + RenderInline {SPAN} at (0,0) size 58x20 [border: none (1px solid #800080) none] + RenderText {#text} at (405,20) size 58x19 + text run at (405,20) width 58: "class two" + RenderText {#text} at (463,20) size 755x39 + text run at (463,20) width 292: ", which should have a thin solid purple bottom" + text run at (0,40) width 48: "border. " + text run at (48,40) width 429: "The line-height of the parent element should not change on any line." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_width-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_width-expected.txt index 32e18cd6bc14..8259e858fc95 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_width-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_width-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x919 RenderBlock {HTML} at (0,0) size 785x919 RenderBody {BODY} at (8,8) size 769x903 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 464x96 text run at (0,0) width 456: ".zero {background-color: silver; border-bottom-width: 0;}" @@ -21,84 +21,84 @@ layer at (0,0) size 785x919 text run at (0,80) width 272: ".five {border-bottom-width: 25px;}" text run at (272,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" RenderBlock {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,235) size 769x73 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 368x19 - text run at (3,3) width 368: "This element should have a bottom border width of 50 pixels." + RenderText {#text} at (3,3) size 387x19 + text run at (3,3) width 387: "This element should have a bottom border width of 50 pixels." RenderBlock {P} at (0,324) size 769x28 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 327x19 - text run at (3,3) width 327: "This element should have a thick bottom border width." + RenderText {#text} at (3,3) size 344x19 + text run at (3,3) width 344: "This element should have a thick bottom border width." RenderBlock {P} at (0,368) size 769x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 345x19 - text run at (3,3) width 345: "This element should have a medium bottom border width." + RenderText {#text} at (3,3) size 364x19 + text run at (3,3) width 364: "This element should have a medium bottom border width." RenderBlock {P} at (0,410) size 769x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 319x19 - text run at (3,3) width 319: "This element should have a thin bottom border width." + RenderText {#text} at (3,3) size 337x19 + text run at (3,3) width 337: "This element should have a thin bottom border width." RenderBlock {P} at (0,450) size 769x20 - RenderText {#text} at (0,0) size 510x19 - text run at (0,0) width 510: "This element should have no border and no extra \"padding\" on its bottom side, as no " + RenderText {#text} at (0,0) size 537x19 + text run at (0,0) width 537: "This element should have no border and no extra \"padding\" on its bottom side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (510,3) size 96x16 - text run at (510,3) width 96: "border-style" - RenderText {#text} at (606,0) size 53x19 - text run at (606,0) width 53: " was set." + RenderText {#text} at (537,3) size 96x16 + text run at (537,3) width 96: "border-style" + RenderText {#text} at (633,0) size 54x19 + text run at (633,0) width 54: " was set." RenderBlock {P} at (0,486) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderTable {TABLE} at (0,522) size 681x381 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 679x379 - RenderTableRow {TR} at (0,0) size 679x28 - RenderTableCell {TD} at (0,0) size 679x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 679x351 + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderTable {TABLE} at (0,522) size 709x381 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 707x379 + RenderTableRow {TR} at (0,0) size 707x28 + RenderTableCell {TD} at (0,0) size 707x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 707x351 RenderTableCell {TD} at (0,189) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 667x351 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 659x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderTableCell {TD} at (12,28) size 695x351 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 687x20 + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - RenderBlock {P} at (4,40) size 659x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (4,76) size 659x73 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 368x19 - text run at (3,3) width 368: "This element should have a bottom border width of 50 pixels." - RenderBlock {P} at (4,165) size 659x28 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 327x19 - text run at (3,3) width 327: "This element should have a thick bottom border width." - RenderBlock {P} at (4,209) size 659x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 345x19 - text run at (3,3) width 345: "This element should have a medium bottom border width." - RenderBlock {P} at (4,251) size 659x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 319x19 - text run at (3,3) width 319: "This element should have a thin bottom border width." - RenderBlock {P} at (4,291) size 659x20 - RenderText {#text} at (0,0) size 510x19 - text run at (0,0) width 510: "This element should have no border and no extra \"padding\" on its bottom side, as no " + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" + RenderBlock {P} at (4,40) size 687x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (4,76) size 687x73 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 387x19 + text run at (3,3) width 387: "This element should have a bottom border width of 50 pixels." + RenderBlock {P} at (4,165) size 687x28 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 344x19 + text run at (3,3) width 344: "This element should have a thick bottom border width." + RenderBlock {P} at (4,209) size 687x26 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 364x19 + text run at (3,3) width 364: "This element should have a medium bottom border width." + RenderBlock {P} at (4,251) size 687x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 337x19 + text run at (3,3) width 337: "This element should have a thin bottom border width." + RenderBlock {P} at (4,291) size 687x20 + RenderText {#text} at (0,0) size 537x19 + text run at (0,0) width 537: "This element should have no border and no extra \"padding\" on its bottom side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (510,3) size 96x16 - text run at (510,3) width 96: "border-style" - RenderText {#text} at (606,0) size 53x19 - text run at (606,0) width 53: " was set." - RenderBlock {P} at (4,327) size 659x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (537,3) size 96x16 + text run at (537,3) width 96: "border-style" + RenderText {#text} at (633,0) size 54x19 + text run at (633,0) width 54: " was set." + RenderBlock {P} at (4,327) size 687x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_width_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_width_inline-expected.txt index 1351adbd560b..18976a890785 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_width_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_bottom_width_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 432x48 text run at (0,0) width 432: ".one {border-bottom-width: 25px; border-style: solid;}" @@ -14,72 +14,75 @@ layer at (0,0) size 800x600 text run at (432,16) width 0: " " text run at (0,32) width 280: ".three {border-bottom-width: 25px;}" text run at (280,32) width 0: " " - RenderBlock {P} at (0,115) size 784x88 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 163x19 - text run at (3,3) width 163: "This element has a class of " + RenderBlock {P} at (0,115) size 784x108 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 172x19 + text run at (3,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (166,6) size 24x16 - text run at (166,6) width 24: "one" - RenderText {#text} at (190,3) size 154x19 - text run at (190,3) width 8: ". " - text run at (198,3) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 163x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (347,3) size 133x19 - text run at (347,3) width 133: "inline element of class " + RenderText {#text} at (175,6) size 24x16 + text run at (175,6) width 24: "one" + RenderText {#text} at (199,3) size 162x19 + text run at (199,3) width 8: ". " + text run at (207,3) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 173x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (364,3) size 143x19 + text run at (364,3) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (480,6) size 24x16 - text run at (480,6) width 24: "two" - RenderText {#text} at (507,3) size 772x39 - text run at (507,3) width 268: ", which should result in a thin solid border on" - text run at (3,23) width 622: "the bottom side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (625,23) width 98: "There is also an " - RenderInline {SPAN} at (0,0) size 750x39 - RenderText {#text} at (723,23) size 750x39 - text run at (723,23) width 30: "inline" - text run at (3,43) width 99: "element of class " + RenderText {#text} at (507,6) size 24x16 + text run at (507,6) width 24: "two" + RenderText {#text} at (534,3) size 767x59 + text run at (534,3) width 220: ", which should result in a thin solid" + text run at (3,23) width 716: "border on the bottom side of each box in the inline element (and the UA's default border on the other three sides). " + text run at (719,23) width 51: "There is" + text run at (3,43) width 48: "also an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (51,43) size 143x19 + text run at (51,43) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (102,46) size 40x16 - text run at (102,46) width 40: "three" - RenderText {#text} at (142,43) size 570x19 - text run at (142,43) width 570: ", which should have no bottom border width or visible border because no border style was set." - RenderTable {TABLE} at (0,219) size 784x126 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x124 + RenderText {#text} at (194,46) size 40x16 + text run at (194,46) width 40: "three" + RenderText {#text} at (234,43) size 770x39 + text run at (234,43) width 539: ", which should have no bottom border width or visible border because no border style" + text run at (3,63) width 50: "was set." + RenderTable {TABLE} at (0,239) size 784x146 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x144 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 782x96 - RenderTableCell {TD} at (0,62) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 782x116 + RenderTableCell {TD} at (0,72) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 770x96 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x88 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 163x19 - text run at (3,3) width 163: "This element has a class of " + RenderTableCell {TD} at (12,28) size 770x116 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x108 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 172x19 + text run at (3,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (166,6) size 24x16 - text run at (166,6) width 24: "one" - RenderText {#text} at (190,3) size 154x19 - text run at (190,3) width 8: ". " - text run at (198,3) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 163x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (347,3) size 133x19 - text run at (347,3) width 133: "inline element of class " + RenderText {#text} at (175,6) size 24x16 + text run at (175,6) width 24: "one" + RenderText {#text} at (199,3) size 162x19 + text run at (199,3) width 8: ". " + text run at (207,3) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 173x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (364,3) size 143x19 + text run at (364,3) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (480,6) size 24x16 - text run at (480,6) width 24: "two" - RenderText {#text} at (507,3) size 753x39 - text run at (507,3) width 249: ", which should result in a thin solid border" - text run at (3,23) width 641: "on the bottom side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (644,23) width 94: "There is also an" - RenderInline {SPAN} at (0,0) size 173x19 - RenderText {#text} at (3,43) size 133x19 - text run at (3,43) width 133: "inline element of class " + RenderText {#text} at (507,6) size 24x16 + text run at (507,6) width 24: "two" + RenderText {#text} at (534,3) size 753x59 + text run at (534,3) width 220: ", which should result in a thin solid" + text run at (3,23) width 716: "border on the bottom side of each box in the inline element (and the UA's default border on the other three sides). " + text run at (719,23) width 37: "There" + text run at (3,43) width 62: "is also an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (65,43) size 143x19 + text run at (65,43) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (136,46) size 40x16 - text run at (136,46) width 40: "three" - RenderText {#text} at (176,43) size 570x19 - text run at (176,43) width 570: ", which should have no bottom border width or visible border because no border style was set." + RenderText {#text} at (208,46) size 40x16 + text run at (208,46) width 40: "three" + RenderText {#text} at (248,43) size 751x39 + text run at (248,43) width 506: ", which should have no bottom border width or visible border because no border" + text run at (3,63) width 83: "style was set." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_color-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_color-expected.txt index 87b792c478b3..ebba31af4340 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_color-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_color-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 728x48 text run at (0,0) width 392: ".one {border-color: purple; border-style: solid;}" @@ -15,36 +15,36 @@ layer at (0,0) size 800x600 text run at (0,32) width 728: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" text run at (728,32) width 0: " " RenderBlock {P} at (0,115) size 784x26 [border: (3px solid #800080)] - RenderText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This element should have a purple border surrounding it." + RenderText {#text} at (3,3) size 357x19 + text run at (3,3) width 357: "This element should have a purple border surrounding it." RenderBlock {P} at (0,157) size 784x26 [border: (3px solid #800080)] - RenderText {#text} at (3,3) size 427x19 - text run at (3,3) width 427: "This element should have a medium-width purple border surrounding it." + RenderText {#text} at (3,3) size 453x19 + text run at (3,3) width 453: "This element should have a medium-width purple border surrounding it." RenderBlock {P} at (0,199) size 784x46 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - RenderText {#text} at (3,3) size 774x39 - text run at (3,3) width 774: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on the bottom," - text run at (3,23) width 160: "and yellow on the left side." + RenderText {#text} at (3,3) size 763x39 + text run at (3,3) width 763: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on the" + text run at (3,23) width 222: "bottom, and yellow on the left side." RenderTable {TABLE} at (0,261) size 784x168 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x166 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x138 RenderTableCell {TD} at (0,83) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x138 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x26 [border: (3px solid #800080)] - RenderText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This element should have a purple border surrounding it." + RenderText {#text} at (3,3) size 357x19 + text run at (3,3) width 357: "This element should have a purple border surrounding it." RenderBlock {P} at (4,46) size 762x26 [border: (3px solid #800080)] - RenderText {#text} at (3,3) size 427x19 - text run at (3,3) width 427: "This element should have a medium-width purple border surrounding it." + RenderText {#text} at (3,3) size 453x19 + text run at (3,3) width 453: "This element should have a medium-width purple border surrounding it." RenderBlock {P} at (4,88) size 762x46 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - RenderText {#text} at (3,3) size 723x39 - text run at (3,3) width 723: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on the" - text run at (3,23) width 211: "bottom, and yellow on the left side." + RenderText {#text} at (3,3) size 740x39 + text run at (3,3) width 740: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on" + text run at (3,23) width 245: "the bottom, and yellow on the left side." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_color_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_color_inline-expected.txt index c6fe598ea5f5..9e9ce6456db1 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_color_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_color_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 728x48 text run at (0,0) width 392: ".one {border-color: purple; border-style: solid;}" @@ -15,62 +15,61 @@ layer at (0,0) size 800x600 text run at (0,32) width 728: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" text run at (728,32) width 0: " " RenderBlock {P} at (0,115) size 784x80 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - RenderInline {SPAN} at (0,0) size 61x25 [border: (3px solid #800080)] - RenderText {#text} at (641,0) size 55x19 - text run at (641,0) width 55: "class one" - RenderText {#text} at (699,0) size 8x19 - text run at (699,0) width 8: ", " - RenderInline {SPAN} at (0,0) size 62x25 [border: (3px solid #800080)] - RenderText {#text} at (710,0) size 56x19 - text run at (710,0) width 56: "class two" - RenderText {#text} at (769,0) size 773x39 - text run at (769,0) width 4: "," - text run at (0,20) width 26: "and " - RenderInline {SPAN} at (0,0) size 69x25 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - RenderText {#text} at (29,20) size 63x19 - text run at (29,20) width 63: "class three" - RenderText {#text} at (95,20) size 765x59 - text run at (95,20) width 8: ". " - text run at (103,20) width 662: "The effect for each inline element should be to have a purple medium-width solid border in the first and second" - text run at (0,40) width 473: "cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (473,40) width 284: "The line-height of the parent element should not" - text run at (0,60) width 150: "change at all, on any line." + RenderText {#text} at (0,0) size 677x19 + text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " + RenderInline {SPAN} at (0,0) size 63x25 [border: (3px solid #800080)] + RenderText {#text} at (680,0) size 57x19 + text run at (680,0) width 57: "class one" + RenderText {#text} at (740,0) size 8x19 + text run at (740,0) width 8: ", " + RenderInline {SPAN} at (0,0) size 781x45 [border: (3px solid #800080)] + RenderText {#text} at (751,0) size 781x39 + text run at (751,0) width 30: "class" + text run at (0,20) width 24: "two" + RenderText {#text} at (27,20) size 35x19 + text run at (27,20) width 35: ", and " + RenderInline {SPAN} at (0,0) size 71x25 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] + RenderText {#text} at (65,20) size 65x19 + text run at (65,20) width 65: "class three" + RenderText {#text} at (133,20) size 764x59 + text run at (133,20) width 8: ". " + text run at (141,20) width 623: "The effect for each inline element should be to have a purple medium-width solid border in the first" + text run at (0,40) width 569: "and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " + text run at (569,40) width 179: "The line-height of the parent" + text run at (0,60) width 284: "element should not change at all, on any line." RenderTable {TABLE} at (0,211) size 784x118 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x116 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x88 RenderTableCell {TD} at (0,58) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x80 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - RenderInline {SPAN} at (0,0) size 61x25 [border: (3px solid #800080)] - RenderText {#text} at (641,0) size 55x19 - text run at (641,0) width 55: "class one" - RenderText {#text} at (699,0) size 8x19 - text run at (699,0) width 8: ", " - RenderInline {SPAN} at (0,0) size 739x45 [border: (3px solid #800080)] - RenderText {#text} at (710,0) size 739x39 - text run at (710,0) width 29: "class" - text run at (0,20) width 23: "two" - RenderText {#text} at (26,20) size 34x19 - text run at (26,20) width 34: ", and " - RenderInline {SPAN} at (0,0) size 69x25 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - RenderText {#text} at (63,20) size 63x19 - text run at (63,20) width 63: "class three" - RenderText {#text} at (129,20) size 752x59 - text run at (129,20) width 8: ". " - text run at (137,20) width 615: "The effect for each inline element should be to have a purple medium-width solid border in the first and" - text run at (0,40) width 520: "second cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (520,40) width 218: "The line-height of the parent element" - text run at (0,60) width 216: "should not change at all, on any line." + RenderText {#text} at (0,0) size 677x19 + text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " + RenderInline {SPAN} at (0,0) size 63x25 [border: (3px solid #800080)] + RenderText {#text} at (680,0) size 57x19 + text run at (680,0) width 57: "class one" + RenderText {#text} at (740,0) size 4x19 + text run at (740,0) width 4: "," + RenderInline {SPAN} at (0,0) size 64x25 [border: (3px solid #800080)] + RenderText {#text} at (3,20) size 58x19 + text run at (3,20) width 58: "class two" + RenderText {#text} at (64,20) size 35x19 + text run at (64,20) width 35: ", and " + RenderInline {SPAN} at (0,0) size 71x25 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] + RenderText {#text} at (102,20) size 65x19 + text run at (102,20) width 65: "class three" + RenderText {#text} at (170,20) size 756x59 + text run at (170,20) width 8: ". " + text run at (178,20) width 572: "The effect for each inline element should be to have a purple medium-width solid border in" + text run at (0,40) width 620: "the first and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " + text run at (620,40) width 136: "The line-height of the" + text run at (0,60) width 327: "parent element should not change at all, on any line." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_inline-expected.txt index 8a8ffb72f53e..74ebd423a42e 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 256x48 text run at (0,0) width 256: ".one {border: 10px teal outset;}" @@ -14,48 +14,46 @@ layer at (0,0) size 800x600 text run at (256,16) width 0: " " text run at (0,32) width 0: " " RenderBlock {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - RenderInline {SPAN} at (0,0) size 75x39 [border: (10px outset #008080)] - RenderText {#text} at (648,0) size 55x19 - text run at (648,0) width 55: "class one" - RenderText {#text} at (713,0) size 756x39 - text run at (713,0) width 43: ", which" - text run at (0,20) width 298: "should result in a 10-pixel outset teal border; and " - RenderInline {SPAN} at (0,0) size 76x39 [border: (10px inset #808000)] - RenderText {#text} at (308,20) size 56x19 - text run at (308,20) width 56: "class two" - RenderText {#text} at (374,20) size 779x39 - text run at (374,20) width 317: ", which should result in a 10-pixel inset olive border. " - text run at (691,20) width 88: "The line-height" - text run at (0,40) width 310: "of the parent element should not change on any line." + RenderText {#text} at (0,0) size 677x19 + text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " + RenderInline {SPAN} at (0,0) size 77x39 [border: (10px outset #008080)] + RenderText {#text} at (687,0) size 57x19 + text run at (687,0) width 57: "class one" + RenderText {#text} at (754,0) size 758x39 + text run at (754,0) width 4: "," + text run at (0,20) width 353: "which should result in a 10-pixel outset teal border; and " + RenderInline {SPAN} at (0,0) size 78x39 [border: (10px inset #808000)] + RenderText {#text} at (363,20) size 58x19 + text run at (363,20) width 58: "class two" + RenderText {#text} at (431,20) size 761x39 + text run at (431,20) width 330: ", which should result in a 10-pixel inset olive border." + text run at (0,40) width 429: "The line-height of the parent element should not change on any line." RenderTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x96 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x68 RenderTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - RenderInline {SPAN} at (0,0) size 75x39 [border: (10px outset #008080)] - RenderText {#text} at (648,0) size 55x19 - text run at (648,0) width 55: "class one" - RenderText {#text} at (713,0) size 756x39 - text run at (713,0) width 43: ", which" - text run at (0,20) width 298: "should result in a 10-pixel outset teal border; and " - RenderInline {SPAN} at (0,0) size 76x39 [border: (10px inset #808000)] - RenderText {#text} at (308,20) size 56x19 - text run at (308,20) width 56: "class two" - RenderText {#text} at (374,20) size 744x39 - text run at (374,20) width 317: ", which should result in a 10-pixel inset olive border. " - text run at (691,20) width 53: "The line-" - text run at (0,40) width 349: "height of the parent element should not change on any line." + RenderText {#text} at (0,0) size 677x19 + text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " + RenderInline {SPAN} at (0,0) size 77x39 [border: (10px outset #008080)] + RenderText {#text} at (687,0) size 57x19 + text run at (687,0) width 57: "class one" + RenderText {#text} at (754,0) size 758x39 + text run at (754,0) width 4: "," + text run at (0,20) width 353: "which should result in a 10-pixel outset teal border; and " + RenderInline {SPAN} at (0,0) size 78x39 [border: (10px inset #808000)] + RenderText {#text} at (363,20) size 58x19 + text run at (363,20) width 58: "class two" + RenderText {#text} at (431,20) size 761x39 + text run at (431,20) width 330: ", which should result in a 10-pixel inset olive border." + text run at (0,40) width 429: "The line-height of the parent element should not change on any line." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_left-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_left-expected.txt index 4b14277e8123..407bd40f962a 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_left-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_left-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1103 RenderBlock {HTML} at (0,0) size 785x1103 RenderBody {BODY} at (8,8) size 769x1087 [bgcolor=#CCCCCC] RenderBlock {P} at (20,0) size 749x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x112 RenderText {#text} at (0,0) size 344x112 text run at (0,0) width 176: "P {margin-left: 20px;}" @@ -23,142 +23,141 @@ layer at (0,0) size 785x1103 text run at (0,96) width 272: "TD {border-left: green 2px solid;}" text run at (272,96) width 0: " " RenderBlock {P} at (20,179) size 749x40 - RenderText {#text} at (0,0) size 749x39 - text run at (0,0) width 604: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " - text run at (604,0) width 145: "This border applies only" - text run at (0,20) width 270: "to the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 707x39 + text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " + text run at (634,0) width 73: "This border" + text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." RenderBlock {P} at (20,235) size 749x20 [border: none (10px double #800080)] - RenderText {#text} at (10,0) size 396x19 - text run at (10,0) width 396: "This paragraph should have a purple, double, 10-pixel left border." + RenderText {#text} at (10,0) size 413x19 + text run at (10,0) width 413: "This paragraph should have a purple, double, 10-pixel left border." RenderBlock {P} at (20,271) size 749x20 [border: none (1px solid #800080)] - RenderText {#text} at (1,0) size 314x19 - text run at (1,0) width 314: "This paragraph should have a thin purple left border." + RenderText {#text} at (1,0) size 330x19 + text run at (1,0) width 330: "This paragraph should have a thin purple left border." RenderTable {TABLE} at (0,307) size 769x115 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x113 RenderTableRow {TR} at (0,5) size 767x44 RenderTableCell {TD} at (5,5) size 758x44 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,2) size 743x39 - text run at (3,2) width 406: "Every cell in this table should have a 2-pixel solid green left border. " - text run at (409,2) width 337: "This is also true of the table-testing section in the second" - text run at (3,22) width 121: "half of the test page." + RenderText {#text} at (3,2) size 734x39 + text run at (3,2) width 428: "Every cell in this table should have a 2-pixel solid green left border. " + text run at (431,2) width 306: "This is also true of the table-testing section in the" + text run at (3,22) width 175: "second half of the test page." RenderTableRow {TR} at (0,54) size 767x54 - RenderTableCell {TD} at (5,69) size 192x24 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,2) size 50x19 - text run at (3,2) width 50: "Cell one" - RenderTableCell {TD} at (201,54) size 562x54 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,2) size 556x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (3,22) size 156x30 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 154x28 - RenderTableRow {TR} at (0,2) size 154x24 - RenderTableCell {TD} at (2,2) size 150x24 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (3,2) size 145x19 - text run at (3,2) width 145: "Nested single-cell table!" + RenderTableCell {TD} at (5,69) size 194x24 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,2) size 53x19 + text run at (3,2) width 53: "Cell one" + RenderTableCell {TD} at (203,54) size 560x54 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,2) size 554x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (3,22) size 162x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 160x28 + RenderTableRow {TR} at (0,2) size 160x24 + RenderTableCell {TD} at (2,2) size 156x24 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (3,2) size 151x19 + text run at (3,2) width 151: "Nested single-cell table!" RenderBlock {UL} at (0,438) size 769x160 RenderListItem {LI} at (40,0) size 729x80 [border: none (3px solid #000000)] RenderBlock (anonymous) at (3,0) size 726x20 RenderListMarker at (-21,0) size 7x19: bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "This is a list item..." RenderBlock {UL} at (3,20) size 726x60 RenderListItem {LI} at (40,0) size 686x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." + RenderText {#text} at (0,0) size 73x19 + text run at (0,0) width 73: "...and this..." RenderListItem {LI} at (40,20) size 686x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." + RenderText {#text} at (0,0) size 115x19 + text run at (0,0) width 115: "...is a second list..." RenderListItem {LI} at (40,40) size 686x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." + RenderText {#text} at (0,0) size 176x19 + text run at (0,0) width 176: "...nested within the list item." RenderListItem {LI} at (40,80) size 729x20 [border: none (3px solid #800080)] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (3,0) size 149x19 - text run at (3,0) width 149: "This is a second list item." + RenderText {#text} at (3,0) size 158x19 + text run at (3,0) width 158: "This is a second list item." RenderListItem {LI} at (40,100) size 729x60 [border: none (3px solid #0000FF)] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (3,0) size 707x59 - text run at (3,0) width 658: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors. " - text run at (661,0) width 49: "The first" - text run at (3,20) width 696: "item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within the list" - text run at (3,40) width 424: "item.\"), even though the nested list does not have any border styles set." + RenderText {#text} at (3,0) size 720x59 + text run at (3,0) width 695: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors. " + text run at (698,0) width 25: "The" + text run at (3,20) width 719: "first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within" + text run at (3,40) width 490: "the list item.\"), even though the nested list does not have any border styles set." RenderTable {TABLE} at (0,614) size 769x473 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x471 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (5,4) size 159x19 - text run at (5,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (5,4) size 160x19 + text run at (5,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x443 RenderTableCell {TD} at (0,235) size 13x29 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (5,3) size 4x21 text run at (5,4) width 4: " " RenderTableCell {TD} at (13,28) size 754x443 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (25,4) size 725x40 - RenderText {#text} at (0,0) size 720x39 - text run at (0,0) width 604: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " - text run at (604,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 707x39 + text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " + text run at (634,0) width 73: "This border" + text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." RenderBlock {P} at (25,60) size 725x20 [border: none (10px double #800080)] - RenderText {#text} at (10,0) size 396x19 - text run at (10,0) width 396: "This paragraph should have a purple, double, 10-pixel left border." + RenderText {#text} at (10,0) size 413x19 + text run at (10,0) width 413: "This paragraph should have a purple, double, 10-pixel left border." RenderBlock {P} at (25,96) size 725x20 [border: none (1px solid #800080)] - RenderText {#text} at (1,0) size 314x19 - text run at (1,0) width 314: "This paragraph should have a thin purple left border." + RenderText {#text} at (1,0) size 330x19 + text run at (1,0) width 330: "This paragraph should have a thin purple left border." RenderTable {TABLE} at (5,132) size 745x115 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 743x113 RenderTableRow {TR} at (0,5) size 743x44 RenderTableCell {TD} at (5,5) size 734x44 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,2) size 696x39 - text run at (3,2) width 406: "Every cell in this table should have a 2-pixel solid green left border. " - text run at (409,2) width 290: "This is also true of the table-testing section in the" - text run at (3,22) width 168: "second half of the test page." + RenderText {#text} at (3,2) size 711x39 + text run at (3,2) width 428: "Every cell in this table should have a 2-pixel solid green left border. " + text run at (431,2) width 283: "This is also true of the table-testing section in" + text run at (3,22) width 198: "the second half of the test page." RenderTableRow {TR} at (0,54) size 743x54 - RenderTableCell {TD} at (5,69) size 186x24 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,2) size 50x19 - text run at (3,2) width 50: "Cell one" - RenderTableCell {TD} at (195,54) size 544x54 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,2) size 538x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (3,22) size 156x30 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 154x28 - RenderTableRow {TR} at (0,2) size 154x24 - RenderTableCell {TD} at (2,2) size 150x24 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (3,2) size 145x19 - text run at (3,2) width 145: "Nested single-cell table!" + RenderTableCell {TD} at (5,69) size 188x24 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,2) size 53x19 + text run at (3,2) width 53: "Cell one" + RenderTableCell {TD} at (197,54) size 542x54 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,2) size 536x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (3,22) size 162x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 160x28 + RenderTableRow {TR} at (0,2) size 160x24 + RenderTableCell {TD} at (2,2) size 156x24 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (3,2) size 151x19 + text run at (3,2) width 151: "Nested single-cell table!" RenderBlock {UL} at (5,263) size 745x160 RenderListItem {LI} at (40,0) size 705x80 [border: none (3px solid #000000)] RenderBlock (anonymous) at (3,0) size 702x20 RenderListMarker at (-21,0) size 7x19: bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "This is a list item..." RenderBlock {UL} at (3,20) size 702x60 RenderListItem {LI} at (40,0) size 662x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." + RenderText {#text} at (0,0) size 73x19 + text run at (0,0) width 73: "...and this..." RenderListItem {LI} at (40,20) size 662x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." + RenderText {#text} at (0,0) size 115x19 + text run at (0,0) width 115: "...is a second list..." RenderListItem {LI} at (40,40) size 662x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." + RenderText {#text} at (0,0) size 176x19 + text run at (0,0) width 176: "...nested within the list item." RenderListItem {LI} at (40,80) size 705x20 [border: none (3px solid #800080)] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (3,0) size 149x19 - text run at (3,0) width 149: "This is a second list item." + RenderText {#text} at (3,0) size 158x19 + text run at (3,0) width 158: "This is a second list item." RenderListItem {LI} at (40,100) size 705x60 [border: none (3px solid #0000FF)] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (3,0) size 702x59 - text run at (3,0) width 658: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors. " - text run at (661,0) width 23: "The" - text run at (3,20) width 702: "first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within the" - text run at (3,40) width 444: "list item.\"), even though the nested list does not have any border styles set." + RenderText {#text} at (3,0) size 691x59 + text run at (3,0) width 691: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors." + text run at (3,20) width 641: "The first item's border should travel the entire height the nested list (to end near the baseline of the line" + text run at (3,40) width 597: "\"...nested within the list item.\"), even though the nested list does not have any border styles set." layer at (8,169) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,161) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_left_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_left_inline-expected.txt index df7373ac5a2e..7660367b3a92 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_left_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_left_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (20,0) size 764x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x64 RenderText {#text} at (0,0) size 312x64 text run at (0,0) width 176: "P {margin-left: 20px;}" @@ -16,46 +16,47 @@ layer at (0,0) size 800x600 text run at (304,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (20,131) size 764x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 723x19 - text run at (0,0) width 723: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with classes of " - RenderInline {SPAN} at (0,0) size 762x39 [border: none (10px double #800080)] - RenderText {#text} at (733,0) size 762x39 - text run at (733,0) width 29: "class" - text run at (0,20) width 22: "one" - RenderText {#text} at (22,20) size 371x19 - text run at (22,20) width 371: ", which should have a 10-pixel purple double left border; and " - RenderInline {SPAN} at (0,0) size 57x19 [border: none (1px solid #800080)] - RenderText {#text} at (394,20) size 56x19 - text run at (394,20) width 56: "class two" - RenderText {#text} at (450,20) size 749x39 - text run at (450,20) width 299: ", which should have a thin solid purple left border." - text run at (0,40) width 402: "The line-height of the parent element should not change on any line." + RenderText {#text} at (0,0) size 760x19 + text run at (0,0) width 760: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with classes of" + RenderInline {SPAN} at (0,0) size 67x19 [border: none (10px double #800080)] + RenderText {#text} at (10,20) size 57x19 + text run at (10,20) width 57: "class one" + RenderText {#text} at (67,20) size 389x19 + text run at (67,20) width 389: ", which should have a 10-pixel purple double left border; and " + RenderInline {SPAN} at (0,0) size 59x19 [border: none (1px solid #800080)] + RenderText {#text} at (457,20) size 58x19 + text run at (457,20) width 58: "class two" + RenderText {#text} at (515,20) size 759x39 + text run at (515,20) width 244: ", which should have a thin solid purple" + text run at (0,40) width 72: "left border. " + text run at (72,40) width 429: "The line-height of the parent element should not change on any line." RenderTable {TABLE} at (0,207) size 784x98 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x96 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x68 RenderTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (24,4) size 742x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 719x19 - text run at (0,0) width 719: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with classes of" - RenderInline {SPAN} at (0,0) size 65x19 [border: none (10px double #800080)] - RenderText {#text} at (10,20) size 55x19 - text run at (10,20) width 55: "class one" - RenderText {#text} at (65,20) size 371x19 - text run at (65,20) width 371: ", which should have a 10-pixel purple double left border; and " - RenderInline {SPAN} at (0,0) size 57x19 [border: none (1px solid #800080)] - RenderText {#text} at (437,20) size 56x19 - text run at (437,20) width 56: "class two" - RenderText {#text} at (493,20) size 721x39 - text run at (493,20) width 228: ", which should have a thin solid purple" - text run at (0,40) width 71: "left border. " - text run at (71,40) width 402: "The line-height of the parent element should not change on any line." + RenderText {#text} at (0,0) size 696x39 + text run at (0,0) width 696: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with" + text run at (0,20) width 64: "classes of " + RenderInline {SPAN} at (0,0) size 67x19 [border: none (10px double #800080)] + RenderText {#text} at (74,20) size 57x19 + text run at (74,20) width 57: "class one" + RenderText {#text} at (131,20) size 389x19 + text run at (131,20) width 389: ", which should have a 10-pixel purple double left border; and " + RenderInline {SPAN} at (0,0) size 59x19 [border: none (1px solid #800080)] + RenderText {#text} at (521,20) size 58x19 + text run at (521,20) width 58: "class two" + RenderText {#text} at (579,20) size 717x39 + text run at (579,20) width 138: ", which should have a" + text run at (0,40) width 178: "thin solid purple left border. " + text run at (178,40) width 429: "The line-height of the parent element should not change on any line." layer at (8,121) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_left_width-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_left_width-expected.txt index 6077bf7a7252..694cd6b38b77 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_left_width-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_left_width-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x793 +layer at (0,0) size 785x873 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x793 - RenderBlock {HTML} at (0,0) size 785x793 - RenderBody {BODY} at (8,8) size 769x777 [bgcolor=#CCCCCC] +layer at (0,0) size 785x873 + RenderBlock {HTML} at (0,0) size 785x873 + RenderBody {BODY} at (8,8) size 769x857 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 448x96 text run at (0,0) width 440: ".zero {background-color: silver; border-left-width: 0;}" @@ -21,80 +21,84 @@ layer at (0,0) size 785x793 text run at (0,80) width 256: ".five {border-left-width: 25px;}" text run at (256,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" RenderBlock {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,235) size 769x46 [border: (3px solid #000000) (50px solid #000000)] - RenderText {#text} at (50,3) size 697x39 - text run at (50,3) width 697: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more than one" - text run at (50,23) width 53: "line long." + RenderText {#text} at (50,3) size 713x39 + text run at (50,3) width 713: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more than" + text run at (50,23) width 86: "one line long." RenderBlock {P} at (0,297) size 769x26 [border: (3px solid #000000) (5px solid #000000)] - RenderText {#text} at (5,3) size 713x19 - text run at (5,3) width 713: "This element should have a thick left border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (0,339) size 769x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 731x19 - text run at (3,3) width 731: "This element should have a medium left border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (0,381) size 769x26 [border: (3px solid #000000) (1px solid #000000)] - RenderText {#text} at (1,3) size 705x19 - text run at (1,3) width 705: "This element should have a thin left border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (0,423) size 769x20 - RenderText {#text} at (0,0) size 485x19 - text run at (0,0) width 485: "This element should have no border and no extra \"padding\" on its left side, as no " + RenderText {#text} at (5,3) size 760x19 + text run at (5,3) width 760: "This element should have a thick left border width, which will be more obvious if the element is more than one line long." + RenderBlock {P} at (0,339) size 769x46 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 744x39 + text run at (3,3) width 744: "This element should have a medium left border width, which will be more obvious if the element is more than one line" + text run at (3,23) width 32: "long." + RenderBlock {P} at (0,401) size 769x26 [border: (3px solid #000000) (1px solid #000000)] + RenderText {#text} at (1,3) size 753x19 + text run at (1,3) width 753: "This element should have a thin left border width, which will be more obvious if the element is more than one line long." + RenderBlock {P} at (0,443) size 769x20 + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "This element should have no border and no extra \"padding\" on its left side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (485,3) size 96x16 - text run at (485,3) width 96: "border-style" - RenderText {#text} at (581,0) size 53x19 - text run at (581,0) width 53: " was set." - RenderTable {TABLE} at (0,459) size 769x318 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x316 + RenderText {#text} at (513,3) size 96x16 + text run at (513,3) width 96: "border-style" + RenderText {#text} at (609,0) size 54x19 + text run at (609,0) width 54: " was set." + RenderTable {TABLE} at (0,479) size 769x378 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x376 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x288 - RenderTableCell {TD} at (0,158) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x348 + RenderTableCell {TD} at (0,188) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x288 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x348 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" RenderBlock {P} at (4,40) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,76) size 747x46 [border: (3px solid #000000) (50px solid #000000)] - RenderText {#text} at (50,3) size 671x39 - text run at (50,3) width 671: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more than" - text run at (50,23) width 79: "one line long." - RenderBlock {P} at (4,138) size 747x26 [border: (3px solid #000000) (5px solid #000000)] - RenderText {#text} at (5,3) size 713x19 - text run at (5,3) width 713: "This element should have a thick left border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (4,180) size 747x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 731x19 - text run at (3,3) width 731: "This element should have a medium left border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (4,222) size 747x26 [border: (3px solid #000000) (1px solid #000000)] - RenderText {#text} at (1,3) size 705x19 - text run at (1,3) width 705: "This element should have a thin left border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (4,264) size 747x20 - RenderText {#text} at (0,0) size 485x19 - text run at (0,0) width 485: "This element should have no border and no extra \"padding\" on its left side, as no " + RenderText {#text} at (50,3) size 682x39 + text run at (50,3) width 682: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more" + text run at (50,23) width 117: "than one line long." + RenderBlock {P} at (4,138) size 747x46 [border: (3px solid #000000) (5px solid #000000)] + RenderText {#text} at (5,3) size 724x39 + text run at (5,3) width 724: "This element should have a thick left border width, which will be more obvious if the element is more than one line" + text run at (5,23) width 32: "long." + RenderBlock {P} at (4,200) size 747x46 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 717x39 + text run at (3,3) width 717: "This element should have a medium left border width, which will be more obvious if the element is more than one" + text run at (3,23) width 59: "line long." + RenderBlock {P} at (4,262) size 747x46 [border: (3px solid #000000) (1px solid #000000)] + RenderText {#text} at (1,3) size 717x39 + text run at (1,3) width 717: "This element should have a thin left border width, which will be more obvious if the element is more than one line" + text run at (1,23) width 32: "long." + RenderBlock {P} at (4,324) size 747x20 + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "This element should have no border and no extra \"padding\" on its left side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (485,3) size 96x16 - text run at (485,3) width 96: "border-style" - RenderText {#text} at (581,0) size 53x19 - text run at (581,0) width 53: " was set." + RenderText {#text} at (513,3) size 96x16 + text run at (513,3) width 96: "border-style" + RenderText {#text} at (609,0) size 54x19 + text run at (609,0) width 54: " was set." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_left_width_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_left_width_inline-expected.txt index 28424a6607a0..267a704428f0 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_left_width_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_left_width_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 416x48 text run at (0,0) width 416: ".one {border-left-width: 25px; border-style: solid;}" @@ -14,83 +14,85 @@ layer at (0,0) size 800x600 text run at (416,16) width 0: " " text run at (0,32) width 264: ".three {border-left-width: 25px;}" text run at (264,32) width 0: " " - RenderBlock {P} at (0,115) size 784x66 [border: (3px solid #000000) (25px solid #000000)] - RenderText {#text} at (25,3) size 163x19 - text run at (25,3) width 163: "This element has a class of " + RenderBlock {P} at (0,115) size 784x86 [border: (3px solid #000000) (25px solid #000000)] + RenderText {#text} at (25,3) size 172x19 + text run at (25,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (188,6) size 24x16 - text run at (188,6) width 24: "one" - RenderText {#text} at (212,3) size 154x19 - text run at (212,3) width 8: ". " - text run at (220,3) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 161x25 [border: (3px solid #000000) (1px solid #000000)] - RenderText {#text} at (367,3) size 133x19 - text run at (367,3) width 133: "inline element of class " + RenderText {#text} at (197,6) size 24x16 + text run at (197,6) width 24: "one" + RenderText {#text} at (221,3) size 162x19 + text run at (221,3) width 8: ". " + text run at (229,3) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 171x25 [border: (3px solid #000000) (1px solid #000000)] + RenderText {#text} at (384,3) size 143x19 + text run at (384,3) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (500,6) size 24x16 - text run at (500,6) width 24: "two" - RenderText {#text} at (527,3) size 751x39 - text run at (527,3) width 249: ", which should result in a thin solid border" - text run at (25,23) width 129: "on the left side of the " + RenderText {#text} at (527,6) size 24x16 + text run at (527,6) width 24: "two" + RenderText {#text} at (554,3) size 749x39 + text run at (554,3) width 220: ", which should result in a thin solid" + text run at (25,23) width 181: "border on the left side of the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (154,23) size 27x19 - text run at (154,23) width 27: "first" - RenderText {#text} at (181,23) size 575x19 - text run at (181,23) width 481: " box in the inline element (and the UA's default border on the other three sides). " - text run at (662,23) width 94: "There is also an" - RenderInline {SPAN} at (0,0) size 173x19 - RenderText {#text} at (25,43) size 133x19 - text run at (25,43) width 133: "inline element of class " + RenderText {#text} at (206,23) size 27x19 + text run at (206,23) width 27: "first" + RenderText {#text} at (233,23) size 750x39 + text run at (233,23) width 505: " box in the inline element (and the UA's default border on the other three sides). " + text run at (738,23) width 37: "There" + text run at (25,43) width 62: "is also an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (87,43) size 143x19 + text run at (87,43) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (158,46) size 40x16 - text run at (158,46) width 40: "three" - RenderText {#text} at (198,43) size 545x19 - text run at (198,43) width 545: ", which should have no left border width or visible border because no border style was set." - RenderTable {TABLE} at (0,197) size 784x124 [border: (1px outset #808080)] + RenderText {#text} at (230,46) size 40x16 + text run at (230,46) width 40: "three" + RenderText {#text} at (270,43) size 727x39 + text run at (270,43) width 482: ", which should have no left border width or visible border because no border" + text run at (25,63) width 83: "style was set." + RenderTable {TABLE} at (0,217) size 784x124 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x122 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x94 RenderTableCell {TD} at (0,61) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x86 [border: (3px solid #000000) (25px solid #000000)] - RenderText {#text} at (25,3) size 163x19 - text run at (25,3) width 163: "This element has a class of " + RenderText {#text} at (25,3) size 172x19 + text run at (25,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (188,6) size 24x16 - text run at (188,6) width 24: "one" - RenderText {#text} at (212,3) size 154x19 - text run at (212,3) width 8: ". " - text run at (220,3) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 161x25 [border: (3px solid #000000) (1px solid #000000)] - RenderText {#text} at (367,3) size 133x19 - text run at (367,3) width 133: "inline element of class " + RenderText {#text} at (197,6) size 24x16 + text run at (197,6) width 24: "one" + RenderText {#text} at (221,3) size 162x19 + text run at (221,3) width 8: ". " + text run at (229,3) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 171x25 [border: (3px solid #000000) (1px solid #000000)] + RenderText {#text} at (384,3) size 143x19 + text run at (384,3) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (500,6) size 24x16 - text run at (500,6) width 24: "two" - RenderText {#text} at (527,3) size 706x39 - text run at (527,3) width 204: ", which should result in a thin solid" - text run at (25,23) width 174: "border on the left side of the " + RenderText {#text} at (527,6) size 24x16 + text run at (527,6) width 24: "two" + RenderText {#text} at (554,3) size 715x39 + text run at (554,3) width 186: ", which should result in a thin" + text run at (25,23) width 215: "solid border on the left side of the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (199,23) size 27x19 - text run at (199,23) width 27: "first" - RenderText {#text} at (226,23) size 730x39 - text run at (226,23) width 481: " box in the inline element (and the UA's default border on the other three sides). " - text run at (707,23) width 48: "There is" - text run at (25,43) width 46: "also an " - RenderInline {SPAN} at (0,0) size 173x19 - RenderText {#text} at (71,43) size 133x19 - text run at (71,43) width 133: "inline element of class " + RenderText {#text} at (240,23) size 27x19 + text run at (240,23) width 27: "first" + RenderText {#text} at (267,23) size 699x39 + text run at (267,23) width 457: " box in the inline element (and the UA's default border on the other three" + text run at (25,43) width 44: "sides). " + text run at (69,43) width 103: "There is also an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (172,43) size 143x19 + text run at (172,43) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (204,46) size 40x16 - text run at (204,46) width 40: "three" - RenderText {#text} at (244,43) size 711x39 - text run at (244,43) width 492: ", which should have no left border width or visible border because no border style" - text run at (25,63) width 49: "was set." + RenderText {#text} at (315,46) size 40x16 + text run at (315,46) width 40: "three" + RenderText {#text} at (355,43) size 693x39 + text run at (355,43) width 363: ", which should have no left border width or visible border" + text run at (25,63) width 202: "because no border style was set." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_right-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_right-expected.txt index f84d7d2dabdd..681532bcdc33 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_right-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_right-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 764x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x64 RenderText {#text} at (0,0) size 320x64 text run at (0,0) width 184: "P {margin-right: 20px;}" @@ -16,47 +16,48 @@ layer at (0,0) size 800x600 text run at (312,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 764x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 731x19 - text run at (0,0) width 731: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with classes of " - RenderInline {SPAN} at (0,0) size 760x39 [border: none (10px double #800080) none] - RenderText {#text} at (731,0) size 760x39 - text run at (731,0) width 29: "class" - text run at (0,20) width 22: "one" - RenderText {#text} at (32,20) size 379x19 - text run at (32,20) width 379: ", which should have a 10-pixel purple double right border; and " - RenderInline {SPAN} at (0,0) size 57x19 [border: none (1px solid #800080) none] - RenderText {#text} at (411,20) size 56x19 - text run at (411,20) width 56: "class two" - RenderText {#text} at (468,20) size 726x39 - text run at (468,20) width 258: ", which should have a thin solid purple right" - text run at (0,40) width 49: "border. " - text run at (49,40) width 402: "The line-height of the parent element should not change on any line." + RenderText {#text} at (0,0) size 752x39 + text run at (0,0) width 752: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with classes" + text run at (0,20) width 17: "of " + RenderInline {SPAN} at (0,0) size 67x19 [border: none (10px double #800080) none] + RenderText {#text} at (17,20) size 57x19 + text run at (17,20) width 57: "class one" + RenderText {#text} at (84,20) size 398x19 + text run at (84,20) width 398: ", which should have a 10-pixel purple double right border; and " + RenderInline {SPAN} at (0,0) size 59x19 [border: none (1px solid #800080) none] + RenderText {#text} at (482,20) size 58x19 + text run at (482,20) width 58: "class two" + RenderText {#text} at (541,20) size 741x39 + text run at (541,20) width 200: ", which should have a thin solid" + text run at (0,40) width 125: "purple right border. " + text run at (125,40) width 429: "The line-height of the parent element should not change on any line." RenderTable {TABLE} at (0,207) size 784x98 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x96 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x68 RenderTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 742x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 727x19 - text run at (0,0) width 727: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with classes of" - RenderInline {SPAN} at (0,0) size 65x19 [border: none (10px double #800080) none] - RenderText {#text} at (0,20) size 55x19 - text run at (0,20) width 55: "class one" - RenderText {#text} at (65,20) size 379x19 - text run at (65,20) width 379: ", which should have a 10-pixel purple double right border; and " - RenderInline {SPAN} at (0,0) size 57x19 [border: none (1px solid #800080) none] - RenderText {#text} at (444,20) size 56x19 - text run at (444,20) width 56: "class two" - RenderText {#text} at (501,20) size 729x39 - text run at (501,20) width 228: ", which should have a thin solid purple" - text run at (0,40) width 79: "right border. " - text run at (79,40) width 402: "The line-height of the parent element should not change on any line." + RenderText {#text} at (0,0) size 705x39 + text run at (0,0) width 705: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with" + text run at (0,20) width 64: "classes of " + RenderInline {SPAN} at (0,0) size 67x19 [border: none (10px double #800080) none] + RenderText {#text} at (64,20) size 57x19 + text run at (64,20) width 57: "class one" + RenderText {#text} at (131,20) size 398x19 + text run at (131,20) width 398: ", which should have a 10-pixel purple double right border; and " + RenderInline {SPAN} at (0,0) size 59x19 [border: none (1px solid #800080) none] + RenderText {#text} at (529,20) size 58x19 + text run at (529,20) width 58: "class two" + RenderText {#text} at (588,20) size 726x39 + text run at (588,20) width 138: ", which should have a" + text run at (0,40) width 187: "thin solid purple right border. " + text run at (187,40) width 429: "The line-height of the parent element should not change on any line." layer at (8,121) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_right_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_right_inline-expected.txt index 848a82d7c22e..94ed4832c596 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_right_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_right_inline-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1143 +layer at (0,0) size 785x1163 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1143 - RenderBlock {HTML} at (0,0) size 785x1143 - RenderBody {BODY} at (8,8) size 769x1127 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1163 + RenderBlock {HTML} at (0,0) size 785x1163 + RenderBody {BODY} at (8,8) size 769x1147 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 749x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x112 RenderText {#text} at (0,0) size 352x112 text run at (0,0) width 184: "P {margin-right: 20px;}" @@ -23,146 +23,145 @@ layer at (0,0) size 785x1143 text run at (0,96) width 280: "TD {border-right: green 2px solid;}" text run at (280,96) width 0: " " RenderBlock {P} at (0,179) size 749x40 - RenderText {#text} at (0,0) size 728x39 - text run at (0,0) width 612: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " - text run at (612,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 716x39 + text run at (0,0) width 643: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " + text run at (643,0) width 73: "This border" + text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." RenderBlock {P} at (0,235) size 749x20 [border: none (10px double #800080) none] - RenderText {#text} at (0,0) size 404x19 - text run at (0,0) width 404: "This paragraph should have a purple, double, 10-pixel right border." + RenderText {#text} at (0,0) size 422x19 + text run at (0,0) width 422: "This paragraph should have a purple, double, 10-pixel right border." RenderBlock {P} at (0,271) size 749x20 [border: none (1px solid #800080) none] - RenderText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This paragraph should have a thin purple right border." + RenderText {#text} at (0,0) size 339x19 + text run at (0,0) width 339: "This paragraph should have a thin purple right border." RenderTable {TABLE} at (0,307) size 769x115 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x113 RenderTableRow {TR} at (0,5) size 767x44 RenderTableCell {TD} at (5,5) size 758x44 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,2) size 751x39 - text run at (2,2) width 414: "Every cell in this table should have a 2-pixel solid green right border. " - text run at (416,2) width 337: "This is also true of the table-testing section in the second" - text run at (2,22) width 121: "half of the test page." + RenderText {#text} at (2,2) size 743x39 + text run at (2,2) width 437: "Every cell in this table should have a 2-pixel solid green right border. " + text run at (439,2) width 306: "This is also true of the table-testing section in the" + text run at (2,22) width 175: "second half of the test page." RenderTableRow {TR} at (0,54) size 767x54 - RenderTableCell {TD} at (5,69) size 192x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 50x19 - text run at (2,2) width 50: "Cell one" - RenderTableCell {TD} at (201,54) size 562x54 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,2) size 556x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (2,22) size 156x30 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 154x28 - RenderTableRow {TR} at (0,2) size 154x24 - RenderTableCell {TD} at (2,2) size 150x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 145x19 - text run at (2,2) width 145: "Nested single-cell table!" + RenderTableCell {TD} at (5,69) size 194x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 53x19 + text run at (2,2) width 53: "Cell one" + RenderTableCell {TD} at (203,54) size 560x54 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,2) size 554x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (2,22) size 162x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 160x28 + RenderTableRow {TR} at (0,2) size 160x24 + RenderTableCell {TD} at (2,2) size 156x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 151x19 + text run at (2,2) width 151: "Nested single-cell table!" RenderBlock {UL} at (0,438) size 769x180 RenderListItem {LI} at (40,0) size 729x80 [border: none (3px solid #000000) none] RenderBlock (anonymous) at (0,0) size 726x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "This is a list item..." RenderBlock {UL} at (0,20) size 726x60 RenderListItem {LI} at (40,0) size 686x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." + RenderText {#text} at (0,0) size 73x19 + text run at (0,0) width 73: "...and this..." RenderListItem {LI} at (40,20) size 686x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." + RenderText {#text} at (0,0) size 115x19 + text run at (0,0) width 115: "...is a second list..." RenderListItem {LI} at (40,40) size 686x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." + RenderText {#text} at (0,0) size 176x19 + text run at (0,0) width 176: "...nested within the list item." RenderListItem {LI} at (40,80) size 729x20 [border: none (3px solid #800080) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "This is a second list item." + RenderText {#text} at (0,0) size 158x19 + text run at (0,0) width 158: "This is a second list item." RenderListItem {LI} at (40,100) size 729x80 [border: none (3px solid #0000FF) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 715x79 - text run at (0,0) width 666: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors. " - text run at (666,0) width 49: "The first" - text run at (0,20) width 696: "item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within the list" - text run at (0,40) width 428: "item.\"), even though the nested list does not have any border styles set. " - text run at (428,40) width 280: "The borders should line up together at the right" - text run at (0,60) width 474: "edge of the document's body, as each list element has a default width of 100%." - RenderTable {TABLE} at (0,634) size 769x493 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x491 + RenderText {#text} at (0,0) size 707x79 + text run at (0,0) width 700: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors." + text run at (0,20) width 704: "The first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested" + text run at (0,40) width 538: "within the list item.\"), even though the nested list does not have any border styles set. " + text run at (538,40) width 169: "The borders should line up" + text run at (0,60) width 620: "together at the right edge of the document's body, as each list element has a default width of 100%." + RenderTable {TABLE} at (0,634) size 769x513 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x511 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x463 - RenderTableCell {TD} at (0,245) size 13x29 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x483 + RenderTableCell {TD} at (0,255) size 13x29 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " - RenderTableCell {TD} at (13,28) size 754x463 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (13,28) size 754x483 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 725x40 - RenderText {#text} at (0,0) size 682x39 - text run at (0,0) width 612: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " - text run at (612,0) width 70: "This border" - text run at (0,20) width 345: "applies only to the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 716x39 + text run at (0,0) width 643: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " + text run at (643,0) width 73: "This border" + text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." RenderBlock {P} at (4,60) size 725x20 [border: none (10px double #800080) none] - RenderText {#text} at (0,0) size 404x19 - text run at (0,0) width 404: "This paragraph should have a purple, double, 10-pixel right border." + RenderText {#text} at (0,0) size 422x19 + text run at (0,0) width 422: "This paragraph should have a purple, double, 10-pixel right border." RenderBlock {P} at (4,96) size 725x20 [border: none (1px solid #800080) none] - RenderText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This paragraph should have a thin purple right border." + RenderText {#text} at (0,0) size 339x19 + text run at (0,0) width 339: "This paragraph should have a thin purple right border." RenderTable {TABLE} at (4,132) size 745x115 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 743x113 RenderTableRow {TR} at (0,5) size 743x44 RenderTableCell {TD} at (5,5) size 734x44 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,2) size 704x39 - text run at (2,2) width 414: "Every cell in this table should have a 2-pixel solid green right border. " - text run at (416,2) width 290: "This is also true of the table-testing section in the" - text run at (2,22) width 168: "second half of the test page." + RenderText {#text} at (2,2) size 720x39 + text run at (2,2) width 437: "Every cell in this table should have a 2-pixel solid green right border. " + text run at (439,2) width 283: "This is also true of the table-testing section in" + text run at (2,22) width 198: "the second half of the test page." RenderTableRow {TR} at (0,54) size 743x54 - RenderTableCell {TD} at (5,69) size 186x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 50x19 - text run at (2,2) width 50: "Cell one" - RenderTableCell {TD} at (195,54) size 544x54 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,2) size 538x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (2,22) size 156x30 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 154x28 - RenderTableRow {TR} at (0,2) size 154x24 - RenderTableCell {TD} at (2,2) size 150x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 145x19 - text run at (2,2) width 145: "Nested single-cell table!" - RenderBlock {UL} at (4,263) size 745x180 + RenderTableCell {TD} at (5,69) size 188x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 53x19 + text run at (2,2) width 53: "Cell one" + RenderTableCell {TD} at (197,54) size 542x54 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,2) size 536x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (2,22) size 162x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 160x28 + RenderTableRow {TR} at (0,2) size 160x24 + RenderTableCell {TD} at (2,2) size 156x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 151x19 + text run at (2,2) width 151: "Nested single-cell table!" + RenderBlock {UL} at (4,263) size 745x200 RenderListItem {LI} at (40,0) size 705x80 [border: none (3px solid #000000) none] RenderBlock (anonymous) at (0,0) size 702x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "This is a list item..." RenderBlock {UL} at (0,20) size 702x60 RenderListItem {LI} at (40,0) size 662x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." + RenderText {#text} at (0,0) size 73x19 + text run at (0,0) width 73: "...and this..." RenderListItem {LI} at (40,20) size 662x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." + RenderText {#text} at (0,0) size 115x19 + text run at (0,0) width 115: "...is a second list..." RenderListItem {LI} at (40,40) size 662x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." + RenderText {#text} at (0,0) size 176x19 + text run at (0,0) width 176: "...nested within the list item." RenderListItem {LI} at (40,80) size 705x20 [border: none (3px solid #800080) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "This is a second list item." - RenderListItem {LI} at (40,100) size 705x80 [border: none (3px solid #0000FF) none] + RenderText {#text} at (0,0) size 158x19 + text run at (0,0) width 158: "This is a second list item." + RenderListItem {LI} at (40,100) size 705x100 [border: none (3px solid #0000FF) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 702x79 - text run at (0,0) width 666: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors. " - text run at (666,0) width 23: "The" - text run at (0,20) width 702: "first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within the" - text run at (0,40) width 448: "list item.\"), even though the nested list does not have any border styles set. " - text run at (448,40) width 250: "The borders should line up together at the" - text run at (0,60) width 504: "right edge of the document's body, as each list element has a default width of 100%." + RenderText {#text} at (0,0) size 700x99 + text run at (0,0) width 700: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors." + text run at (0,20) width 641: "The first item's border should travel the entire height the nested list (to end near the baseline of the line" + text run at (0,40) width 601: "\"...nested within the list item.\"), even though the nested list does not have any border styles set. " + text run at (601,40) width 76: "The borders" + text run at (0,60) width 668: "should line up together at the right edge of the document's body, as each list element has a default width of" + text run at (0,80) width 41: "100%." layer at (8,169) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,161) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_right_width-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_right_width-expected.txt index 03023f341c54..5f79973b678b 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_right_width-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_right_width-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x793 +layer at (0,0) size 785x893 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x793 - RenderBlock {HTML} at (0,0) size 785x793 - RenderBody {BODY} at (8,8) size 769x777 [bgcolor=#CCCCCC] +layer at (0,0) size 785x893 + RenderBlock {HTML} at (0,0) size 785x893 + RenderBody {BODY} at (8,8) size 769x877 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 456x96 text run at (0,0) width 448: ".zero {background-color: silver; border-right-width: 0;}" @@ -21,80 +21,85 @@ layer at (0,0) size 785x793 text run at (0,80) width 272: ".five {border-right-width: 100px;}" text run at (272,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" RenderBlock {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,235) size 769x46 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 729x39 - text run at (3,3) width 729: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more than one line" - text run at (3,23) width 29: "long." - RenderBlock {P} at (0,297) size 769x26 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 721x19 - text run at (3,3) width 721: "This element should have a thick right border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (0,339) size 769x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 739x19 - text run at (3,3) width 739: "This element should have a medium right border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (0,381) size 769x26 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 713x19 - text run at (3,3) width 713: "This element should have a thin right border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (0,423) size 769x20 - RenderText {#text} at (0,0) size 493x19 - text run at (0,0) width 493: "This element should have no border and no extra \"padding\" on its right side, as no " + RenderText {#text} at (3,3) size 722x39 + text run at (3,3) width 722: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more than" + text run at (3,23) width 86: "one line long." + RenderBlock {P} at (0,297) size 769x46 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 733x39 + text run at (3,3) width 733: "This element should have a thick right border width, which will be more obvious if the element is more than one line" + text run at (3,23) width 32: "long." + RenderBlock {P} at (0,359) size 769x46 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 753x39 + text run at (3,3) width 753: "This element should have a medium right border width, which will be more obvious if the element is more than one line" + text run at (3,23) width 32: "long." + RenderBlock {P} at (0,421) size 769x26 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 762x19 + text run at (3,3) width 762: "This element should have a thin right border width, which will be more obvious if the element is more than one line long." + RenderBlock {P} at (0,463) size 769x20 + RenderText {#text} at (0,0) size 522x19 + text run at (0,0) width 522: "This element should have no border and no extra \"padding\" on its right side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (493,3) size 96x16 - text run at (493,3) width 96: "border-style" - RenderText {#text} at (589,0) size 53x19 - text run at (589,0) width 53: " was set." - RenderTable {TABLE} at (0,459) size 769x318 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x316 + RenderText {#text} at (522,3) size 96x16 + text run at (522,3) width 96: "border-style" + RenderText {#text} at (618,0) size 54x19 + text run at (618,0) width 54: " was set." + RenderTable {TABLE} at (0,499) size 769x378 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x376 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x288 - RenderTableCell {TD} at (0,158) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x348 + RenderTableCell {TD} at (0,188) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x288 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x348 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" RenderBlock {P} at (4,40) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,76) size 747x46 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 705x39 - text run at (3,3) width 705: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more than one" - text run at (3,23) width 53: "line long." - RenderBlock {P} at (4,138) size 747x26 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 721x19 - text run at (3,3) width 721: "This element should have a thick right border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (4,180) size 747x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 739x19 - text run at (3,3) width 739: "This element should have a medium right border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (4,222) size 747x26 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 713x19 - text run at (3,3) width 713: "This element should have a thin right border width, which will be more obvious if the element is more than one line long." - RenderBlock {P} at (4,264) size 747x20 - RenderText {#text} at (0,0) size 493x19 - text run at (0,0) width 493: "This element should have no border and no extra \"padding\" on its right side, as no " + RenderText {#text} at (3,3) size 691x39 + text run at (3,3) width 691: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more" + text run at (3,23) width 117: "than one line long." + RenderBlock {P} at (4,138) size 747x46 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 733x39 + text run at (3,3) width 733: "This element should have a thick right border width, which will be more obvious if the element is more than one line" + text run at (3,23) width 32: "long." + RenderBlock {P} at (4,200) size 747x46 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 726x39 + text run at (3,3) width 726: "This element should have a medium right border width, which will be more obvious if the element is more than one" + text run at (3,23) width 59: "line long." + RenderBlock {P} at (4,262) size 747x46 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 726x39 + text run at (3,3) width 726: "This element should have a thin right border width, which will be more obvious if the element is more than one line" + text run at (3,23) width 32: "long." + RenderBlock {P} at (4,324) size 747x20 + RenderText {#text} at (0,0) size 522x19 + text run at (0,0) width 522: "This element should have no border and no extra \"padding\" on its right side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (493,3) size 96x16 - text run at (493,3) width 96: "border-style" - RenderText {#text} at (589,0) size 53x19 - text run at (589,0) width 53: " was set." + RenderText {#text} at (522,3) size 96x16 + text run at (522,3) width 96: "border-style" + RenderText {#text} at (618,0) size 54x19 + text run at (618,0) width 54: " was set." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_right_width_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_right_width_inline-expected.txt index 385a1d5df323..ba06e0ef18ea 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_right_width_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_right_width_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 424x48 text run at (0,0) width 424: ".one {border-right-width: 25px; border-style: solid;}" @@ -14,83 +14,85 @@ layer at (0,0) size 800x600 text run at (424,16) width 0: " " text run at (0,32) width 272: ".three {border-right-width: 25px;}" text run at (272,32) width 0: " " - RenderBlock {P} at (0,115) size 784x66 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 163x19 - text run at (3,3) width 163: "This element has a class of " + RenderBlock {P} at (0,115) size 784x86 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,3) size 172x19 + text run at (3,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (166,6) size 24x16 - text run at (166,6) width 24: "one" - RenderText {#text} at (190,3) size 154x19 - text run at (190,3) width 8: ". " - text run at (198,3) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 161x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (347,3) size 133x19 - text run at (347,3) width 133: "inline element of class " + RenderText {#text} at (175,6) size 24x16 + text run at (175,6) width 24: "one" + RenderText {#text} at (199,3) size 162x19 + text run at (199,3) width 8: ". " + text run at (207,3) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 171x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (364,3) size 143x19 + text run at (364,3) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (480,6) size 24x16 - text run at (480,6) width 24: "two" - RenderText {#text} at (505,3) size 751x39 - text run at (505,3) width 249: ", which should result in a thin solid border" - text run at (3,23) width 137: "on the right side of the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (140,23) size 24x19 - text run at (140,23) width 24: "last" - RenderText {#text} at (164,23) size 577x19 - text run at (164,23) width 483: " box of the inline element (and the UA's default border on the other three sides). " - text run at (647,23) width 94: "There is also an" - RenderInline {SPAN} at (0,0) size 173x19 - RenderText {#text} at (3,43) size 133x19 - text run at (3,43) width 133: "inline element of class " + RenderText {#text} at (507,6) size 24x16 + text run at (507,6) width 24: "two" + RenderText {#text} at (532,3) size 749x39 + text run at (532,3) width 220: ", which should result in a thin solid" + text run at (3,23) width 190: "border on the right side of the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (193,23) size 23x19 + text run at (193,23) width 23: "last" + RenderText {#text} at (216,23) size 756x39 + text run at (216,23) width 506: " box of the inline element (and the UA's default border on the other three sides). " + text run at (722,23) width 37: "There" + text run at (3,43) width 62: "is also an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (65,43) size 143x19 + text run at (65,43) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (136,46) size 40x16 - text run at (136,46) width 40: "three" - RenderText {#text} at (176,43) size 553x19 - text run at (176,43) width 553: ", which should have no right border width or visible border because no border style was set." - RenderTable {TABLE} at (0,197) size 784x124 [border: (1px outset #808080)] + RenderText {#text} at (208,46) size 40x16 + text run at (208,46) width 40: "three" + RenderText {#text} at (248,43) size 736x39 + text run at (248,43) width 491: ", which should have no right border width or visible border because no border" + text run at (3,63) width 83: "style was set." + RenderTable {TABLE} at (0,217) size 784x124 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x122 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x94 RenderTableCell {TD} at (0,61) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x86 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,3) size 163x19 - text run at (3,3) width 163: "This element has a class of " + RenderText {#text} at (3,3) size 172x19 + text run at (3,3) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (166,6) size 24x16 - text run at (166,6) width 24: "one" - RenderText {#text} at (190,3) size 154x19 - text run at (190,3) width 8: ". " - text run at (198,3) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 161x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (347,3) size 133x19 - text run at (347,3) width 133: "inline element of class " + RenderText {#text} at (175,6) size 24x16 + text run at (175,6) width 24: "one" + RenderText {#text} at (199,3) size 162x19 + text run at (199,3) width 8: ". " + text run at (207,3) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 171x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (364,3) size 143x19 + text run at (364,3) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (480,6) size 24x16 - text run at (480,6) width 24: "two" - RenderText {#text} at (505,3) size 706x39 - text run at (505,3) width 204: ", which should result in a thin solid" - text run at (3,23) width 182: "border on the right side of the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (185,23) size 24x19 - text run at (185,23) width 24: "last" - RenderText {#text} at (209,23) size 724x39 - text run at (209,23) width 483: " box of the inline element (and the UA's default border on the other three sides). " - text run at (692,23) width 35: "There" - text run at (3,43) width 59: "is also an " - RenderInline {SPAN} at (0,0) size 173x19 - RenderText {#text} at (62,43) size 133x19 - text run at (62,43) width 133: "inline element of class " + RenderText {#text} at (507,6) size 24x16 + text run at (507,6) width 24: "two" + RenderText {#text} at (532,3) size 715x39 + text run at (532,3) width 186: ", which should result in a thin" + text run at (3,23) width 224: "solid border on the right side of the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (227,23) size 23x19 + text run at (227,23) width 23: "last" + RenderText {#text} at (250,23) size 705x39 + text run at (250,23) width 458: " box of the inline element (and the UA's default border on the other three" + text run at (3,43) width 44: "sides). " + text run at (47,43) width 103: "There is also an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (150,43) size 143x19 + text run at (150,43) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (195,46) size 40x16 - text run at (195,46) width 40: "three" - RenderText {#text} at (235,43) size 732x39 - text run at (235,43) width 500: ", which should have no right border width or visible border because no border style" - text run at (3,63) width 49: "was set." + RenderText {#text} at (293,46) size 40x16 + text run at (293,46) width 40: "three" + RenderText {#text} at (333,43) size 702x39 + text run at (333,43) width 372: ", which should have no right border width or visible border" + text run at (3,63) width 202: "because no border style was set." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_style-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_style-expected.txt index 44a7107c71c3..1076aec24950 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_style-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_style-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1369 RenderBlock {HTML} at (0,0) size 785x1369 RenderBody {BODY} at (8,8) size 769x1353 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x192 RenderText {#text} at (0,0) size 632x192 text run at (0,0) width 560: ".one {border-style: dotted; border-color: black; border-width: thick;}" @@ -33,90 +33,90 @@ layer at (0,0) size 785x1369 text run at (0,176) width 552: ".eleven {border-style: none; border-color: red; border-width: thick;}" text run at (552,176) width 0: " " RenderBlock {P} at (0,259) size 769x30 [border: (5px dotted #000000)] - RenderText {#text} at (5,5) size 452x19 - text run at (5,5) width 452: "This paragraph should have a thick black dotted border all the way around." + RenderText {#text} at (5,5) size 472x19 + text run at (5,5) width 472: "This paragraph should have a thick black dotted border all the way around." RenderBlock {P} at (0,305) size 769x30 [border: (5px dashed #000000)] - RenderText {#text} at (5,5) size 456x19 - text run at (5,5) width 456: "This paragraph should have a thick black dashed border all the way around." + RenderText {#text} at (5,5) size 477x19 + text run at (5,5) width 477: "This paragraph should have a thick black dashed border all the way around." RenderBlock {P} at (0,351) size 769x30 [border: (5px solid #000000)] - RenderText {#text} at (5,5) size 441x19 - text run at (5,5) width 441: "This paragraph should have a thick black solid border all the way around." + RenderText {#text} at (5,5) size 463x19 + text run at (5,5) width 463: "This paragraph should have a thick black solid border all the way around." RenderBlock {P} at (0,397) size 769x30 [border: (5px double #000000)] - RenderText {#text} at (5,5) size 454x19 - text run at (5,5) width 454: "This paragraph should have a thick black double border all the way around." + RenderText {#text} at (5,5) size 476x19 + text run at (5,5) width 476: "This paragraph should have a thick black double border all the way around." RenderBlock {P} at (0,443) size 769x30 [border: (5px groove #808000)] - RenderText {#text} at (5,5) size 450x19 - text run at (5,5) width 450: "This paragraph should have a thick olive groove border all the way around." + RenderText {#text} at (5,5) size 474x19 + text run at (5,5) width 474: "This paragraph should have a thick olive groove border all the way around." RenderBlock {P} at (0,489) size 769x30 [border: (5px ridge #808000)] - RenderText {#text} at (5,5) size 438x19 - text run at (5,5) width 438: "This paragraph should have a thick olive ridge border all the way around." + RenderText {#text} at (5,5) size 462x19 + text run at (5,5) width 462: "This paragraph should have a thick olive ridge border all the way around." RenderBlock {P} at (0,535) size 769x30 [border: (5px inset #808000)] - RenderText {#text} at (5,5) size 435x19 - text run at (5,5) width 435: "This paragraph should have a thick olive inset border all the way around." + RenderText {#text} at (5,5) size 459x19 + text run at (5,5) width 459: "This paragraph should have a thick olive inset border all the way around." RenderBlock {P} at (0,581) size 769x30 [border: (5px outset #808000)] - RenderText {#text} at (5,5) size 444x19 - text run at (5,5) width 444: "This paragraph should have a thick olive outset border all the way around." + RenderText {#text} at (5,5) size 467x19 + text run at (5,5) width 467: "This paragraph should have a thick olive outset border all the way around." RenderBlock {P} at (0,627) size 769x50 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] - RenderText {#text} at (5,5) size 748x39 - text run at (5,5) width 595: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " - text run at (600,5) width 153: "The color of all four sides" - text run at (5,25) width 163: "should be based on purple." + RenderText {#text} at (5,5) size 744x39 + text run at (5,5) width 617: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " + text run at (622,5) width 127: "The color of all four" + text run at (5,25) width 204: "sides should be based on purple." RenderBlock {P} at (0,693) size 769x50 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - RenderText {#text} at (5,5) size 747x39 - text run at (5,5) width 673: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " - text run at (678,5) width 74: "The color of" - text run at (5,25) width 242: "all four sides should be based on purple." + RenderText {#text} at (5,5) size 726x39 + text run at (5,5) width 701: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " + text run at (706,5) width 25: "The" + text run at (5,25) width 306: "color of all four sides should be based on purple." RenderBlock {P} at (0,759) size 769x20 - RenderText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This paragraph should have no border at all." + RenderText {#text} at (0,0) size 278x19 + text run at (0,0) width 278: "This paragraph should have no border at all." RenderTable {TABLE} at (0,795) size 769x558 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x556 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x528 RenderTableCell {TD} at (0,278) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x528 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x30 [border: (5px dotted #000000)] - RenderText {#text} at (5,5) size 452x19 - text run at (5,5) width 452: "This paragraph should have a thick black dotted border all the way around." + RenderText {#text} at (5,5) size 472x19 + text run at (5,5) width 472: "This paragraph should have a thick black dotted border all the way around." RenderBlock {P} at (4,50) size 747x30 [border: (5px dashed #000000)] - RenderText {#text} at (5,5) size 456x19 - text run at (5,5) width 456: "This paragraph should have a thick black dashed border all the way around." + RenderText {#text} at (5,5) size 477x19 + text run at (5,5) width 477: "This paragraph should have a thick black dashed border all the way around." RenderBlock {P} at (4,96) size 747x30 [border: (5px solid #000000)] - RenderText {#text} at (5,5) size 441x19 - text run at (5,5) width 441: "This paragraph should have a thick black solid border all the way around." + RenderText {#text} at (5,5) size 463x19 + text run at (5,5) width 463: "This paragraph should have a thick black solid border all the way around." RenderBlock {P} at (4,142) size 747x30 [border: (5px double #000000)] - RenderText {#text} at (5,5) size 454x19 - text run at (5,5) width 454: "This paragraph should have a thick black double border all the way around." + RenderText {#text} at (5,5) size 476x19 + text run at (5,5) width 476: "This paragraph should have a thick black double border all the way around." RenderBlock {P} at (4,188) size 747x30 [border: (5px groove #808000)] - RenderText {#text} at (5,5) size 450x19 - text run at (5,5) width 450: "This paragraph should have a thick olive groove border all the way around." + RenderText {#text} at (5,5) size 474x19 + text run at (5,5) width 474: "This paragraph should have a thick olive groove border all the way around." RenderBlock {P} at (4,234) size 747x30 [border: (5px ridge #808000)] - RenderText {#text} at (5,5) size 438x19 - text run at (5,5) width 438: "This paragraph should have a thick olive ridge border all the way around." + RenderText {#text} at (5,5) size 462x19 + text run at (5,5) width 462: "This paragraph should have a thick olive ridge border all the way around." RenderBlock {P} at (4,280) size 747x30 [border: (5px inset #808000)] - RenderText {#text} at (5,5) size 435x19 - text run at (5,5) width 435: "This paragraph should have a thick olive inset border all the way around." + RenderText {#text} at (5,5) size 459x19 + text run at (5,5) width 459: "This paragraph should have a thick olive inset border all the way around." RenderBlock {P} at (4,326) size 747x30 [border: (5px outset #808000)] - RenderText {#text} at (5,5) size 444x19 - text run at (5,5) width 444: "This paragraph should have a thick olive outset border all the way around." + RenderText {#text} at (5,5) size 467x19 + text run at (5,5) width 467: "This paragraph should have a thick olive outset border all the way around." RenderBlock {P} at (4,372) size 747x50 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] RenderText {#text} at (5,5) size 714x39 - text run at (5,5) width 595: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " - text run at (600,5) width 119: "The color of all four" - text run at (5,25) width 197: "sides should be based on purple." + text run at (5,5) width 617: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " + text run at (622,5) width 97: "The color of all" + text run at (5,25) width 234: "four sides should be based on purple." RenderBlock {P} at (4,438) size 747x50 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - RenderText {#text} at (5,5) size 731x39 - text run at (5,5) width 673: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " - text run at (678,5) width 58: "The color" - text run at (5,25) width 258: "of all four sides should be based on purple." + RenderText {#text} at (5,5) size 726x39 + text run at (5,5) width 701: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " + text run at (706,5) width 25: "The" + text run at (5,25) width 306: "color of all four sides should be based on purple." RenderBlock {P} at (4,504) size 747x20 - RenderText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This paragraph should have no border at all." + RenderText {#text} at (0,0) size 278x19 + text run at (0,0) width 278: "This paragraph should have no border at all." layer at (8,249) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,241) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_style_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_style_inline-expected.txt index 599798ed165e..5d9eaf34d65d 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_style_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_style_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 568x48 text run at (0,0) width 560: ".one {border-style: dashed; border-color: black; border-width: thick;}" @@ -15,58 +15,57 @@ layer at (0,0) size 800x600 text run at (0,32) width 568: ".three {border-style: none; border-color: purple; border-width: thick;}" text run at (568,32) width 0: " " RenderBlock {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " - RenderInline {SPAN} at (0,0) size 65x29 [border: (5px dashed #000000)] - RenderText {#text} at (632,0) size 55x19 - text run at (632,0) width 55: "class one" - RenderText {#text} at (692,0) size 759x39 - text run at (692,0) width 67: ", which will" - text run at (0,20) width 227: "result in a dashed thick black border; " - RenderInline {SPAN} at (0,0) size 66x29 [border: (5px groove #FF0000)] - RenderText {#text} at (232,20) size 56x19 - text run at (232,20) width 56: "class two" - RenderText {#text} at (293,20) size 355x19 - text run at (293,20) width 355: ", which should result in a grooved thick purple border, and " - RenderInline {SPAN} at (0,0) size 63x19 - RenderText {#text} at (648,20) size 63x19 - text run at (648,20) width 63: "class three" - RenderText {#text} at (711,20) size 754x39 - text run at (711,20) width 43: ", which" - text run at (0,40) width 193: "should result in no border at all. " - text run at (193,40) width 406: "The line-height of the parent element should not change, on any line." + RenderText {#text} at (0,0) size 664x19 + text run at (0,0) width 664: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " + RenderInline {SPAN} at (0,0) size 67x29 [border: (5px dashed #000000)] + RenderText {#text} at (669,0) size 57x19 + text run at (669,0) width 57: "class one" + RenderText {#text} at (731,0) size 778x39 + text run at (731,0) width 47: ", which" + text run at (0,20) width 263: "will result in a dashed thick black border; " + RenderInline {SPAN} at (0,0) size 68x29 [border: (5px groove #FF0000)] + RenderText {#text} at (268,20) size 58x19 + text run at (268,20) width 58: "class two" + RenderText {#text} at (331,20) size 373x19 + text run at (331,20) width 373: ", which should result in a grooved thick purple border, and " + RenderInline {SPAN} at (0,0) size 65x19 + RenderText {#text} at (704,20) size 65x19 + text run at (704,20) width 65: "class three" + RenderText {#text} at (769,20) size 773x39 + text run at (769,20) width 4: "," + text run at (0,40) width 246: "which should result in no border at all. " + text run at (246,40) width 433: "The line-height of the parent element should not change, on any line." RenderTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x96 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x68 RenderTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " - RenderInline {SPAN} at (0,0) size 65x29 [border: (5px dashed #000000)] - RenderText {#text} at (632,0) size 55x19 - text run at (632,0) width 55: "class one" - RenderText {#text} at (692,0) size 759x39 - text run at (692,0) width 67: ", which will" - text run at (0,20) width 227: "result in a dashed thick black border; " - RenderInline {SPAN} at (0,0) size 66x29 [border: (5px groove #FF0000)] - RenderText {#text} at (232,20) size 56x19 - text run at (232,20) width 56: "class two" - RenderText {#text} at (293,20) size 355x19 - text run at (293,20) width 355: ", which should result in a grooved thick purple border, and " - RenderInline {SPAN} at (0,0) size 63x19 - RenderText {#text} at (648,20) size 63x19 - text run at (648,20) width 63: "class three" - RenderText {#text} at (711,20) size 754x39 - text run at (711,20) width 43: ", which" - text run at (0,40) width 193: "should result in no border at all. " - text run at (193,40) width 406: "The line-height of the parent element should not change, on any line." + RenderText {#text} at (0,0) size 664x19 + text run at (0,0) width 664: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " + RenderInline {SPAN} at (0,0) size 67x29 [border: (5px dashed #000000)] + RenderText {#text} at (669,0) size 57x19 + text run at (669,0) width 57: "class one" + RenderText {#text} at (731,0) size 735x39 + text run at (731,0) width 4: "," + text run at (0,20) width 306: "which will result in a dashed thick black border; " + RenderInline {SPAN} at (0,0) size 68x29 [border: (5px groove #FF0000)] + RenderText {#text} at (311,20) size 58x19 + text run at (311,20) width 58: "class two" + RenderText {#text} at (374,20) size 369x19 + text run at (374,20) width 369: ", which should result in a grooved thick purple border, and" + RenderInline {SPAN} at (0,0) size 65x19 + RenderText {#text} at (0,40) size 65x19 + text run at (0,40) width 65: "class three" + RenderText {#text} at (65,40) size 687x19 + text run at (65,40) width 254: ", which should result in no border at all. " + text run at (319,40) width 433: "The line-height of the parent element should not change, on any line." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_top-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_top-expected.txt index f5d34b83d0f2..42b307ba633f 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_top-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_top-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1023 RenderBlock {HTML} at (0,0) size 785x1023 RenderBody {BODY} at (8,8) size 769x1007 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x64 RenderText {#text} at (0,0) size 320x64 text run at (0,0) width 304: ".one {border-top: purple double 10px;}" @@ -17,136 +17,136 @@ layer at (0,0) size 785x1023 text run at (0,48) width 264: "TD {border-top: green 2px solid;}" text run at (264,48) width 0: " " RenderBlock {P} at (0,131) size 769x40 - RenderText {#text} at (0,0) size 767x39 - text run at (0,0) width 606: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " - text run at (606,0) width 161: "This border applies only to" - text run at (0,20) width 254: "the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 755x39 + text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " + text run at (634,0) width 121: "This border applies" + text run at (0,20) width 317: "only to the cells, not the rows which contain them." RenderBlock {P} at (0,187) size 769x30 [border: (10px double #800080) none] - RenderText {#text} at (0,10) size 398x19 - text run at (0,10) width 398: "This paragraph should have a purple, double, 10-pixel top border." + RenderText {#text} at (0,10) size 413x19 + text run at (0,10) width 413: "This paragraph should have a purple, double, 10-pixel top border." RenderBlock {P} at (0,233) size 769x21 [border: (1px solid #800080) none] - RenderText {#text} at (0,1) size 316x19 - text run at (0,1) width 316: "This paragraph should have a thin purple top border." + RenderText {#text} at (0,1) size 330x19 + text run at (0,1) width 330: "This paragraph should have a thin purple top border." RenderTable {TABLE} at (0,270) size 769x118 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x116 RenderTableRow {TR} at (0,5) size 767x45 RenderTableCell {TD} at (5,5) size 758x45 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,3) size 745x39 - text run at (2,3) width 408: "Every cell in this table should have a 2-pixel solid green top border. " - text run at (410,3) width 337: "This is also true of the table-testing section in the second" - text run at (2,23) width 121: "half of the test page." + RenderText {#text} at (2,3) size 734x39 + text run at (2,3) width 428: "Every cell in this table should have a 2-pixel solid green top border. " + text run at (430,3) width 306: "This is also true of the table-testing section in the" + text run at (2,23) width 175: "second half of the test page." RenderTableRow {TR} at (0,55) size 767x56 - RenderTableCell {TD} at (5,70) size 191x26 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 50x21 - text run at (2,3) width 50: "Cell one" - RenderTableCell {TD} at (200,55) size 563x56 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,3) size 558x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (2,23) size 155x31 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 153x29 - RenderTableRow {TR} at (0,2) size 153x25 - RenderTableCell {TD} at (2,2) size 149x25 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,3) size 145x19 - text run at (2,3) width 145: "Nested single-cell table!" + RenderTableCell {TD} at (5,70) size 194x26 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 53x21 + text run at (2,3) width 53: "Cell one" + RenderTableCell {TD} at (203,55) size 560x56 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,3) size 555x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (2,23) size 161x31 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 159x29 + RenderTableRow {TR} at (0,2) size 159x25 + RenderTableCell {TD} at (2,2) size 155x25 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,3) size 151x19 + text run at (2,3) width 151: "Nested single-cell table!" RenderBlock {UL} at (0,404) size 769x129 RenderListItem {LI} at (40,0) size 729x83 [border: (3px solid #000000) none] RenderBlock (anonymous) at (0,3) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "This is a list item..." RenderBlock {UL} at (0,23) size 729x60 RenderListItem {LI} at (40,0) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." + RenderText {#text} at (0,0) size 73x19 + text run at (0,0) width 73: "...and this..." RenderListItem {LI} at (40,20) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." + RenderText {#text} at (0,0) size 115x19 + text run at (0,0) width 115: "...is a second list..." RenderListItem {LI} at (40,40) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." + RenderText {#text} at (0,0) size 176x19 + text run at (0,0) width 176: "...nested within the list item." RenderListItem {LI} at (40,83) size 729x23 [border: (3px solid #000000) none] RenderListMarker at (-18,3) size 7x19: bullet - RenderText {#text} at (0,3) size 149x19 - text run at (0,3) width 149: "This is a second list item." + RenderText {#text} at (0,3) size 158x19 + text run at (0,3) width 158: "This is a second list item." RenderListItem {LI} at (40,106) size 729x23 [border: (3px solid #000000) none] RenderListMarker at (-18,3) size 7x19: bullet - RenderText {#text} at (0,3) size 455x19 - text run at (0,3) width 455: "Each list item in this list should have a medium-width black border at its top." + RenderText {#text} at (0,3) size 480x19 + text run at (0,3) width 480: "Each list item in this list should have a medium-width black border at its top." RenderTable {TABLE} at (0,549) size 769x458 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x456 RenderTableRow {TR} at (0,0) size 767x29 RenderTableCell {TD} at (0,0) size 767x29 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,5) size 159x19 - text run at (4,5) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,5) size 160x19 + text run at (4,5) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,29) size 767x427 RenderTableCell {TD} at (0,228) size 12x29 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,5) size 4x19 text run at (4,5) width 4: " " RenderTableCell {TD} at (12,29) size 755x427 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,5) size 747x40 - RenderText {#text} at (0,0) size 722x39 - text run at (0,0) width 606: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " - text run at (606,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." + RenderText {#text} at (0,0) size 707x39 + text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " + text run at (634,0) width 73: "This border" + text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." RenderBlock {P} at (4,61) size 747x30 [border: (10px double #800080) none] - RenderText {#text} at (0,10) size 398x19 - text run at (0,10) width 398: "This paragraph should have a purple, double, 10-pixel top border." + RenderText {#text} at (0,10) size 413x19 + text run at (0,10) width 413: "This paragraph should have a purple, double, 10-pixel top border." RenderBlock {P} at (4,107) size 747x21 [border: (1px solid #800080) none] - RenderText {#text} at (0,1) size 316x19 - text run at (0,1) width 316: "This paragraph should have a thin purple top border." + RenderText {#text} at (0,1) size 330x19 + text run at (0,1) width 330: "This paragraph should have a thin purple top border." RenderTable {TABLE} at (4,144) size 747x118 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 745x116 RenderTableRow {TR} at (0,5) size 745x45 RenderTableCell {TD} at (5,5) size 736x45 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (2,3) size 698x39 - text run at (2,3) width 408: "Every cell in this table should have a 2-pixel solid green top border. " - text run at (410,3) width 290: "This is also true of the table-testing section in the" - text run at (2,23) width 168: "second half of the test page." + RenderText {#text} at (2,3) size 711x39 + text run at (2,3) width 428: "Every cell in this table should have a 2-pixel solid green top border. " + text run at (430,3) width 283: "This is also true of the table-testing section in" + text run at (2,23) width 198: "the second half of the test page." RenderTableRow {TR} at (0,55) size 745x56 - RenderTableCell {TD} at (5,70) size 186x26 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 50x21 - text run at (2,3) width 50: "Cell one" - RenderTableCell {TD} at (195,55) size 546x56 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (2,3) size 541x20 - RenderText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - RenderTable {TABLE} at (2,23) size 155x31 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 153x29 - RenderTableRow {TR} at (0,2) size 153x25 - RenderTableCell {TD} at (2,2) size 149x25 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,3) size 145x19 - text run at (2,3) width 145: "Nested single-cell table!" + RenderTableCell {TD} at (5,70) size 188x26 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 53x21 + text run at (2,3) width 53: "Cell one" + RenderTableCell {TD} at (197,55) size 544x56 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (2,3) size 539x20 + RenderText {#text} at (0,0) size 54x19 + text run at (0,0) width 54: "Cell two" + RenderTable {TABLE} at (2,23) size 161x31 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 159x29 + RenderTableRow {TR} at (0,2) size 159x25 + RenderTableCell {TD} at (2,2) size 155x25 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,3) size 151x19 + text run at (2,3) width 151: "Nested single-cell table!" RenderBlock {UL} at (4,278) size 747x129 RenderListItem {LI} at (40,0) size 707x83 [border: (3px solid #000000) none] RenderBlock (anonymous) at (0,3) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "This is a list item..." RenderBlock {UL} at (0,23) size 707x60 RenderListItem {LI} at (40,0) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." + RenderText {#text} at (0,0) size 73x19 + text run at (0,0) width 73: "...and this..." RenderListItem {LI} at (40,20) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." + RenderText {#text} at (0,0) size 115x19 + text run at (0,0) width 115: "...is a second list..." RenderListItem {LI} at (40,40) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." + RenderText {#text} at (0,0) size 176x19 + text run at (0,0) width 176: "...nested within the list item." RenderListItem {LI} at (40,83) size 707x23 [border: (3px solid #000000) none] RenderListMarker at (-18,3) size 7x19: bullet - RenderText {#text} at (0,3) size 149x19 - text run at (0,3) width 149: "This is a second list item." + RenderText {#text} at (0,3) size 158x19 + text run at (0,3) width 158: "This is a second list item." RenderListItem {LI} at (40,106) size 707x23 [border: (3px solid #000000) none] RenderListMarker at (-18,3) size 7x19: bullet - RenderText {#text} at (0,3) size 455x19 - text run at (0,3) width 455: "Each list item in this list should have a medium-width black border at its top." + RenderText {#text} at (0,3) size 480x19 + text run at (0,3) width 480: "Each list item in this list should have a medium-width black border at its top." layer at (8,121) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_top_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_top_inline-expected.txt index 0ef85ec59f3c..0c006b3ae43f 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_top_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_top_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 304x48 text run at (0,0) width 304: ".one {border-top: purple double 10px;}" @@ -14,48 +14,47 @@ layer at (0,0) size 800x600 text run at (296,16) width 0: " " text run at (0,32) width 0: " " RenderBlock {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - RenderInline {SPAN} at (0,0) size 55x29 [border: (10px double #800080) none] - RenderText {#text} at (627,0) size 55x19 - text run at (627,0) width 55: "class one" - RenderText {#text} at (682,0) size 768x39 - text run at (682,0) width 86: ", which should" - text run at (0,20) width 283: "have a 10-pixel purple double top border; and " - RenderInline {SPAN} at (0,0) size 56x20 [border: (1px solid #800080) none] - RenderText {#text} at (283,20) size 56x19 - text run at (283,20) width 56: "class two" - RenderText {#text} at (339,20) size 770x39 - text run at (339,20) width 305: ", which should have a thin solid purple top border. " - text run at (644,20) width 126: "The line-height of the" - text run at (0,40) width 272: "parent element should not change on any line." + RenderText {#text} at (0,0) size 666x19 + text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " + RenderInline {SPAN} at (0,0) size 57x29 [border: (10px double #800080) none] + RenderText {#text} at (666,0) size 57x19 + text run at (666,0) width 57: "class one" + RenderText {#text} at (723,0) size 770x39 + text run at (723,0) width 47: ", which" + text run at (0,20) width 338: "should have a 10-pixel purple double top border; and " + RenderInline {SPAN} at (0,0) size 58x20 [border: (1px solid #800080) none] + RenderText {#text} at (338,20) size 58x19 + text run at (338,20) width 58: "class two" + RenderText {#text} at (396,20) size 773x39 + text run at (396,20) width 320: ", which should have a thin solid purple top border. " + text run at (716,20) width 57: "The line-" + text run at (0,40) width 372: "height of the parent element should not change on any line." RenderTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x96 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x68 RenderTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - RenderInline {SPAN} at (0,0) size 55x29 [border: (10px double #800080) none] - RenderText {#text} at (627,0) size 55x19 - text run at (627,0) width 55: "class one" - RenderText {#text} at (682,0) size 725x39 - text run at (682,0) width 43: ", which" - text run at (0,20) width 326: "should have a 10-pixel purple double top border; and " - RenderInline {SPAN} at (0,0) size 56x20 [border: (1px solid #800080) none] - RenderText {#text} at (326,20) size 56x19 - text run at (326,20) width 56: "class two" - RenderText {#text} at (382,20) size 740x39 - text run at (382,20) width 305: ", which should have a thin solid purple top border. " - text run at (687,20) width 53: "The line-" - text run at (0,40) width 349: "height of the parent element should not change on any line." + RenderText {#text} at (0,0) size 666x19 + text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " + RenderInline {SPAN} at (0,0) size 57x29 [border: (10px double #800080) none] + RenderText {#text} at (666,0) size 57x19 + text run at (666,0) width 57: "class one" + RenderText {#text} at (723,0) size 727x39 + text run at (723,0) width 4: "," + text run at (0,20) width 381: "which should have a 10-pixel purple double top border; and " + RenderInline {SPAN} at (0,0) size 58x20 [border: (1px solid #800080) none] + RenderText {#text} at (381,20) size 58x19 + text run at (381,20) width 58: "class two" + RenderText {#text} at (439,20) size 755x39 + text run at (439,20) width 316: ", which should have a thin solid purple top border." + text run at (0,40) width 429: "The line-height of the parent element should not change on any line." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_top_width-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_top_width-expected.txt index ccc6eaefc0b2..d039d9a8a3d7 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_top_width-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_top_width-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x797 RenderBlock {HTML} at (0,0) size 785x797 RenderBody {BODY} at (8,8) size 769x781 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 440x96 text run at (0,0) width 432: ".zero {background-color: silver; border-top-width: 0;}" @@ -21,78 +21,78 @@ layer at (0,0) size 785x797 text run at (0,80) width 248: ".five {border-top-width: 25px;}" text run at (248,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" RenderBlock {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,235) size 769x48 [border: (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,25) size 360x19 - text run at (3,25) width 360: "This paragraph should have a top border width of 25 pixels." + RenderText {#text} at (3,25) size 377x19 + text run at (3,25) width 377: "This paragraph should have a top border width of 25 pixels." RenderBlock {P} at (0,299) size 769x28 [border: (5px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,5) size 319x19 - text run at (3,5) width 319: "This paragraph should have a thick top border width." + RenderText {#text} at (3,5) size 334x19 + text run at (3,5) width 334: "This paragraph should have a thick top border width." RenderBlock {P} at (0,343) size 769x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This paragraph should have a medium top border width." + RenderText {#text} at (3,3) size 354x19 + text run at (3,3) width 354: "This paragraph should have a medium top border width." RenderBlock {P} at (0,385) size 769x24 [border: (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,1) size 311x19 - text run at (3,1) width 311: "This paragraph should have a thin top border width." + RenderText {#text} at (3,1) size 327x19 + text run at (3,1) width 327: "This paragraph should have a thin top border width." RenderBlock {P} at (0,425) size 769x20 - RenderText {#text} at (0,0) size 502x19 - text run at (0,0) width 502: "This paragraph should have no border and no extra \"padding\" on its top side, as no " + RenderText {#text} at (0,0) size 527x19 + text run at (0,0) width 527: "This paragraph should have no border and no extra \"padding\" on its top side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (502,3) size 96x16 - text run at (502,3) width 96: "border-style" - RenderText {#text} at (598,0) size 53x19 - text run at (598,0) width 53: " was set." - RenderTable {TABLE} at (0,461) size 673x320 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 671x318 - RenderTableRow {TR} at (0,0) size 671x28 - RenderTableCell {TD} at (0,0) size 671x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 671x290 + RenderText {#text} at (527,3) size 96x16 + text run at (527,3) width 96: "border-style" + RenderText {#text} at (623,0) size 54x19 + text run at (623,0) width 54: " was set." + RenderTable {TABLE} at (0,461) size 699x320 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 697x318 + RenderTableRow {TR} at (0,0) size 697x28 + RenderTableCell {TD} at (0,0) size 697x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 697x290 RenderTableCell {TD} at (0,159) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 659x290 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 651x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderTableCell {TD} at (12,28) size 685x290 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 677x20 + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - RenderBlock {P} at (4,40) size 651x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (4,76) size 651x48 [border: (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,25) size 360x19 - text run at (3,25) width 360: "This paragraph should have a top border width of 25 pixels." - RenderBlock {P} at (4,140) size 651x28 [border: (5px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,5) size 319x19 - text run at (3,5) width 319: "This paragraph should have a thick top border width." - RenderBlock {P} at (4,184) size 651x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This paragraph should have a medium top border width." - RenderBlock {P} at (4,226) size 651x24 [border: (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,1) size 311x19 - text run at (3,1) width 311: "This paragraph should have a thin top border width." - RenderBlock {P} at (4,266) size 651x20 - RenderText {#text} at (0,0) size 502x19 - text run at (0,0) width 502: "This paragraph should have no border and no extra \"padding\" on its top side, as no " + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" + RenderBlock {P} at (4,40) size 677x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (4,76) size 677x48 [border: (25px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,25) size 377x19 + text run at (3,25) width 377: "This paragraph should have a top border width of 25 pixels." + RenderBlock {P} at (4,140) size 677x28 [border: (5px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,5) size 334x19 + text run at (3,5) width 334: "This paragraph should have a thick top border width." + RenderBlock {P} at (4,184) size 677x26 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 354x19 + text run at (3,3) width 354: "This paragraph should have a medium top border width." + RenderBlock {P} at (4,226) size 677x24 [border: (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,1) size 327x19 + text run at (3,1) width 327: "This paragraph should have a thin top border width." + RenderBlock {P} at (4,266) size 677x20 + RenderText {#text} at (0,0) size 527x19 + text run at (0,0) width 527: "This paragraph should have no border and no extra \"padding\" on its top side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (502,3) size 96x16 - text run at (502,3) width 96: "border-style" - RenderText {#text} at (598,0) size 53x19 - text run at (598,0) width 53: " was set." + RenderText {#text} at (527,3) size 96x16 + text run at (527,3) width 96: "border-style" + RenderText {#text} at (623,0) size 54x19 + text run at (623,0) width 54: " was set." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_top_width_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_top_width_inline-expected.txt index df77de4c0a19..fedaae324301 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_top_width_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_top_width_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 408x48 text run at (0,0) width 408: ".one {border-top-width: 25px; border-style: solid;}" @@ -15,72 +15,73 @@ layer at (0,0) size 800x600 text run at (0,32) width 256: ".three {border-top-width: 25px;}" text run at (256,32) width 0: " " RenderBlock {P} at (0,115) size 784x88 [border: (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,25) size 163x19 - text run at (3,25) width 163: "This element has a class of " + RenderText {#text} at (3,25) size 172x19 + text run at (3,25) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (166,28) size 24x16 - text run at (166,28) width 24: "one" - RenderText {#text} at (190,25) size 154x19 - text run at (190,25) width 8: ". " - text run at (198,25) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 163x23 [border: (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (347,25) size 133x19 - text run at (347,25) width 133: "inline element of class " + RenderText {#text} at (175,28) size 24x16 + text run at (175,28) width 24: "one" + RenderText {#text} at (199,25) size 162x19 + text run at (199,25) width 8: ". " + text run at (207,25) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 173x23 [border: (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (364,25) size 143x19 + text run at (364,25) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (480,28) size 24x16 - text run at (480,28) width 24: "two" - RenderText {#text} at (507,25) size 772x39 - text run at (507,25) width 268: ", which should result in a thin solid border on" - text run at (3,45) width 599: "the top side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (602,45) width 98: "There is also an " - RenderInline {SPAN} at (0,0) size 777x39 - RenderText {#text} at (700,45) size 777x39 - text run at (700,45) width 80: "inline element" - text run at (3,65) width 49: "of class " + RenderText {#text} at (507,28) size 24x16 + text run at (507,28) width 24: "two" + RenderText {#text} at (534,25) size 772x59 + text run at (534,25) width 220: ", which should result in a thin solid" + text run at (3,45) width 692: "border on the top side of each box in the inline element (and the UA's default border on the other three sides). " + text run at (695,45) width 80: "There is also" + text run at (3,65) width 19: "an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (22,65) size 143x19 + text run at (22,65) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (52,68) size 40x16 - text run at (52,68) width 40: "three" - RenderText {#text} at (92,65) size 547x19 - text run at (92,65) width 547: ", which should have no top border width or visible border because no border style was set." - RenderTable {TABLE} at (0,219) size 784x126 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x124 + RenderText {#text} at (165,68) size 40x16 + text run at (165,68) width 40: "three" + RenderText {#text} at (205,65) size 569x19 + text run at (205,65) width 569: ", which should have no top border width or visible border because no border style was set." + RenderTable {TABLE} at (0,219) size 784x146 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x144 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 782x96 - RenderTableCell {TD} at (0,62) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 782x116 + RenderTableCell {TD} at (0,72) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 770x96 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x88 [border: (25px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,25) size 163x19 - text run at (3,25) width 163: "This element has a class of " + RenderTableCell {TD} at (12,28) size 770x116 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x108 [border: (25px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,25) size 172x19 + text run at (3,25) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (166,28) size 24x16 - text run at (166,28) width 24: "one" - RenderText {#text} at (190,25) size 154x19 - text run at (190,25) width 8: ". " - text run at (198,25) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 163x23 [border: (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (347,25) size 133x19 - text run at (347,25) width 133: "inline element of class " + RenderText {#text} at (175,28) size 24x16 + text run at (175,28) width 24: "one" + RenderText {#text} at (199,25) size 162x19 + text run at (199,25) width 8: ". " + text run at (207,25) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 173x23 [border: (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (364,25) size 143x19 + text run at (364,25) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (480,28) size 24x16 - text run at (480,28) width 24: "two" - RenderText {#text} at (507,25) size 753x39 - text run at (507,25) width 249: ", which should result in a thin solid border" - text run at (3,45) width 618: "on the top side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (621,45) width 98: "There is also an " - RenderInline {SPAN} at (0,0) size 746x39 - RenderText {#text} at (719,45) size 746x39 - text run at (719,45) width 30: "inline" - text run at (3,65) width 99: "element of class " + RenderText {#text} at (507,28) size 24x16 + text run at (507,28) width 24: "two" + RenderText {#text} at (534,25) size 751x59 + text run at (534,25) width 220: ", which should result in a thin solid" + text run at (3,45) width 692: "border on the top side of each box in the inline element (and the UA's default border on the other three sides). " + text run at (695,45) width 51: "There is" + text run at (3,65) width 48: "also an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (51,65) size 143x19 + text run at (51,65) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (102,68) size 40x16 - text run at (102,68) width 40: "three" - RenderText {#text} at (142,65) size 547x19 - text run at (142,65) width 547: ", which should have no top border width or visible border because no border style was set." + RenderText {#text} at (194,68) size 40x16 + text run at (194,68) width 40: "three" + RenderText {#text} at (234,65) size 746x39 + text run at (234,65) width 515: ", which should have no top border width or visible border because no border style" + text run at (3,85) width 50: "was set." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_width-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_width-expected.txt index dace647652d7..7179a6e8f092 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_width-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_width-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x941 RenderBlock {HTML} at (0,0) size 785x941 RenderBody {BODY} at (8,8) size 769x925 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 408x96 text run at (0,0) width 400: ".zero {background-color: silver; border-width: 0;}" @@ -21,78 +21,78 @@ layer at (0,0) size 785x941 text run at (0,80) width 216: ".five {border-width: 25px;}" text run at (216,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" RenderBlock {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,235) size 769x120 [border: (50px solid #000000)] - RenderText {#text} at (50,50) size 372x19 - text run at (50,50) width 372: "This element should have an overall border width of 50 pixels." + RenderText {#text} at (50,50) size 394x19 + text run at (50,50) width 394: "This element should have an overall border width of 50 pixels." RenderBlock {P} at (0,371) size 769x30 [border: (5px solid #000000)] - RenderText {#text} at (5,5) size 324x19 - text run at (5,5) width 324: "This element should have a thick overall border width." + RenderText {#text} at (5,5) size 343x19 + text run at (5,5) width 343: "This element should have a thick overall border width." RenderBlock {P} at (0,417) size 769x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 342x19 - text run at (3,3) width 342: "This element should have a medium overall border width." + RenderText {#text} at (3,3) size 363x19 + text run at (3,3) width 363: "This element should have a medium overall border width." RenderBlock {P} at (0,459) size 769x22 [border: (1px solid #000000)] - RenderText {#text} at (1,1) size 316x19 - text run at (1,1) width 316: "This element should have a thin overall border width." + RenderText {#text} at (1,1) size 336x19 + text run at (1,1) width 336: "This element should have a thin overall border width." RenderBlock {P} at (0,497) size 769x20 - RenderText {#text} at (0,0) size 471x19 - text run at (0,0) width 471: "This element should have no border and no extra \"padding\" on any side, as no " + RenderText {#text} at (0,0) size 498x19 + text run at (0,0) width 498: "This element should have no border and no extra \"padding\" on any side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (471,3) size 96x16 - text run at (471,3) width 96: "border-style" - RenderText {#text} at (567,0) size 53x19 - text run at (567,0) width 53: " was set." - RenderTable {TABLE} at (0,533) size 642x392 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 640x390 - RenderTableRow {TR} at (0,0) size 640x28 - RenderTableCell {TD} at (0,0) size 640x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 640x362 + RenderText {#text} at (498,3) size 96x16 + text run at (498,3) width 96: "border-style" + RenderText {#text} at (594,0) size 54x19 + text run at (594,0) width 54: " was set." + RenderTable {TABLE} at (0,533) size 670x392 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 668x390 + RenderTableRow {TR} at (0,0) size 668x28 + RenderTableCell {TD} at (0,0) size 668x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 668x362 RenderTableCell {TD} at (0,195) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 628x362 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 620x20 - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " + RenderTableCell {TD} at (12,28) size 656x362 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 648x20 + RenderText {#text} at (0,0) size 157x19 + text run at (0,0) width 157: "(These will only work if " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - RenderText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - RenderBlock {P} at (4,40) size 620x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (4,76) size 620x120 [border: (50px solid #000000)] - RenderText {#text} at (50,50) size 372x19 - text run at (50,50) width 372: "This element should have an overall border width of 50 pixels." - RenderBlock {P} at (4,212) size 620x30 [border: (5px solid #000000)] - RenderText {#text} at (5,5) size 324x19 - text run at (5,5) width 324: "This element should have a thick overall border width." - RenderBlock {P} at (4,258) size 620x26 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 342x19 - text run at (3,3) width 342: "This element should have a medium overall border width." - RenderBlock {P} at (4,300) size 620x22 [border: (1px solid #000000)] - RenderText {#text} at (1,1) size 316x19 - text run at (1,1) width 316: "This element should have a thin overall border width." - RenderBlock {P} at (4,338) size 620x20 - RenderText {#text} at (0,0) size 471x19 - text run at (0,0) width 471: "This element should have no border and no extra \"padding\" on any side, as no " + RenderText {#text} at (157,3) size 96x16 + text run at (157,3) width 96: "border-style" + RenderText {#text} at (253,0) size 89x19 + text run at (253,0) width 89: " is supported.)" + RenderBlock {P} at (4,40) size 648x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (4,76) size 648x120 [border: (50px solid #000000)] + RenderText {#text} at (50,50) size 394x19 + text run at (50,50) width 394: "This element should have an overall border width of 50 pixels." + RenderBlock {P} at (4,212) size 648x30 [border: (5px solid #000000)] + RenderText {#text} at (5,5) size 343x19 + text run at (5,5) width 343: "This element should have a thick overall border width." + RenderBlock {P} at (4,258) size 648x26 [border: (3px solid #000000)] + RenderText {#text} at (3,3) size 363x19 + text run at (3,3) width 363: "This element should have a medium overall border width." + RenderBlock {P} at (4,300) size 648x22 [border: (1px solid #000000)] + RenderText {#text} at (1,1) size 336x19 + text run at (1,1) width 336: "This element should have a thin overall border width." + RenderBlock {P} at (4,338) size 648x20 + RenderText {#text} at (0,0) size 498x19 + text run at (0,0) width 498: "This element should have no border and no extra \"padding\" on any side, as no " RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (471,3) size 96x16 - text run at (471,3) width 96: "border-style" - RenderText {#text} at (567,0) size 53x19 - text run at (567,0) width 53: " was set." + RenderText {#text} at (498,3) size 96x16 + text run at (498,3) width 96: "border-style" + RenderText {#text} at (594,0) size 54x19 + text run at (594,0) width 54: " was set." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/border_width_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/border_width_inline-expected.txt index f3ce89d0ce7d..99d5fef03f7b 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/border_width_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/border_width_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 376x48 text run at (0,0) width 376: ".one {border-width: 25px; border-style: solid;}" @@ -15,72 +15,72 @@ layer at (0,0) size 800x600 text run at (0,32) width 224: ".three {border-width: 25px;}" text run at (224,32) width 0: " " RenderBlock {P} at (0,115) size 784x110 [border: (25px solid #000000)] - RenderText {#text} at (25,25) size 163x19 - text run at (25,25) width 163: "This element has a class of " + RenderText {#text} at (25,25) size 172x19 + text run at (25,25) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (188,28) size 24x16 - text run at (188,28) width 24: "one" - RenderText {#text} at (212,25) size 154x19 - text run at (212,25) width 8: ". " - text run at (220,25) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 159x21 [border: (1px solid #000000)] - RenderText {#text} at (367,25) size 133x19 - text run at (367,25) width 133: "inline element of class " + RenderText {#text} at (197,28) size 24x16 + text run at (197,28) width 24: "one" + RenderText {#text} at (221,25) size 162x19 + text run at (221,25) width 8: ". " + text run at (229,25) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 169x21 [border: (1px solid #000000)] + RenderText {#text} at (384,25) size 143x19 + text run at (384,25) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (500,28) size 24x16 - text run at (500,28) width 24: "two" - RenderText {#text} at (525,25) size 704x39 - text run at (525,25) width 204: ", which should result in a thin solid" - text run at (25,45) width 323: "border on each side of each box in the inline element. " - text run at (348,45) width 98: "There is also an " - RenderInline {SPAN} at (0,0) size 173x19 - RenderText {#text} at (446,45) size 133x19 - text run at (446,45) width 133: "inline element of class " + RenderText {#text} at (527,28) size 24x16 + text run at (527,28) width 24: "two" + RenderText {#text} at (552,25) size 713x39 + text run at (552,25) width 186: ", which should result in a thin" + text run at (25,45) width 374: "solid border on each side of each box in the inline element. " + text run at (399,45) width 103: "There is also an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (502,45) size 143x19 + text run at (502,45) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (579,48) size 40x16 - text run at (579,48) width 40: "three" - RenderText {#text} at (619,45) size 731x39 - text run at (619,45) width 137: ", which should have no" - text run at (25,65) width 279: "border width because no border style was set." + RenderText {#text} at (645,48) size 40x16 + text run at (645,48) width 40: "three" + RenderText {#text} at (685,45) size 707x39 + text run at (685,45) width 47: ", which" + text run at (25,65) width 387: "should have no border width because no border style was set." RenderTable {TABLE} at (0,241) size 784x148 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x146 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x118 RenderTableCell {TD} at (0,73) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x118 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x110 [border: (25px solid #000000)] - RenderText {#text} at (25,25) size 163x19 - text run at (25,25) width 163: "This element has a class of " + RenderText {#text} at (25,25) size 172x19 + text run at (25,25) width 172: "This element has a class of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (188,28) size 24x16 - text run at (188,28) width 24: "one" - RenderText {#text} at (212,25) size 154x19 - text run at (212,25) width 8: ". " - text run at (220,25) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 159x21 [border: (1px solid #000000)] - RenderText {#text} at (367,25) size 133x19 - text run at (367,25) width 133: "inline element of class " + RenderText {#text} at (197,28) size 24x16 + text run at (197,28) width 24: "one" + RenderText {#text} at (221,25) size 162x19 + text run at (221,25) width 8: ". " + text run at (229,25) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 169x21 [border: (1px solid #000000)] + RenderText {#text} at (384,25) size 143x19 + text run at (384,25) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (500,28) size 24x16 - text run at (500,28) width 24: "two" - RenderText {#text} at (525,25) size 704x39 - text run at (525,25) width 204: ", which should result in a thin solid" - text run at (25,45) width 323: "border on each side of each box in the inline element. " - text run at (348,45) width 98: "There is also an " - RenderInline {SPAN} at (0,0) size 173x19 - RenderText {#text} at (446,45) size 133x19 - text run at (446,45) width 133: "inline element of class " + RenderText {#text} at (527,28) size 24x16 + text run at (527,28) width 24: "two" + RenderText {#text} at (552,25) size 685x39 + text run at (552,25) width 158: ", which should result in a" + text run at (25,45) width 402: "thin solid border on each side of each box in the inline element. " + text run at (427,45) width 103: "There is also an " + RenderInline {SPAN} at (0,0) size 183x19 + RenderText {#text} at (530,45) size 143x19 + text run at (530,45) width 143: "inline element of class " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (579,48) size 40x16 - text run at (579,48) width 40: "three" - RenderText {#text} at (619,45) size 712x39 - text run at (619,45) width 118: ", which should have" - text run at (25,65) width 298: "no border width because no border style was set." + RenderText {#text} at (673,48) size 40x16 + text run at (673,48) width 40: "three" + RenderText {#text} at (713,45) size 692x39 + text run at (713,45) width 4: "," + text run at (25,65) width 430: "which should have no border width because no border style was set." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/clear-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/clear-expected.txt index c6c4573dde4f..4a40a50ec04c 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/clear-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/clear-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1005 RenderBlock {HTML} at (0,0) size 785x1005 RenderBody {BODY} at (8,8) size 769x989 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x64 RenderText {#text} at (0,0) size 168x64 text run at (0,0) width 152: ".one {clear: left;}" @@ -18,75 +18,75 @@ layer at (0,0) size 785x1005 text run at (160,48) width 0: " " RenderImage {IMG} at (0,123) size 15x50 RenderBlock {P} at (0,131) size 769x20 - RenderText {#text} at (18,0) size 563x19 - text run at (18,0) width 563: "This text should be flowing past a tall orange rectangle on the left side of the browser window." + RenderText {#text} at (18,0) size 594x19 + text run at (18,0) width 594: "This text should be flowing past a tall orange rectangle on the left side of the browser window." RenderBlock (anonymous) at (0,167) size 769x20 RenderBR {BR} at (18,0) size 0x19 RenderImage {IMG} at (0,20) size 15x50 RenderBlock {P} at (0,237) size 769x20 - RenderText {#text} at (0,0) size 620x19 - text run at (0,0) width 620: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." + RenderText {#text} at (0,0) size 649x19 + text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." RenderBlock (anonymous) at (0,273) size 769x20 RenderBR {BR} at (0,0) size 0x19 RenderImage {IMG} at (754,20) size 15x50 RenderBlock {P} at (0,343) size 769x20 - RenderText {#text} at (0,0) size 628x19 - text run at (0,0) width 628: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." + RenderText {#text} at (0,0) size 658x19 + text run at (0,0) width 658: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." RenderBlock (anonymous) at (0,379) size 769x20 RenderBR {BR} at (0,0) size 0x19 RenderImage {IMG} at (0,20) size 15x50 RenderImage {IMG} at (754,20) size 15x50 RenderBlock {P} at (0,449) size 769x20 - RenderText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This paragraph should appear below the two tall orange rectangles, and not flow between them." + RenderText {#text} at (0,0) size 602x19 + text run at (0,0) width 602: "This paragraph should appear below the two tall orange rectangles, and not flow between them." RenderImage {IMG} at (0,485) size 15x50 RenderImage {IMG} at (754,485) size 15x50 RenderBlock {P} at (0,485) size 769x20 - RenderText {#text} at (18,0) size 372x19 - text run at (18,0) width 372: "This paragraph should be between both tall orange rectangles." + RenderText {#text} at (18,0) size 390x19 + text run at (18,0) width 390: "This paragraph should be between both tall orange rectangles." RenderBlock (anonymous) at (0,521) size 769x20 RenderBR {BR} at (18,0) size 0x19 - RenderTable {TABLE} at (0,541) size 650x448 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 648x446 - RenderTableRow {TR} at (0,0) size 648x28 - RenderTableCell {TD} at (0,0) size 648x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 648x418 + RenderTable {TABLE} at (0,541) size 680x448 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 678x446 + RenderTableRow {TR} at (0,0) size 678x28 + RenderTableCell {TD} at (0,0) size 678x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 678x418 RenderTableCell {TD} at (0,223) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 636x418 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 666x418 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderImage {IMG} at (4,4) size 15x50 - RenderBlock {P} at (4,4) size 628x20 - RenderText {#text} at (18,0) size 563x19 - text run at (18,0) width 563: "This text should be flowing past a tall orange rectangle on the left side of the browser window." - RenderBlock (anonymous) at (4,40) size 628x20 + RenderBlock {P} at (4,4) size 658x20 + RenderText {#text} at (18,0) size 594x19 + text run at (18,0) width 594: "This text should be flowing past a tall orange rectangle on the left side of the browser window." + RenderBlock (anonymous) at (4,40) size 658x20 RenderBR {BR} at (18,0) size 0x19 RenderImage {IMG} at (0,20) size 15x50 - RenderBlock {P} at (4,110) size 628x20 - RenderText {#text} at (0,0) size 620x19 - text run at (0,0) width 620: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." - RenderBlock (anonymous) at (4,146) size 628x20 + RenderBlock {P} at (4,110) size 658x20 + RenderText {#text} at (0,0) size 649x19 + text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." + RenderBlock (anonymous) at (4,146) size 658x20 RenderBR {BR} at (0,0) size 0x19 - RenderImage {IMG} at (613,20) size 15x50 - RenderBlock {P} at (4,216) size 628x20 - RenderText {#text} at (0,0) size 628x19 - text run at (0,0) width 628: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." - RenderBlock (anonymous) at (4,252) size 628x20 + RenderImage {IMG} at (643,20) size 15x50 + RenderBlock {P} at (4,216) size 658x20 + RenderText {#text} at (0,0) size 658x19 + text run at (0,0) width 658: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." + RenderBlock (anonymous) at (4,252) size 658x20 RenderBR {BR} at (0,0) size 0x19 RenderImage {IMG} at (0,20) size 15x50 - RenderImage {IMG} at (613,20) size 15x50 - RenderBlock {P} at (4,322) size 628x20 - RenderText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This paragraph should appear below the two tall orange rectangles, and not flow between them." + RenderImage {IMG} at (643,20) size 15x50 + RenderBlock {P} at (4,322) size 658x20 + RenderText {#text} at (0,0) size 602x19 + text run at (0,0) width 602: "This paragraph should appear below the two tall orange rectangles, and not flow between them." RenderImage {IMG} at (4,358) size 15x50 - RenderImage {IMG} at (617,358) size 15x50 - RenderBlock {P} at (4,358) size 628x20 - RenderText {#text} at (18,0) size 372x19 - text run at (18,0) width 372: "This paragraph should be between both tall orange rectangles." - RenderBlock (anonymous) at (4,394) size 628x20 + RenderImage {IMG} at (647,358) size 15x50 + RenderBlock {P} at (4,358) size 658x20 + RenderText {#text} at (18,0) size 390x19 + text run at (18,0) width 390: "This paragraph should be between both tall orange rectangles." + RenderBlock (anonymous) at (4,394) size 658x20 RenderBR {BR} at (18,0) size 0x19 layer at (8,121) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/clear_float-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/clear_float-expected.txt index c6cdd596ff2f..9f93833c18e2 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/clear_float-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/clear_float-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x826 +layer at (0,0) size 785x846 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x826 - RenderBlock {HTML} at (0,0) size 785x826 - RenderBody {BODY} at (8,8) size 769x810 [bgcolor=#CCCCCC] +layer at (0,0) size 785x846 + RenderBlock {HTML} at (0,0) size 785x846 + RenderBody {BODY} at (8,8) size 769x830 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,33) size 769x144 RenderText {#text} at (0,0) size 616x144 text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}" @@ -26,136 +26,137 @@ layer at (0,0) size 785x826 text run at (0,128) width 0: " " RenderBlock (floating) {DIV} at (0,200) size 192x126 [color=#FFFFFF] [bgcolor=#008000] RenderBlock {H1} at (8,8) size 176x23 - RenderText {#text} at (0,0) size 82x22 - text run at (0,0) width 82: "Top menu" + RenderText {#text} at (0,0) size 83x22 + text run at (0,0) width 83: "Top menu" RenderBlock {UL} at (24,34) size 156x81 RenderListItem {LI} at (0,0) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 33x19 - text run at (0,0) width 33: "green" + RenderText {#text} at (0,0) size 35x19 + text run at (0,0) width 35: "green" RenderListItem {LI} at (0,20) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "white text" + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "white text" RenderListItem {LI} at (0,40) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "0.5em padding" + RenderText {#text} at (0,0) size 94x19 + text run at (0,0) width 94: "0.5em padding" RenderListItem {LI} at (0,60) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 82x19 - text run at (0,0) width 82: "0.5em margin" + RenderText {#text} at (0,0) size 87x19 + text run at (0,0) width 87: "0.5em margin" RenderBlock (floating) {DIV} at (0,335) size 192x126 [color=#FFFFFF] [bgcolor=#0000FF] RenderBlock {H1} at (8,8) size 176x23 - RenderText {#text} at (0,0) size 109x22 - text run at (0,0) width 109: "Bottom menu" + RenderText {#text} at (0,0) size 112x22 + text run at (0,0) width 112: "Bottom menu" RenderBlock {UL} at (24,34) size 156x81 RenderListItem {LI} at (0,0) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 101x19 - text run at (0,0) width 101: "blue background" + RenderText {#text} at (0,0) size 106x19 + text run at (0,0) width 106: "blue background" RenderListItem {LI} at (0,20) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "white text" + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "white text" RenderListItem {LI} at (0,40) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "0.5em padding" + RenderText {#text} at (0,0) size 94x19 + text run at (0,0) width 94: "0.5em padding" RenderListItem {LI} at (0,60) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 82x19 - text run at (0,0) width 82: "0.5em margin" + RenderText {#text} at (0,0) size 87x19 + text run at (0,0) width 87: "0.5em margin" RenderBlock {DIV} at (224,200) size 513x236 [bgcolor=#FFFF00] RenderBlock {H1} at (8,29) size 497x38 - RenderText {#text} at (0,0) size 274x36 - text run at (0,0) width 274: "The 'clear' property" + RenderText {#text} at (0,0) size 275x36 + text run at (0,0) width 275: "The 'clear' property" RenderBlock {P} at (8,87) size 497x101 RenderText {#text} at (0,0) size 497x99 - text run at (0,0) width 497: "This page has two floating \"menus\" on the side; one has a green background, and" - text run at (0,20) width 185: "the other a blue background. " - text run at (184,20) width 313: "Due to settings on the 'float' and 'clear' properties," - text run at (0,40) width 497: "the two menus should appear on the left side of the page, the blue below the green." - text run at (0,60) width 497: "There should be a 10px gap between the two menus. There should also be a 10px" - text run at (0,80) width 306: "gap between the top menu and the top of the page." + text run at (0,0) width 497: "This page has two floating \"menus\" on the side; one has a green background," + text run at (0,20) width 232: "and the other a blue background. " + text run at (231,20) width 266: "Due to settings on the 'float' and 'clear'" + text run at (0,40) width 497: "properties, the two menus should appear on the left side of the page, the blue" + text run at (0,60) width 497: "below the green. There should be a 10px gap between the two menus. There" + text run at (0,80) width 459: "should also be a 10px gap between the top menu and the top of the page." RenderBlock {P} at (8,187) size 497x41 RenderText {#text} at (0,0) size 497x39 text run at (0,0) width 497: "The top of the yellow rectangle (to which this paragraph belongs) should be" - text run at (0,20) width 311: "vertically aligned with the top of the green rectangle." - RenderTable {TABLE} at (192,435) size 577x375 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 575x372 + text run at (0,20) width 331: "vertically aligned with the top of the green rectangle." + RenderTable {TABLE} at (192,435) size 577x395 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 575x392 RenderTableRow {TR} at (0,0) size 575x28 RenderTableCell {TD} at (0,0) size 575x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 575x344 - RenderTableCell {TD} at (0,185) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 575x364 + RenderTableCell {TD} at (0,195) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 563x344 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 563x364 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock (floating) {DIV} at (4,4) size 192x126 [color=#FFFFFF] [bgcolor=#008000] RenderBlock {H1} at (8,8) size 176x23 - RenderText {#text} at (0,0) size 82x22 - text run at (0,0) width 82: "Top menu" + RenderText {#text} at (0,0) size 83x22 + text run at (0,0) width 83: "Top menu" RenderBlock {UL} at (24,34) size 156x81 RenderListItem {LI} at (0,0) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 33x19 - text run at (0,0) width 33: "green" + RenderText {#text} at (0,0) size 35x19 + text run at (0,0) width 35: "green" RenderListItem {LI} at (0,20) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "white text" + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "white text" RenderListItem {LI} at (0,40) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "0.5em padding" + RenderText {#text} at (0,0) size 94x19 + text run at (0,0) width 94: "0.5em padding" RenderListItem {LI} at (0,60) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 82x19 - text run at (0,0) width 82: "0.5em margin" + RenderText {#text} at (0,0) size 87x19 + text run at (0,0) width 87: "0.5em margin" RenderBlock (floating) {DIV} at (4,139) size 192x126 [color=#FFFFFF] [bgcolor=#0000FF] RenderBlock {H1} at (8,8) size 176x23 - RenderText {#text} at (0,0) size 109x22 - text run at (0,0) width 109: "Bottom menu" + RenderText {#text} at (0,0) size 112x22 + text run at (0,0) width 112: "Bottom menu" RenderBlock {UL} at (24,34) size 156x81 RenderListItem {LI} at (0,0) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 101x19 - text run at (0,0) width 101: "blue background" + RenderText {#text} at (0,0) size 106x19 + text run at (0,0) width 106: "blue background" RenderListItem {LI} at (0,20) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "white text" + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "white text" RenderListItem {LI} at (0,40) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "0.5em padding" + RenderText {#text} at (0,0) size 94x19 + text run at (0,0) width 94: "0.5em padding" RenderListItem {LI} at (0,60) size 156x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 82x19 - text run at (0,0) width 82: "0.5em margin" - RenderBlock {DIV} at (228,4) size 299x336 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 87x19 + text run at (0,0) width 87: "0.5em margin" + RenderBlock {DIV} at (228,4) size 299x356 [bgcolor=#FFFF00] RenderBlock {H1} at (8,29) size 283x38 - RenderText {#text} at (0,0) size 274x36 - text run at (0,0) width 274: "The 'clear' property" - RenderBlock {P} at (8,87) size 283x181 - RenderText {#text} at (0,0) size 283x179 - text run at (0,0) width 283: "This page has two floating \"menus\" on the side;" - text run at (0,20) width 283: "one has a green background, and the other a" - text run at (0,40) width 112: "blue background. " - text run at (111,40) width 172: "Due to settings on the 'float'" - text run at (0,60) width 283: "and 'clear' properties, the two menus should" - text run at (0,80) width 283: "appear on the left side of the page, the blue" - text run at (0,100) width 283: "below the green. There should be a 10px gap" - text run at (0,120) width 283: "between the two menus. There should also be" - text run at (0,140) width 283: "a 10px gap between the top menu and the top" - text run at (0,160) width 71: "of the page." - RenderBlock {P} at (8,267) size 283x61 + RenderText {#text} at (0,0) size 275x36 + text run at (0,0) width 275: "The 'clear' property" + RenderBlock {P} at (8,87) size 283x201 + RenderText {#text} at (0,0) size 283x199 + text run at (0,0) width 283: "This page has two floating \"menus\" on the" + text run at (0,20) width 283: "side; one has a green background, and the" + text run at (0,40) width 166: "other a blue background. " + text run at (165,40) width 118: "Due to settings on" + text run at (0,60) width 283: "the 'float' and 'clear' properties, the two" + text run at (0,80) width 283: "menus should appear on the left side of the" + text run at (0,100) width 283: "page, the blue below the green. There" + text run at (0,120) width 283: "should be a 10px gap between the two" + text run at (0,140) width 283: "menus. There should also be a 10px gap" + text run at (0,160) width 283: "between the top menu and the top of the" + text run at (0,180) width 34: "page." + RenderBlock {P} at (8,287) size 283x61 RenderText {#text} at (0,0) size 283x59 - text run at (0,0) width 283: "The top of the yellow rectangle (to which this" - text run at (0,20) width 283: "paragraph belongs) should be vertically aligned" - text run at (0,40) width 208: "with the top of the green rectangle." + text run at (0,0) width 283: "The top of the yellow rectangle (to which" + text run at (0,20) width 283: "this paragraph belongs) should be vertically" + text run at (0,40) width 269: "aligned with the top of the green rectangle." layer at (8,198) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,190) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/float-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/float-expected.txt index 1d16d10f63c9..e5b78f0b5634 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/float-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/float-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 160x48 text run at (0,0) width 152: ".one {float: left;}" @@ -15,25 +15,25 @@ layer at (0,0) size 800x600 text run at (0,32) width 0: " " RenderImage {IMG} at (0,107) size 15x50 RenderBlock {P} at (0,115) size 784x40 - RenderText {#text} at (15,0) size 762x39 - text run at (15,0) width 567: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " - text run at (582,0) width 195: "In this case, it is the image which" - text run at (15,20) width 162: "has been floated to the left." + RenderText {#text} at (15,0) size 763x39 + text run at (15,0) width 598: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " + text run at (613,0) width 165: "In this case, it is the image" + text run at (15,20) width 212: "which has been floated to the left." RenderBlock (anonymous) at (0,171) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderImage {IMG} at (769,209) size 15x50 RenderBlock {P} at (0,217) size 784x40 - RenderText {#text} at (0,0) size 731x39 - text run at (0,0) width 575: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " - text run at (575,0) width 156: "In this case, it is the image" - text run at (0,20) width 209: "which has been floated to the right." + RenderText {#text} at (0,0) size 730x39 + text run at (0,0) width 607: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " + text run at (607,0) width 123: "In this case, it is the" + text run at (0,20) width 263: "image which has been floated to the right." RenderTable {TABLE} at (0,273) size 784x182 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x180 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x152 RenderTableCell {TD} at (0,90) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 @@ -41,18 +41,18 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (12,28) size 770x152 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderImage {IMG} at (4,4) size 15x50 RenderBlock {P} at (4,4) size 762x40 - RenderText {#text} at (15,0) size 723x39 - text run at (15,0) width 567: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " - text run at (582,0) width 156: "In this case, it is the image" - text run at (15,20) width 201: "which has been floated to the left." + RenderText {#text} at (15,0) size 721x39 + text run at (15,0) width 598: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " + text run at (613,0) width 123: "In this case, it is the" + text run at (15,20) width 254: "image which has been floated to the left." RenderBlock (anonymous) at (4,60) size 762x20 RenderBR {BR} at (0,0) size 0x19 RenderImage {IMG} at (751,98) size 15x50 RenderBlock {P} at (4,106) size 762x40 - RenderText {#text} at (0,0) size 731x39 - text run at (0,0) width 575: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " - text run at (575,0) width 156: "In this case, it is the image" - text run at (0,20) width 209: "which has been floated to the right." + RenderText {#text} at (0,0) size 730x39 + text run at (0,0) width 607: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " + text run at (607,0) width 123: "In this case, it is the" + text run at (0,20) width 263: "image which has been floated to the right." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] layer at (8,207) size 784x2 clip at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css1/box_properties/float_elements_in_series-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/float_elements_in_series-expected.txt index a0daa1cf44aa..c40637bdad2d 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/float_elements_in_series-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/float_elements_in_series-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x732 RenderBlock {HTML} at (0,0) size 785x732 RenderBody {BODY} at (8,8) size 769x704 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,33) size 769x208 RenderText {#text} at (0,0) size 512x208 text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}" @@ -35,24 +35,24 @@ layer at (0,0) size 785x732 RenderBlock {P} at (0,264) size 769x40 RenderText {#text} at (0,0) size 769x39 text run at (0,0) width 769: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this page" - text run at (0,20) width 381: "indicates how the DIV elements should be laid out horizontally. " - text run at (381,20) width 204: "They should align with each other." + text run at (0,20) width 403: "indicates how the DIV elements should be laid out horizontally. " + text run at (403,20) width 218: "They should align with each other." RenderBlock (floating) {DIV} at (0,314) size 140x100 [bgcolor=#FFFF00] [border: (20px solid #000000)] RenderBlock {P} at (40,40) size 60x20 - RenderText {#text} at (0,0) size 43x19 - text run at (0,0) width 43: "Yellow" + RenderText {#text} at (0,0) size 45x19 + text run at (0,0) width 45: "Yellow" RenderBlock (floating) {DIV} at (160,314) size 140x100 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] RenderBlock {P} at (40,40) size 60x20 - RenderText {#text} at (0,0) size 27x19 - text run at (0,0) width 27: "Blue" + RenderText {#text} at (0,0) size 30x19 + text run at (0,0) width 30: "Blue" RenderBlock (floating) {DIV} at (320,314) size 140x100 [bgcolor=#FF0000] [border: (20px solid #000000)] RenderBlock {P} at (40,40) size 60x20 - RenderText {#text} at (0,0) size 25x19 - text run at (0,0) width 25: "Red" + RenderText {#text} at (0,0) size 26x19 + text run at (0,0) width 26: "Red" RenderBlock (floating) {DIV} at (480,314) size 140x100 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] RenderBlock {P} at (40,40) size 60x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "Green" + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Green" RenderBlock {DIV} at (0,424) size 769x21 RenderTable {TABLE} at (0,0) size 620x21 RenderTableSection {TBODY} at (0,0) size 620x21 @@ -92,9 +92,9 @@ layer at (0,0) size 785x732 RenderTableSection {TBODY} at (1,1) size 767x237 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x209 RenderTableCell {TD} at (0,118) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 @@ -102,25 +102,25 @@ layer at (0,0) size 785x732 RenderTableCell {TD} at (12,28) size 755x209 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x40 RenderText {#text} at (0,0) size 747x39 - text run at (0,0) width 747: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this page" - text run at (0,20) width 381: "indicates how the DIV elements should be laid out horizontally. " - text run at (381,20) width 204: "They should align with each other." + text run at (0,0) width 747: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this" + text run at (0,20) width 437: "page indicates how the DIV elements should be laid out horizontally. " + text run at (437,20) width 218: "They should align with each other." RenderBlock (floating) {DIV} at (4,54) size 140x100 [bgcolor=#FFFF00] [border: (20px solid #000000)] RenderBlock {P} at (40,40) size 60x20 - RenderText {#text} at (0,0) size 43x19 - text run at (0,0) width 43: "Yellow" + RenderText {#text} at (0,0) size 45x19 + text run at (0,0) width 45: "Yellow" RenderBlock (floating) {DIV} at (164,54) size 140x100 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] RenderBlock {P} at (40,40) size 60x20 - RenderText {#text} at (0,0) size 27x19 - text run at (0,0) width 27: "Blue" + RenderText {#text} at (0,0) size 30x19 + text run at (0,0) width 30: "Blue" RenderBlock (floating) {DIV} at (324,54) size 140x100 [bgcolor=#FF0000] [border: (20px solid #000000)] RenderBlock {P} at (40,40) size 60x20 - RenderText {#text} at (0,0) size 25x19 - text run at (0,0) width 25: "Red" + RenderText {#text} at (0,0) size 26x19 + text run at (0,0) width 26: "Red" RenderBlock (floating) {DIV} at (484,54) size 140x100 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] RenderBlock {P} at (40,40) size 60x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "Green" + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Green" RenderBlock {DIV} at (4,164) size 747x21 RenderTable {TABLE} at (0,0) size 620x21 RenderTableSection {TBODY} at (0,0) size 620x21 diff --git a/LayoutTests/platform/wincairo/css1/box_properties/float_margin-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/float_margin-expected.txt index 0aa969b167de..d106e74287ae 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/float_margin-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/float_margin-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1915 RenderBlock {HTML} at (0,0) size 785x1915 RenderBody {BODY} at (8,8) size 769x1899 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x144 RenderText {#text} at (0,0) size 560x144 text run at (0,0) width 344: "P.test {background: white; font-size: 20px;" @@ -26,138 +26,141 @@ layer at (0,0) size 785x1915 text run at (400,112) width 0: " " text run at (0,128) width 0: " " RenderBlock {P} at (30,215) size 729x92 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 719x91 - text run at (0,0) width 719: "This paragraph should have a white background which extends to the edges of the element's" - text run at (0,23) width 39: "box. " - text run at (39,23) width 431: "There is no padding set on this paragraph whatsoever. " - text run at (470,23) width 235: "If the background of the entire" - text run at (0,46) width 696: "box is not white, this may cause problems with the following tests; at any rate, it must be" - text run at (0,69) width 146: "taken into account." + RenderText {#text} at (0,0) size 729x91 + text run at (0,0) width 663: "This paragraph should have a white background which extends to the edges of the" + text run at (0,23) width 122: "element's box. " + text run at (122,23) width 441: "There is no padding set on this paragraph whatsoever. " + text run at (563,23) width 166: "If the background of" + text run at (0,46) width 721: "the entire box is not white, this may cause problems with the following tests; at any rate," + text run at (0,69) width 240: "it must be taken into account." RenderBlock {P} at (30,327) size 729x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (60,0) size 724x114 - text run at (60,0) width 615: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,23) width 112: "nothing more. " - text run at (172,23) width 552: "The edges of the white background should line up with the top and left" - text run at (60,46) width 156: "edges of the image. " - text run at (216,46) width 471: "This paragraph should have a white background, first of all," - text run at (0,69) width 381: "which extends to the edges of the element's box. " - text run at (381,69) width 325: "There is no padding set on this paragraph" - text run at (0,92) width 96: "whatsoever." + RenderText {#text} at (60,0) size 719x114 + text run at (60,0) width 638: "The image in the upper left corner of this paragraph should be floated left, and" + text run at (60,23) width 119: "nothing more. " + text run at (179,23) width 540: "The edges of the white background should line up with the top and" + text run at (60,46) width 196: "left edges of the image. " + text run at (256,46) width 454: "This paragraph should have a white background, first of" + text run at (0,69) width 428: "all, which extends to the edges of the element's box. " + text run at (428,69) width 249: "There is no padding set on this" + text run at (0,92) width 182: "paragraph whatsoever." RenderBlock {P} at (30,462) size 729x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (30,30) size 60x60 - RenderText {#text} at (90,0) size 726x114 - text run at (90,0) width 628: "The image in the upper left corner of this paragraph should be pushed down and" - text run at (90,23) width 627: "to the right 30 pixels each from the upper left corner of the paragraph's box, and" - text run at (90,46) width 320: "displace the paragraph text accordingly. " - text run at (410,46) width 281: "This paragraph should have a white" - text run at (90,69) width 571: "background, first of all, which extends to the edges of the element's box. " - text run at (661,69) width 65: "There is" - text run at (0,92) width 356: "no padding set on this paragraph whatsoever." + RenderText {#text} at (90,0) size 717x114 + text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be pushed down" + text run at (90,23) width 611: "and to the right 30 pixels each from the upper left corner of the paragraph's" + text run at (90,46) width 403: "box, and displace the paragraph text accordingly. " + text run at (493,46) width 224: "This paragraph should have" + text run at (90,69) width 613: "a white background, first of all, which extends to the edges of the element's" + text run at (0,92) width 40: "box. " + text run at (40,92) width 436: "There is no padding set on this paragraph whatsoever." RenderBlock {P} at (30,597) size 729x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (-30,-30) size 60x60 - RenderText {#text} at (30,0) size 728x114 - text run at (30,0) width 682: "The image in the upper left corner of this paragraph should be pushed up and to the left" - text run at (30,23) width 683: "30 pixels each from the upper left corner of the paragraph's box, thus causing the edges" - text run at (0,46) width 556: "of the white background to align with the thick gray lines in the image. " - text run at (556,46) width 119: "This paragraph" - text run at (0,69) width 728: "should have a white background, first of all, which extends to the edges of the element's box." - text run at (0,92) width 426: "There is no padding set on this paragraph whatsoever." + RenderText {#text} at (30,0) size 721x114 + text run at (30,0) width 676: "The image in the upper left corner of this paragraph should be pushed up and to the" + text run at (30,23) width 691: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing the" + text run at (0,46) width 633: "edges of the white background to align with the thick gray lines in the image. " + text run at (633,46) width 36: "This" + text run at (0,69) width 719: "paragraph should have a white background, first of all, which extends to the edges of the" + text run at (0,92) width 122: "element's box. " + text run at (122,92) width 436: "There is no padding set on this paragraph whatsoever." RenderBlock {P} at (30,732) size 729x138 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 RenderText {#text} at (90,0) size 728x137 - text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (90,23) width 616: "the edges of the white background should line up with the top and left edges of" - text run at (90,46) width 85: "the image. " - text run at (175,46) width 526: "However, there should be 30 pixels of space between the right and" - text run at (90,69) width 468: "bottom edges of the image and the paragraph text around it. " - text run at (558,69) width 119: "This paragraph" - text run at (0,92) width 728: "should have a white background, first of all, which extends to the edges of the element's box." - text run at (0,115) width 426: "There is no padding set on this paragraph whatsoever." + text run at (90,0) width 638: "The image in the upper left corner of this paragraph should be floated left, and" + text run at (90,23) width 618: "the edges of the white background should line up with the top and left edges" + text run at (90,46) width 112: "of the image. " + text run at (202,46) width 503: "However, there should be 30 pixels of space between the right" + text run at (90,69) width 524: "and bottom edges of the image and the paragraph text around it. " + text run at (614,69) width 36: "This" + text run at (0,92) width 719: "paragraph should have a white background, first of all, which extends to the edges of the" + text run at (0,115) width 122: "element's box. " + text run at (122,115) width 436: "There is no padding set on this paragraph whatsoever." RenderBlock {P} at (30,890) size 729x138 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (30,0) size 724x137 - text run at (30,0) width 693: "The image in the upper left corner of this paragraph should be floated left, and the edges" - text run at (30,23) width 623: "of the white background should line up with the top and left edges of the image." - text run at (0,46) width 724: "However, the text should overlap the image's right and bottom sides, lining up with the thick" - text run at (0,69) width 187: "gray lines in the image. " - text run at (187,69) width 524: "This paragraph should have a white background, first of all, which" - text run at (0,92) width 328: "extends to the edges of the element's box. " - text run at (328,92) width 325: "There is no padding set on this paragraph" - text run at (0,115) width 96: "whatsoever." + RenderText {#text} at (30,0) size 706x137 + text run at (30,0) width 668: "The image in the upper left corner of this paragraph should be floated left, and the" + text run at (30,23) width 640: "edges of the white background should line up with the top and left edges of the" + text run at (0,46) width 60: "image. " + text run at (60,46) width 635: "However, the text should overlap the image's right and bottom sides, lining up" + text run at (0,69) width 313: "with the thick gray lines in the image. " + text run at (313,69) width 393: "This paragraph should have a white background," + text run at (0,92) width 489: "first of all, which extends to the edges of the element's box. " + text run at (489,92) width 214: "There is no padding set on" + text run at (0,115) width 217: "this paragraph whatsoever." RenderTable {TABLE} at (0,1048) size 769x851 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x849 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x821 RenderTableCell {TD} at (0,424) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x821 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (34,4) size 707x92 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 705x91 - text run at (0,0) width 641: "This paragraph should have a white background which extends to the edges of the" - text run at (0,23) width 117: "element's box. " - text run at (117,23) width 431: "There is no padding set on this paragraph whatsoever. " - text run at (548,23) width 157: "If the background of" - text run at (0,46) width 693: "the entire box is not white, this may cause problems with the following tests; at any rate," - text run at (0,69) width 227: "it must be taken into account." + RenderText {#text} at (0,0) size 707x91 + text run at (0,0) width 663: "This paragraph should have a white background which extends to the edges of the" + text run at (0,23) width 122: "element's box. " + text run at (122,23) width 441: "There is no padding set on this paragraph whatsoever. " + text run at (563,23) width 144: "If the background" + text run at (0,46) width 702: "of the entire box is not white, this may cause problems with the following tests; at any" + text run at (0,69) width 281: "rate, it must be taken into account." RenderBlock {P} at (34,116) size 707x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (60,0) size 693x114 - text run at (60,0) width 615: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,23) width 112: "nothing more. " - text run at (172,23) width 521: "The edges of the white background should line up with the top and" - text run at (60,46) width 187: "left edges of the image. " - text run at (247,46) width 440: "This paragraph should have a white background, first of" - text run at (0,69) width 412: "all, which extends to the edges of the element's box. " - text run at (412,69) width 241: "There is no padding set on this" - text run at (0,92) width 180: "paragraph whatsoever." + RenderText {#text} at (60,0) size 703x114 + text run at (60,0) width 638: "The image in the upper left corner of this paragraph should be floated left, and" + text run at (60,23) width 119: "nothing more. " + text run at (179,23) width 506: "The edges of the white background should line up with the top" + text run at (60,46) width 230: "and left edges of the image. " + text run at (290,46) width 393: "This paragraph should have a white background," + text run at (0,69) width 489: "first of all, which extends to the edges of the element's box. " + text run at (489,69) width 214: "There is no padding set on" + text run at (0,92) width 217: "this paragraph whatsoever." RenderBlock {P} at (34,251) size 707x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (30,30) size 60x60 - RenderText {#text} at (90,0) size 700x114 - text run at (90,0) width 595: "The image in the upper left corner of this paragraph should be pushed down" - text run at (90,23) width 588: "and to the right 30 pixels each from the upper left corner of the paragraph's" - text run at (90,46) width 392: "box, and displace the paragraph text accordingly. " - text run at (482,46) width 218: "This paragraph should have" - text run at (90,69) width 590: "a white background, first of all, which extends to the edges of the element's" - text run at (0,92) width 39: "box. " - text run at (39,92) width 426: "There is no padding set on this paragraph whatsoever." + RenderText {#text} at (90,0) size 705x114 + text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be pushed down" + text run at (90,23) width 611: "and to the right 30 pixels each from the upper left corner of the paragraph's" + text run at (90,46) width 403: "box, and displace the paragraph text accordingly. " + text run at (493,46) width 181: "This paragraph should" + text run at (90,69) width 574: "have a white background, first of all, which extends to the edges of the" + text run at (0,92) width 122: "element's box. " + text run at (122,92) width 436: "There is no padding set on this paragraph whatsoever." RenderBlock {P} at (34,386) size 707x115 [bgcolor=#FFFFFF] RenderImage {IMG} at (-30,-30) size 60x60 - RenderText {#text} at (30,0) size 695x114 - text run at (30,0) width 651: "The image in the upper left corner of this paragraph should be pushed up and to the" - text run at (30,23) width 664: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing the" - text run at (0,46) width 606: "edges of the white background to align with the thick gray lines in the image. " - text run at (606,46) width 35: "This" - text run at (0,69) width 695: "paragraph should have a white background, first of all, which extends to the edges of the" - text run at (0,92) width 117: "element's box. " - text run at (117,92) width 426: "There is no padding set on this paragraph whatsoever." + RenderText {#text} at (30,0) size 706x114 + text run at (30,0) width 676: "The image in the upper left corner of this paragraph should be pushed up and to the" + text run at (30,23) width 661: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing" + text run at (0,46) width 663: "the edges of the white background to align with the thick gray lines in the image. " + text run at (663,46) width 36: "This" + text run at (0,69) width 689: "paragraph should have a white background, first of all, which extends to the edges of" + text run at (0,92) width 152: "the element's box. " + text run at (152,92) width 436: "There is no padding set on this paragraph whatsoever." RenderBlock {P} at (34,521) size 707x138 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 - RenderText {#text} at (90,0) size 706x137 - text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (90,23) width 616: "the edges of the white background should line up with the top and left edges of" - text run at (90,46) width 85: "the image. " - text run at (175,46) width 526: "However, there should be 30 pixels of space between the right and" - text run at (90,69) width 468: "bottom edges of the image and the paragraph text around it. " - text run at (558,69) width 119: "This paragraph" - text run at (0,92) width 689: "should have a white background, first of all, which extends to the edges of the element's" - text run at (0,115) width 39: "box. " - text run at (39,115) width 426: "There is no padding set on this paragraph whatsoever." + RenderText {#text} at (90,0) size 694x137 + text run at (90,0) width 604: "The image in the upper left corner of this paragraph should be floated left," + text run at (90,23) width 601: "and the edges of the white background should line up with the top and left" + text run at (90,46) width 163: "edges of the image. " + text run at (253,46) width 429: "However, there should be 30 pixels of space between" + text run at (90,69) width 593: "the right and bottom edges of the image and the paragraph text around it." + text run at (0,92) width 657: "This paragraph should have a white background, first of all, which extends to the" + text run at (0,115) width 225: "edges of the element's box. " + text run at (225,115) width 436: "There is no padding set on this paragraph whatsoever." RenderBlock {P} at (34,679) size 707x138 [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 60x60 RenderText {#text} at (30,0) size 706x137 - text run at (30,0) width 643: "The image in the upper left corner of this paragraph should be floated left, and the" - text run at (30,23) width 673: "edges of the white background should line up with the top and left edges of the image." - text run at (0,46) width 681: "However, the text should overlap the image's right and bottom sides, lining up with the" - text run at (0,69) width 230: "thick gray lines in the image. " - text run at (230,69) width 471: "This paragraph should have a white background, first of all," - text run at (0,92) width 381: "which extends to the edges of the element's box. " - text run at (381,92) width 325: "There is no padding set on this paragraph" - text run at (0,115) width 96: "whatsoever." + text run at (30,0) width 668: "The image in the upper left corner of this paragraph should be floated left, and the" + text run at (30,23) width 640: "edges of the white background should line up with the top and left edges of the" + text run at (0,46) width 60: "image. " + text run at (60,46) width 635: "However, the text should overlap the image's right and bottom sides, lining up" + text run at (0,69) width 313: "with the thick gray lines in the image. " + text run at (313,69) width 393: "This paragraph should have a white background," + text run at (0,92) width 489: "first of all, which extends to the edges of the element's box. " + text run at (489,92) width 214: "There is no padding set on" + text run at (0,115) width 217: "this paragraph whatsoever." layer at (8,201) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,193) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/float_on_text_elements-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/float_on_text_elements-expected.txt index 2b4e48b00af1..966f75959bd5 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/float_on_text_elements-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/float_on_text_elements-expected.txt @@ -1,366 +1,370 @@ -layer at (0,0) size 785x2846 +layer at (0,0) size 785x2946 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2846 - RenderBlock {HTML} at (0,0) size 785x2846 - RenderBody {BODY} at (8,8) size 769x2830 [bgcolor=#CCCCCC] +layer at (0,0) size 785x2946 + RenderBlock {HTML} at (0,0) size 785x2946 + RenderBody {BODY} at (8,8) size 769x2930 [bgcolor=#CCCCCC] RenderBlock (floating) {P} at (0,0) size 385x40 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 385x39 - text run at (0,0) width 385: "This paragraph is of class \"one\". It has a width of 50% and is" - text run at (0,20) width 105: "floated to the left." - RenderBlock {P} at (0,0) size 769x80 - RenderText {#text} at (384,0) size 769x79 + text run at (0,0) width 385: "This paragraph is of class \"one\". It has a width of 50% and" + text run at (0,20) width 124: "is floated to the left." + RenderBlock {P} at (0,0) size 769x100 + RenderText {#text} at (384,0) size 769x99 text run at (384,0) width 385: "This paragraph should start on the right side of a yellow box" text run at (384,20) width 385: "which contains the previous paragraph. Since the text of this" - text run at (0,40) width 769: "element is much longer than the text in the previous element, the text will wrap around the yellow box. There is no padding," - text run at (0,60) width 709: "border or margins on this and the previous element, so the text of the two elements should be very close to each other." - RenderBlock (anonymous) at (0,80) size 769x20 + text run at (0,40) width 769: "element is much longer than the text in the previous element, the text will wrap around the yellow box. There is no" + text run at (0,60) width 769: "padding, border or margins on this and the previous element, so the text of the two elements should be very close to each" + text run at (0,80) width 35: "other." + RenderBlock (anonymous) at (0,100) size 769x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (floating) {P} at (0,118) size 769x80 [bgcolor=#FFFF00] + RenderBlock (floating) {P} at (0,138) size 769x80 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 769x79 - text run at (0,0) width 769: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent element" - text run at (0,20) width 769: "allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides and a orange" - text run at (0,40) width 769: "square image should be seen AFTER the paragraph, not next to it. A yellow background has been added to this paragraph for" - text run at (0,60) width 123: "diagnostic purposes." - RenderBlock (anonymous) at (0,118) size 769x100 + text run at (0,0) width 769: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent" + text run at (0,20) width 769: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides and a" + text run at (0,40) width 769: "orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added to this" + text run at (0,60) width 217: "paragraph for diagnostic purposes." + RenderBlock (anonymous) at (0,138) size 769x100 RenderImage {IMG} at (0,80) size 15x15 RenderText {#text} at (15,80) size 4x19 text run at (15,80) width 4: " " RenderBR {BR} at (19,80) size 0x19 - RenderBlock (floating) {P} at (0,236) size 385x100 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 385x99 - text run at (0,0) width 385: "This paragraph is floated to the left and the orange square image" - text run at (0,20) width 385: "should appear to the right of the paragraph. This paragraph has" - text run at (0,40) width 385: "a yellow background and no padding, margin or border. The" - text run at (0,60) width 385: "right edge of this yellow box should be horizontally aligned with" - text run at (0,80) width 260: "the left edge of the yellow box undernearth." - RenderBlock (anonymous) at (0,236) size 769x100 + RenderBlock (floating) {P} at (0,256) size 385x120 [bgcolor=#FFFF00] + RenderText {#text} at (0,0) size 385x119 + text run at (0,0) width 385: "This paragraph is floated to the left and the orange square" + text run at (0,20) width 385: "image should appear to the right of the paragraph. This" + text run at (0,40) width 385: "paragraph has a yellow background and no padding, margin" + text run at (0,60) width 385: "or border. The right edge of this yellow box should be" + text run at (0,80) width 385: "horizontally aligned with the left edge of the yellow box" + text run at (0,100) width 79: "undernearth." + RenderBlock (anonymous) at (0,256) size 769x120 RenderImage {IMG} at (384,0) size 16x15 RenderText {#text} at (399,0) size 5x19 text run at (399,0) width 5: " " RenderBR {BR} at (403,0) size 1x19 - RenderBlock (floating) {P} at (384,354) size 385x120 [bgcolor=#FFFF00] + RenderBlock (floating) {P} at (384,394) size 385x120 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 385x119 - text run at (0,0) width 385: "This paragraph is floated to the right (using a STYLE attribute)" - text run at (0,20) width 385: "and the orange square image should appear to the left of the" - text run at (0,40) width 385: "paragraph. This paragraph has a yellow background and no" - text run at (0,60) width 385: "padding, margin or border. The left edge of this yellow box" - text run at (0,80) width 385: "should be horizonally aligned with the right edge of the yellow" - text run at (0,100) width 68: "box above." - RenderBlock (anonymous) at (0,354) size 769x120 + text run at (0,0) width 385: "This paragraph is floated to the right (using a STYLE" + text run at (0,20) width 385: "attribute) and the orange square image should appear to the" + text run at (0,40) width 385: "left of the paragraph. This paragraph has a yellow" + text run at (0,60) width 385: "background and no padding, margin or border. The left edge" + text run at (0,80) width 385: "of this yellow box should be horizonally aligned with the" + text run at (0,100) width 224: "right edge of the yellow box above." + RenderBlock (anonymous) at (0,394) size 769x120 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (15,0) size 4x19 text run at (15,0) width 4: " " RenderBR {BR} at (19,0) size 0x19 - RenderBlock {P} at (0,492) size 769x60 + RenderBlock {P} at (0,532) size 769x60 RenderBlock (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 21x36 text run at (0,0) width 21: "T" RenderText {#text} at (48,0) size 769x59 - text run at (48,0) width 721: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as well as" - text run at (48,20) width 432: "bold, with a content width of 1.5em and a background-color of silver. " - text run at (479,20) width 290: "The top of the big letter \"T\" should be vertically" - text run at (0,40) width 559: "aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." - RenderBlock (anonymous) at (0,552) size 769x20 + text run at (48,0) width 721: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as" + text run at (48,20) width 496: "well as bold, with a content width of 1.5em and a background-color of silver. " + text run at (543,20) width 226: "The top of the big letter \"T\" should" + text run at (0,40) width 675: "be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." + RenderBlock (anonymous) at (0,592) size 769x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (floating) {P} at (423,600) size 336x216 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] + RenderBlock (floating) {P} at (423,640) size 336x216 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] RenderText {#text} at (8,8) size 320x199 - text run at (8,8) width 320: "This paragraph should be floated to the right, sort of" - text run at (8,28) width 320: "like a 'sidebar' in a magazine article. Its width is" - text run at (8,48) width 320: "20em so the box should not be reformatted when the" - text run at (8,68) width 320: "size of the viewport is changed (e.g. when the" + text run at (8,8) width 320: "This paragraph should be floated to the right, sort" + text run at (8,28) width 320: "of like a 'sidebar' in a magazine article. Its width is" + text run at (8,48) width 320: "20em so the box should not be reformatted when" + text run at (8,68) width 320: "the size of the viewport is changed (e.g. when the" text run at (8,88) width 320: "window is resized). The background color of the" text run at (8,108) width 320: "element is yellow, and there should be a 3px solid" text run at (8,128) width 320: "red border outside a 5px wide padding. Also, the" - text run at (8,148) width 320: "element has a 10px wide margin around it where the" - text run at (8,168) width 320: "blue background of the paragraph in the normal flow" - text run at (8,188) width 126: "should shine through." - RenderBlock {P} at (0,590) size 769x220 [bgcolor=#66CCFF] + text run at (8,148) width 320: "element has a 10px wide margin around it where" + text run at (8,168) width 320: "the blue background of the paragraph in the" + text run at (8,188) width 217: "normal flow should shine through." + RenderBlock {P} at (0,630) size 769x220 [bgcolor=#66CCFF] RenderText {#text} at (0,0) size 413x219 text run at (0,0) width 413: "This paragraph is not floating. If there is enough room, the textual" - text run at (0,20) width 413: "content of the paragraph should appear on the left side of the yellow" - text run at (0,40) width 133: "\"sidebar\" on the right. " - text run at (133,40) width 280: "The content of this element should flow around" - text run at (0,60) width 127: "the floated element. " - text run at (126,60) width 287: "However, the floated element may or may not" - text run at (0,80) width 413: "be obscured by the blue background of this element, as the" - text run at (0,100) width 343: "specification does not say which is drawn \"on top.\" " - text run at (342,100) width 71: "Even if the" - text run at (0,120) width 413: "floated element is obscured, it still forces the content of this element" - text run at (0,140) width 107: "to flow around it. " - text run at (107,140) width 306: "If the floated element is not obscured, then the blue" - text run at (0,160) width 413: "rectangle of this paragraph should extend 10px above and to the" - text run at (0,180) width 413: "right of the sidebar's red border, due to the margin styles set for the" - text run at (0,200) width 95: "floated element." - RenderBlock (anonymous) at (0,810) size 769x20 + text run at (0,20) width 413: "content of the paragraph should appear on the left side of the" + text run at (0,40) width 193: "yellow \"sidebar\" on the right. " + text run at (193,40) width 220: "The content of this element should" + text run at (0,60) width 220: "flow around the floated element. " + text run at (219,60) width 194: "However, the floated element" + text run at (0,80) width 413: "may or may not be obscured by the blue background of this" + text run at (0,100) width 413: "element, as the specification does not say which is drawn \"on" + text run at (0,120) width 38: "top.\" " + text run at (37,120) width 376: "Even if the floated element is obscured, it still forces the" + text run at (0,140) width 264: "content of this element to flow around it. " + text run at (263,140) width 150: "If the floated element is" + text run at (0,160) width 413: "not obscured, then the blue rectangle of this paragraph should" + text run at (0,180) width 413: "extend 10px above and to the right of the sidebar's red border," + text run at (0,200) width 319: "due to the margin styles set for the floated element." + RenderBlock (anonymous) at (0,850) size 769x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock {DIV} at (0,848) size 769x28 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] + RenderBlock {DIV} at (0,888) size 769x28 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] RenderBlock (floating) {DIV} at (425,14) size 330x250 [bgcolor=#FFFF00] RenderBlock {P} at (5,5) size 320x240 RenderText {#text} at (0,0) size 320x239 - text run at (0,0) width 320: "This paragraph is placed inside a DIV element which" - text run at (0,20) width 320: "is floated to the right. The width of the DIV element" - text run at (0,40) width 320: "is 20em. The background is yellow and there is a" - text run at (0,60) width 320: "5px padding, a 10px margin and no border. Since it" - text run at (0,80) width 320: "is floated, the yellow box should be rendered on top" - text run at (0,100) width 320: "of the background and borders of adjacent non-" - text run at (0,120) width 320: "floated elements. To the left of this yellow box there" - text run at (0,140) width 320: "should be a short paragraph with a blue background" - text run at (0,160) width 320: "and a red border. The yellow box should be" - text run at (0,180) width 320: "rendered on top of the bottom red border. I.e., the" - text run at (0,200) width 320: "bottom red border will appear broken where it's" - text run at (0,220) width 194: "overlaid by the yellow rectangle." + text run at (0,0) width 320: "This paragraph is placed inside a DIV element" + text run at (0,20) width 320: "which is floated to the right. The width of the DIV" + text run at (0,40) width 320: "element is 20em. The background is yellow and" + text run at (0,60) width 320: "there is a 5px padding, a 10px margin and no" + text run at (0,80) width 320: "border. Since it is floated, the yellow box should" + text run at (0,100) width 320: "be rendered on top of the background and borders" + text run at (0,120) width 320: "of adjacent non-floated elements. To the left of this" + text run at (0,140) width 320: "yellow box there should be a short paragraph with" + text run at (0,160) width 320: "a blue background and a red border. The yellow" + text run at (0,180) width 320: "box should be rendered on top of the bottom red" + text run at (0,200) width 320: "border. I.e., the bottom red border will appear" + text run at (0,220) width 318: "broken where it's overlaid by the yellow rectangle." RenderBlock {P} at (4,4) size 761x20 - RenderText {#text} at (0,0) size 255x19 - text run at (0,0) width 255: "See description in the box on the right side" - RenderBlock (anonymous) at (0,876) size 769x246 + RenderText {#text} at (0,0) size 268x19 + text run at (0,0) width 268: "See description in the box on the right side" + RenderBlock (anonymous) at (0,916) size 769x246 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (floating) {DIV} at (0,1140) size 193x80 [bgcolor=#66CCFF] + RenderBlock (floating) {DIV} at (0,1180) size 193x80 [bgcolor=#66CCFF] RenderBlock {P} at (0,0) size 193x80 RenderText {#text} at (0,0) size 193x79 - text run at (0,0) width 193: "This paragraph is inside a DIV" - text run at (0,20) width 193: "which is floated left. Its" + text run at (0,0) width 193: "This paragraph is inside a" + text run at (0,20) width 193: "DIV which is floated left. Its" text run at (0,40) width 193: "background is blue and the" - text run at (0,60) width 83: "width is 25%." - RenderBlock (floating) {DIV} at (576,1140) size 193x80 [bgcolor=#FFFF00] + text run at (0,60) width 87: "width is 25%." + RenderBlock (floating) {DIV} at (576,1180) size 193x80 [bgcolor=#FFFF00] RenderBlock {P} at (0,0) size 193x80 RenderText {#text} at (0,0) size 193x79 - text run at (0,0) width 193: "This paragraph is inside a DIV" - text run at (0,20) width 193: "which is floated right. Its" + text run at (0,0) width 193: "This paragraph is inside a" + text run at (0,20) width 193: "DIV which is floated right. Its" text run at (0,40) width 193: "background is yellow and the" - text run at (0,60) width 83: "width is 25%." - RenderBlock {P} at (0,1140) size 769x40 + text run at (0,60) width 87: "width is 25%." + RenderBlock {P} at (0,1180) size 769x40 RenderText {#text} at (192,0) size 385x39 - text run at (192,0) width 385: "This paragraph should appear between a blue box (on the left)" - text run at (192,20) width 189: "and a yellow box (on the right)." - RenderBlock (anonymous) at (0,1180) size 769x40 + text run at (192,0) width 385: "This paragraph should appear between a blue box (on the" + text run at (192,20) width 30: "left) " + text run at (221,20) width 200: "and a yellow box (on the right)." + RenderBlock (anonymous) at (0,1220) size 769x40 RenderBR {BR} at (192,0) size 1x19 - RenderBlock (floating) {DIV} at (0,1238) size 577x120 [bgcolor=#66CCFF] + RenderBlock (floating) {DIV} at (0,1278) size 577x140 [bgcolor=#66CCFF] RenderBlock (floating) {DIV} at (422,0) size 145x40 [bgcolor=#FFFF00] RenderBlock {P} at (0,0) size 145x40 RenderText {#text} at (0,0) size 145x39 text run at (0,0) width 145: "See description in the" - text run at (0,20) width 118: "box on the left side." - RenderBlock {P} at (0,0) size 577x120 - RenderText {#text} at (0,0) size 577x119 - text run at (0,0) width 351: "This paragraph is inside a DIV which is floated left. The " - text run at (350,0) width 73: "background" - text run at (0,20) width 322: "of the DIV element is blue and its width is 75%. This " - text run at (321,20) width 102: "text should all be" - text run at (0,40) width 250: "inside the blue rectangle. The blue DIV " - text run at (249,40) width 328: "element has another DIV element as a child. It has a" - text run at (0,60) width 46: "yellow " - text run at (45,60) width 368: "background color and is floated to the right. Since it is a " - text run at (412,60) width 165: "child of the blue DIV, the" - text run at (0,80) width 237: "yellow DIV should appear inside the " - text run at (236,80) width 341: "blue rectangle. Due to it being floated to the right and" - text run at (0,100) width 42: "having " - text run at (42,100) width 394: "a 10px right margin, the yellow rectange should have a 10px blue " - text run at (436,100) width 131: "stripe on its right side." - RenderBlock (anonymous) at (0,1238) size 769x120 + text run at (0,20) width 124: "box on the left side." + RenderBlock {P} at (0,0) size 577x140 + RenderText {#text} at (0,0) size 577x139 + text run at (0,0) width 423: "This paragraph is inside a DIV which is floated left. The" + text run at (0,20) width 423: "background of the DIV element is blue and its width is 75%. This" + text run at (0,40) width 367: "text should all be inside the blue rectangle. The blue DIV " + text run at (366,40) width 211: "element has another DIV element" + text run at (0,60) width 167: "as a child. It has a yellow " + text run at (166,60) width 363: "background color and is floated to the right. Since it is a " + text run at (528,60) width 49: "child of" + text run at (0,80) width 374: "the blue DIV, the yellow DIV should appear inside the " + text run at (373,80) width 204: "blue rectangle. Due to it being" + text run at (0,100) width 194: "floated to the right and having " + text run at (193,100) width 384: "a 10px right margin, the yellow rectange should have a 10px" + text run at (0,120) width 31: "blue " + text run at (31,120) width 138: "stripe on its right side." + RenderBlock (anonymous) at (0,1278) size 769x140 RenderBR {BR} at (576,0) size 1x19 - RenderTable {TABLE} at (0,1376) size 769x1454 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1452 + RenderTable {TABLE} at (0,1436) size 769x1494 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1492 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x1424 - RenderTableCell {TD} at (0,726) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x1464 + RenderTableCell {TD} at (0,746) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x1424 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x1464 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock (floating) {P} at (4,4) size 374x40 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 374x39 - text run at (0,0) width 374: "This paragraph is of class \"one\". It has a width of 50% and is" - text run at (0,20) width 105: "floated to the left." - RenderBlock {P} at (4,4) size 747x80 - RenderText {#text} at (373,0) size 747x79 - text run at (373,0) width 374: "This paragraph should start on the right side of a yellow box" - text run at (373,20) width 374: "which contains the previous paragraph. Since the text of this" - text run at (0,40) width 747: "element is much longer than the text in the previous element, the text will wrap around the yellow box. There is no padding," - text run at (0,60) width 709: "border or margins on this and the previous element, so the text of the two elements should be very close to each other." - RenderBlock (anonymous) at (4,84) size 747x20 + text run at (0,0) width 374: "This paragraph is of class \"one\". It has a width of 50% and" + text run at (0,20) width 124: "is floated to the left." + RenderBlock {P} at (4,4) size 747x100 + RenderText {#text} at (373,0) size 747x99 + text run at (373,0) width 374: "This paragraph should start on the right side of a yellow" + text run at (373,20) width 374: "box which contains the previous paragraph. Since the text" + text run at (0,40) width 747: "of this element is much longer than the text in the previous element, the text will wrap around the yellow box. There is" + text run at (0,60) width 747: "no padding, border or margins on this and the previous element, so the text of the two elements should be very close to" + text run at (0,80) width 68: "each other." + RenderBlock (anonymous) at (4,104) size 747x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (floating) {P} at (4,122) size 747x80 [bgcolor=#FFFF00] + RenderBlock (floating) {P} at (4,142) size 747x80 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 747x79 text run at (0,0) width 747: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent" - text run at (0,20) width 747: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides and a" - text run at (0,40) width 747: "orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added to this" - text run at (0,60) width 209: "paragraph for diagnostic purposes." - RenderBlock (anonymous) at (4,122) size 747x100 + text run at (0,20) width 747: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides" + text run at (0,40) width 747: "and a orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added" + text run at (0,60) width 259: "to this paragraph for diagnostic purposes." + RenderBlock (anonymous) at (4,142) size 747x100 RenderImage {IMG} at (0,80) size 15x15 RenderText {#text} at (15,80) size 4x19 text run at (15,80) width 4: " " RenderBR {BR} at (19,80) size 0x19 - RenderBlock (floating) {P} at (4,240) size 374x120 [bgcolor=#FFFF00] + RenderBlock (floating) {P} at (4,260) size 374x120 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 374x119 text run at (0,0) width 374: "This paragraph is floated to the left and the orange square" text run at (0,20) width 374: "image should appear to the right of the paragraph. This" - text run at (0,40) width 374: "paragraph has a yellow background and no padding, margin" - text run at (0,60) width 374: "or border. The right edge of this yellow box should be" - text run at (0,80) width 374: "horizontally aligned with the left edge of the yellow box" - text run at (0,100) width 75: "undernearth." - RenderBlock (anonymous) at (4,240) size 747x120 + text run at (0,40) width 374: "paragraph has a yellow background and no padding," + text run at (0,60) width 374: "margin or border. The right edge of this yellow box should" + text run at (0,80) width 374: "be horizontally aligned with the left edge of the yellow box" + text run at (0,100) width 79: "undernearth." + RenderBlock (anonymous) at (4,260) size 747x120 RenderImage {IMG} at (373,0) size 16x15 RenderText {#text} at (388,0) size 5x19 text run at (388,0) width 5: " " RenderBR {BR} at (392,0) size 1x19 - RenderBlock (floating) {P} at (377,378) size 374x120 [bgcolor=#FFFF00] + RenderBlock (floating) {P} at (377,398) size 374x120 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 374x119 text run at (0,0) width 374: "This paragraph is floated to the right (using a STYLE" text run at (0,20) width 374: "attribute) and the orange square image should appear to the" - text run at (0,40) width 374: "left of the paragraph. This paragraph has a yellow background" - text run at (0,60) width 374: "and no padding, margin or border. The left edge of this yellow" - text run at (0,80) width 374: "box should be horizonally aligned with the right edge of the" - text run at (0,100) width 111: "yellow box above." - RenderBlock (anonymous) at (4,378) size 747x120 + text run at (0,40) width 374: "left of the paragraph. This paragraph has a yellow" + text run at (0,60) width 374: "background and no padding, margin or border. The left" + text run at (0,80) width 374: "edge of this yellow box should be horizonally aligned with" + text run at (0,100) width 247: "the right edge of the yellow box above." + RenderBlock (anonymous) at (4,398) size 747x120 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (15,0) size 4x19 text run at (15,0) width 4: " " RenderBR {BR} at (19,0) size 0x19 - RenderBlock {P} at (4,516) size 747x60 + RenderBlock {P} at (4,536) size 747x60 RenderBlock (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] RenderText {#text} at (0,0) size 21x36 text run at (0,0) width 21: "T" RenderText {#text} at (48,0) size 747x59 - text run at (48,0) width 699: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as well" - text run at (48,20) width 461: "as bold, with a content width of 1.5em and a background-color of silver. " - text run at (508,20) width 239: "The top of the big letter \"T\" should be" - text run at (0,40) width 616: "vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." - RenderBlock (anonymous) at (4,576) size 747x20 + text run at (48,0) width 699: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as" + text run at (48,20) width 513: "well as bold, with a content width of 1.5em and a background-color of silver. " + text run at (560,20) width 187: "The top of the big letter \"T\"" + text run at (0,40) width 721: "should be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." + RenderBlock (anonymous) at (4,596) size 747x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (floating) {P} at (405,624) size 336x216 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] + RenderBlock (floating) {P} at (405,644) size 336x216 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] RenderText {#text} at (8,8) size 320x199 - text run at (8,8) width 320: "This paragraph should be floated to the right, sort of" - text run at (8,28) width 320: "like a 'sidebar' in a magazine article. Its width is" - text run at (8,48) width 320: "20em so the box should not be reformatted when the" - text run at (8,68) width 320: "size of the viewport is changed (e.g. when the" + text run at (8,8) width 320: "This paragraph should be floated to the right, sort" + text run at (8,28) width 320: "of like a 'sidebar' in a magazine article. Its width is" + text run at (8,48) width 320: "20em so the box should not be reformatted when" + text run at (8,68) width 320: "the size of the viewport is changed (e.g. when the" text run at (8,88) width 320: "window is resized). The background color of the" text run at (8,108) width 320: "element is yellow, and there should be a 3px solid" text run at (8,128) width 320: "red border outside a 5px wide padding. Also, the" - text run at (8,148) width 320: "element has a 10px wide margin around it where the" - text run at (8,168) width 320: "blue background of the paragraph in the normal flow" - text run at (8,188) width 126: "should shine through." - RenderBlock {P} at (4,614) size 747x220 [bgcolor=#66CCFF] - RenderText {#text} at (0,0) size 391x219 - text run at (0,0) width 391: "This paragraph is not floating. If there is enough room, the textual" - text run at (0,20) width 391: "content of the paragraph should appear on the left side of the" - text run at (0,40) width 182: "yellow \"sidebar\" on the right. " - text run at (181,40) width 210: "The content of this element should" - text run at (0,60) width 208: "flow around the floated element. " - text run at (207,60) width 184: "However, the floated element" - text run at (0,80) width 391: "may or may not be obscured by the blue background of this" - text run at (0,100) width 391: "element, as the specification does not say which is drawn \"on" - text run at (0,120) width 36: "top.\" " - text run at (35,120) width 356: "Even if the floated element is obscured, it still forces the" - text run at (0,140) width 250: "content of this element to flow around it. " - text run at (249,140) width 142: "If the floated element is" - text run at (0,160) width 391: "not obscured, then the blue rectangle of this paragraph should" - text run at (0,180) width 391: "extend 10px above and to the right of the sidebar's red border," - text run at (0,200) width 304: "due to the margin styles set for the floated element." - RenderBlock (anonymous) at (4,834) size 747x20 + text run at (8,148) width 320: "element has a 10px wide margin around it where" + text run at (8,168) width 320: "the blue background of the paragraph in the" + text run at (8,188) width 217: "normal flow should shine through." + RenderBlock {P} at (4,634) size 747x240 [bgcolor=#66CCFF] + RenderText {#text} at (0,0) size 391x239 + text run at (0,0) width 391: "This paragraph is not floating. If there is enough room, the" + text run at (0,20) width 391: "textual content of the paragraph should appear on the left side" + text run at (0,40) width 261: "of the yellow \"sidebar\" on the right. " + text run at (260,40) width 131: "The content of this" + text run at (0,60) width 328: "element should flow around the floated element. " + text run at (328,60) width 63: "However," + text run at (0,80) width 391: "the floated element may or may not be obscured by the blue" + text run at (0,100) width 391: "background of this element, as the specification does not say" + text run at (0,120) width 186: "which is drawn \"on top.\" " + text run at (185,120) width 206: "Even if the floated element is" + text run at (0,140) width 391: "obscured, it still forces the content of this element to flow" + text run at (0,160) width 66: "around it. " + text run at (65,160) width 326: "If the floated element is not obscured, then the blue" + text run at (0,180) width 391: "rectangle of this paragraph should extend 10px above and to" + text run at (0,200) width 391: "the right of the sidebar's red border, due to the margin styles" + text run at (0,220) width 166: "set for the floated element." + RenderBlock (anonymous) at (4,874) size 747x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock {DIV} at (4,872) size 747x28 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] + RenderBlock {DIV} at (4,912) size 747x28 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] RenderBlock (floating) {DIV} at (403,14) size 330x250 [bgcolor=#FFFF00] RenderBlock {P} at (5,5) size 320x240 RenderText {#text} at (0,0) size 320x239 - text run at (0,0) width 320: "This paragraph is placed inside a DIV element which" - text run at (0,20) width 320: "is floated to the right. The width of the DIV element" - text run at (0,40) width 320: "is 20em. The background is yellow and there is a" - text run at (0,60) width 320: "5px padding, a 10px margin and no border. Since it" - text run at (0,80) width 320: "is floated, the yellow box should be rendered on top" - text run at (0,100) width 320: "of the background and borders of adjacent non-" - text run at (0,120) width 320: "floated elements. To the left of this yellow box there" - text run at (0,140) width 320: "should be a short paragraph with a blue background" - text run at (0,160) width 320: "and a red border. The yellow box should be" - text run at (0,180) width 320: "rendered on top of the bottom red border. I.e., the" - text run at (0,200) width 320: "bottom red border will appear broken where it's" - text run at (0,220) width 194: "overlaid by the yellow rectangle." + text run at (0,0) width 320: "This paragraph is placed inside a DIV element" + text run at (0,20) width 320: "which is floated to the right. The width of the DIV" + text run at (0,40) width 320: "element is 20em. The background is yellow and" + text run at (0,60) width 320: "there is a 5px padding, a 10px margin and no" + text run at (0,80) width 320: "border. Since it is floated, the yellow box should" + text run at (0,100) width 320: "be rendered on top of the background and borders" + text run at (0,120) width 320: "of adjacent non-floated elements. To the left of this" + text run at (0,140) width 320: "yellow box there should be a short paragraph with" + text run at (0,160) width 320: "a blue background and a red border. The yellow" + text run at (0,180) width 320: "box should be rendered on top of the bottom red" + text run at (0,200) width 320: "border. I.e., the bottom red border will appear" + text run at (0,220) width 318: "broken where it's overlaid by the yellow rectangle." RenderBlock {P} at (4,4) size 739x20 - RenderText {#text} at (0,0) size 255x19 - text run at (0,0) width 255: "See description in the box on the right side" - RenderBlock (anonymous) at (4,900) size 747x246 + RenderText {#text} at (0,0) size 268x19 + text run at (0,0) width 268: "See description in the box on the right side" + RenderBlock (anonymous) at (4,940) size 747x246 RenderBR {BR} at (0,0) size 0x19 - RenderBlock (floating) {DIV} at (4,1164) size 187x80 [bgcolor=#66CCFF] + RenderBlock (floating) {DIV} at (4,1204) size 187x80 [bgcolor=#66CCFF] RenderBlock {P} at (0,0) size 187x80 RenderText {#text} at (0,0) size 187x79 - text run at (0,0) width 187: "This paragraph is inside a DIV" - text run at (0,20) width 187: "which is floated left. Its" + text run at (0,0) width 187: "This paragraph is inside a" + text run at (0,20) width 187: "DIV which is floated left. Its" text run at (0,40) width 187: "background is blue and the" - text run at (0,60) width 83: "width is 25%." - RenderBlock (floating) {DIV} at (564,1164) size 187x80 [bgcolor=#FFFF00] + text run at (0,60) width 87: "width is 25%." + RenderBlock (floating) {DIV} at (564,1204) size 187x80 [bgcolor=#FFFF00] RenderBlock {P} at (0,0) size 187x80 RenderText {#text} at (0,0) size 187x79 - text run at (0,0) width 187: "This paragraph is inside a DIV" - text run at (0,20) width 187: "which is floated right. Its" - text run at (0,40) width 187: "background is yellow and the" - text run at (0,60) width 83: "width is 25%." - RenderBlock {P} at (4,1164) size 747x40 + text run at (0,0) width 187: "This paragraph is inside a" + text run at (0,20) width 187: "DIV which is floated right." + text run at (0,40) width 21: "Its " + text run at (20,40) width 167: "background is yellow and" + text run at (0,60) width 110: "the width is 25%." + RenderBlock {P} at (4,1204) size 747x40 RenderText {#text} at (186,0) size 375x39 text run at (186,0) width 375: "This paragraph should appear between a blue box (on the" - text run at (186,20) width 28: "left) " - text run at (213,20) width 189: "and a yellow box (on the right)." - RenderBlock (anonymous) at (4,1204) size 747x40 + text run at (186,20) width 30: "left) " + text run at (215,20) width 200: "and a yellow box (on the right)." + RenderBlock (anonymous) at (4,1244) size 747x40 RenderBR {BR} at (186,0) size 1x19 - RenderBlock (floating) {DIV} at (4,1262) size 561x140 [bgcolor=#66CCFF] + RenderBlock (floating) {DIV} at (4,1302) size 561x140 [bgcolor=#66CCFF] RenderBlock (floating) {DIV} at (410,0) size 141x40 [bgcolor=#FFFF00] RenderBlock {P} at (0,0) size 141x40 RenderText {#text} at (0,0) size 141x39 text run at (0,0) width 141: "See description in the" - text run at (0,20) width 118: "box on the left side." + text run at (0,20) width 124: "box on the left side." RenderBlock {P} at (0,0) size 561x140 RenderText {#text} at (0,0) size 561x139 - text run at (0,0) width 339: "This paragraph is inside a DIV which is floated left. The " - text run at (338,0) width 73: "background" - text run at (0,20) width 328: "of the DIV element is blue and its width is 75%. This " - text run at (327,20) width 84: "text should all" - text run at (0,40) width 259: "be inside the blue rectangle. The blue DIV " - text run at (258,40) width 303: "element has another DIV element as a child. It has" - text run at (0,60) width 56: "a yellow " - text run at (55,60) width 350: "background color and is floated to the right. Since it is a " - text run at (404,60) width 157: "child of the blue DIV, the" - text run at (0,80) width 231: "yellow DIV should appear inside the " - text run at (230,80) width 331: "blue rectangle. Due to it being floated to the right and" - text run at (0,100) width 44: "having " - text run at (43,100) width 414: "a 10px right margin, the yellow rectange should have a 10px blue " - text run at (456,100) width 105: "stripe on its right" - text run at (0,120) width 28: "side." - RenderBlock (anonymous) at (4,1262) size 747x140 + text run at (0,0) width 411: "This paragraph is inside a DIV which is floated left. The" + text run at (0,20) width 411: "background of the DIV element is blue and its width is 75%." + text run at (0,40) width 33: "This " + text run at (32,40) width 370: "text should all be inside the blue rectangle. The blue DIV " + text run at (401,40) width 160: "element has another DIV" + text run at (0,60) width 218: "element as a child. It has a yellow " + text run at (217,60) width 344: "background color and is floated to the right. Since it is" + text run at (0,80) width 12: "a " + text run at (11,80) width 409: "child of the blue DIV, the yellow DIV should appear inside the " + text run at (419,80) width 142: "blue rectangle. Due to" + text run at (0,100) width 253: "it being floated to the right and having " + text run at (252,100) width 309: "a 10px right margin, the yellow rectange should" + text run at (0,120) width 112: "have a 10px blue " + text run at (112,120) width 138: "stripe on its right side." + RenderBlock (anonymous) at (4,1302) size 747x140 RenderBR {BR} at (560,0) size 1x19 -layer at (8,116) size 769x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,108) size 769x2 [border: (1px inset #000000)] -layer at (8,234) size 769x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,226) size 769x2 [border: (1px inset #000000)] -layer at (8,352) size 769x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,344) size 769x2 [border: (1px inset #000000)] -layer at (8,490) size 769x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,482) size 769x2 [border: (1px inset #000000)] -layer at (8,588) size 769x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,580) size 769x2 [border: (1px inset #000000)] -layer at (8,846) size 769x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,838) size 769x2 [border: (1px inset #000000)] -layer at (8,1138) size 769x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,1130) size 769x2 [border: (1px inset #000000)] -layer at (8,1236) size 769x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,1228) size 769x2 [border: (1px inset #000000)] -layer at (8,1374) size 769x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,1366) size 769x2 [border: (1px inset #000000)] -layer at (25,1525) size 747x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (4,112) size 747x2 [border: (1px inset #000000)] -layer at (25,1643) size 747x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (4,230) size 747x2 [border: (1px inset #000000)] -layer at (25,1781) size 747x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (4,368) size 747x2 [border: (1px inset #000000)] -layer at (25,1919) size 747x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (4,506) size 747x2 [border: (1px inset #000000)] -layer at (25,2017) size 747x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (4,604) size 747x2 [border: (1px inset #000000)] -layer at (25,2275) size 747x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (4,862) size 747x2 [border: (1px inset #000000)] -layer at (25,2567) size 747x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (4,1154) size 747x2 [border: (1px inset #000000)] -layer at (25,2665) size 747x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (4,1252) size 747x2 [border: (1px inset #000000)] -layer at (25,2823) size 747x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (4,1410) size 747x2 [border: (1px inset #000000)] +layer at (8,136) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,128) size 769x2 [border: (1px inset #000000)] +layer at (8,254) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,246) size 769x2 [border: (1px inset #000000)] +layer at (8,392) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,384) size 769x2 [border: (1px inset #000000)] +layer at (8,530) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,522) size 769x2 [border: (1px inset #000000)] +layer at (8,628) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,620) size 769x2 [border: (1px inset #000000)] +layer at (8,886) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,878) size 769x2 [border: (1px inset #000000)] +layer at (8,1178) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,1170) size 769x2 [border: (1px inset #000000)] +layer at (8,1276) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,1268) size 769x2 [border: (1px inset #000000)] +layer at (8,1434) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,1426) size 769x2 [border: (1px inset #000000)] +layer at (25,1605) size 747x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (4,132) size 747x2 [border: (1px inset #000000)] +layer at (25,1723) size 747x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (4,250) size 747x2 [border: (1px inset #000000)] +layer at (25,1861) size 747x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (4,388) size 747x2 [border: (1px inset #000000)] +layer at (25,1999) size 747x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (4,526) size 747x2 [border: (1px inset #000000)] +layer at (25,2097) size 747x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (4,624) size 747x2 [border: (1px inset #000000)] +layer at (25,2375) size 747x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (4,902) size 747x2 [border: (1px inset #000000)] +layer at (25,2667) size 747x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (4,1194) size 747x2 [border: (1px inset #000000)] +layer at (25,2765) size 747x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (4,1292) size 747x2 [border: (1px inset #000000)] +layer at (25,2923) size 747x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (4,1450) size 747x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/height-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/height-expected.txt index 2e869991ba92..dc51d7082c8e 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/height-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/height-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x997 RenderBlock {HTML} at (0,0) size 785x997 RenderBody {BODY} at (8,8) size 769x981 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x48 RenderText {#text} at (0,0) size 168x48 text run at (0,0) width 160: ".one {height: 50px;}" @@ -17,33 +17,33 @@ layer at (0,0) size 785x997 RenderImage {IMG} at (0,0) size 50x50 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,173) size 769x20 - RenderText {#text} at (0,0) size 259x19 - text run at (0,0) width 259: "The square above should be fifty pixels tall." + RenderText {#text} at (0,0) size 275x19 + text run at (0,0) width 275: "The square above should be fifty pixels tall." RenderBlock (anonymous) at (0,209) size 769x100 RenderImage {IMG} at (0,0) size 100x100 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,325) size 769x20 - RenderText {#text} at (0,0) size 320x19 - text run at (0,0) width 320: "The square above should be 100 pixels tall and wide." + RenderText {#text} at (0,0) size 335x19 + text run at (0,0) width 335: "The square above should be 100 pixels tall and wide." RenderBlock (anonymous) at (0,361) size 769x100 RenderImage {IMG} at (0,0) size 30x100 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,477) size 769x40 - RenderText {#text} at (0,0) size 743x39 - text run at (0,0) width 743: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size has been" - text run at (0,20) width 109: "doubled using the " + RenderText {#text} at (0,0) size 750x39 + text run at (0,0) width 750: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size has" + text run at (0,20) width 150: "been doubled using the " RenderInline {CODE} at (0,0) size 48x16 - RenderText {#text} at (109,23) size 48x16 - text run at (109,23) width 48: "height" - RenderText {#text} at (157,20) size 65x19 - text run at (157,20) width 65: " property)." + RenderText {#text} at (150,23) size 48x16 + text run at (150,23) width 48: "height" + RenderText {#text} at (198,20) size 66x19 + text run at (198,20) width 66: " property)." RenderTable {TABLE} at (0,533) size 769x448 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x446 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x418 RenderTableCell {TD} at (0,223) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 @@ -53,25 +53,25 @@ layer at (0,0) size 785x997 RenderImage {IMG} at (0,0) size 50x50 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,70) size 747x20 - RenderText {#text} at (0,0) size 259x19 - text run at (0,0) width 259: "The square above should be fifty pixels tall." + RenderText {#text} at (0,0) size 275x19 + text run at (0,0) width 275: "The square above should be fifty pixels tall." RenderBlock (anonymous) at (4,106) size 747x100 RenderImage {IMG} at (0,0) size 100x100 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,222) size 747x20 - RenderText {#text} at (0,0) size 320x19 - text run at (0,0) width 320: "The square above should be 100 pixels tall and wide." + RenderText {#text} at (0,0) size 335x19 + text run at (0,0) width 335: "The square above should be 100 pixels tall and wide." RenderBlock (anonymous) at (4,258) size 747x100 RenderImage {IMG} at (0,0) size 30x100 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,374) size 747x40 - RenderText {#text} at (0,0) size 743x39 - text run at (0,0) width 743: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size has been" - text run at (0,20) width 109: "doubled using the " + RenderText {#text} at (0,0) size 725x39 + text run at (0,0) width 725: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size" + text run at (0,20) width 175: "has been doubled using the " RenderInline {CODE} at (0,0) size 48x16 - RenderText {#text} at (109,23) size 48x16 - text run at (109,23) width 48: "height" - RenderText {#text} at (157,20) size 65x19 - text run at (157,20) width 65: " property)." + RenderText {#text} at (175,23) size 48x16 + text run at (175,23) width 48: "height" + RenderText {#text} at (223,20) size 66x19 + text run at (223,20) width 66: " property)." layer at (8,105) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin-expected.txt index 446c819a4633..81ef3b85013b 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 787x2675 +layer at (0,0) size 787x2735 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x2675 - RenderBlock {HTML} at (0,0) size 785x2675 - RenderBody {BODY} at (8,8) size 769x2659 [bgcolor=#CCCCCC] +layer at (0,0) size 785x2735 + RenderBlock {HTML} at (0,0) size 785x2735 + RenderBody {BODY} at (8,8) size 769x2719 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x112 RenderText {#text} at (0,0) size 360x112 text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}" @@ -23,143 +23,145 @@ layer at (0,0) size 785x2675 text run at (0,96) width 360: ".six {margin: -10px; background-color: aqua;}" text run at (360,96) width 0: " " RenderBlock {P} at (0,179) size 769x40 - RenderText {#text} at (0,0) size 755x39 - text run at (0,0) width 755: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in section" - text run at (0,20) width 193: "4.1.1 of the CSS1 specification." + RenderText {#text} at (0,0) size 738x39 + text run at (0,0) width 738: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in" + text run at (0,20) width 248: "section 4.1.1 of the CSS1 specification." RenderBlock {P} at (0,235) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (48,303) size 673x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 618x19 - text run at (0,0) width 618: "This sentence should have an overall margin of half an inch, which will require extra text in order to test." + RenderText {#text} at (0,0) size 658x19 + text run at (0,0) width 658: "This sentence should have an overall margin of half an inch, which will require extra text in order to test." RenderBlock {P} at (0,371) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (25,416) size 719x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 605x19 - text run at (0,0) width 605: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." + RenderText {#text} at (0,0) size 641x19 + text run at (0,0) width 641: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." RenderBlock {P} at (0,461) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (80,561) size 609x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 581x19 - text run at (0,0) width 581: "This sentence should have an overall margin of 5 em, which will require extra text in order to test." - RenderBlock {P} at (0,661) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (192,873) size 385x61 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 375x59 - text run at (0,0) width 367: "This sentence should have an overall margin of 25%, which is" - text run at (0,20) width 350: "calculated with respect to the width of the parent element. " - text run at (350,20) width 25: "This" - text run at (0,40) width 222: "will require extra text in order to test." - RenderBlock {P} at (0,1125) size 769x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {UL} at (25,1170) size 719x131 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (80,561) size 609x40 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 586x39 + text run at (0,0) width 586: "This sentence should have an overall margin of 5 em, which will require extra text in order to" + text run at (0,20) width 25: "test." + RenderBlock {P} at (0,681) size 769x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (192,893) size 385x61 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 377x59 + text run at (0,0) width 377: "This sentence should have an overall margin of 25%, which" + text run at (0,20) width 376: "is calculated with respect to the width of the parent element." + text run at (0,40) width 264: "This will require extra text in order to test." + RenderBlock {P} at (0,1145) size 769x21 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {UL} at (25,1190) size 719x131 [bgcolor=#00FFFF] RenderListItem {LI} at (40,0) size 679x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 353x19 - text run at (0,0) width 353: "This list has a margin of 25px, and a light blue background." + RenderText {#text} at (0,0) size 375x19 + text run at (0,0) width 375: "This list has a margin of 25px, and a light blue background." RenderListItem {LI} at (40,20) size 679x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." + RenderText {#text} at (0,0) size 264x19 + text run at (0,0) width 264: "Therefore, it ought to have such a margin." RenderListItem {LI} at (65,65) size 629x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 511x19 - text run at (0,0) width 511: "This list item has a margin of 25px, which should cause it to be offset in some fashion." + RenderText {#text} at (0,0) size 543x19 + text run at (0,0) width 543: "This list item has a margin of 25px, which should cause it to be offset in some fashion." RenderListItem {LI} at (40,110) size 679x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." - RenderBlock {P} at (0,1325) size 769x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (-10,1335) size 789x61 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 785x59 - text run at (0,0) width 785: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull subsequent" - text run at (0,20) width 281: "text up toward it, and a light blue background. " - text run at (281,20) width 369: "In all other respects, however, the element should be normal. " - text run at (650,20) width 122: "No styles have been" - text run at (0,40) width 402: "applied to it besides the negative margin and the background color." - RenderBlock {P} at (0,1385) size 769x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderTable {TABLE} at (0,1405) size 769x1254 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1252 + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "This list item has no special styles applied to it." + RenderBlock {P} at (0,1345) size 769x21 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (-10,1355) size 789x61 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 775x59 + text run at (0,0) width 758: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" + text run at (0,20) width 369: "subsequent text up toward it, and a light blue background. " + text run at (369,20) width 386: "In all other respects, however, the element should be normal. " + text run at (755,20) width 20: "No" + text run at (0,40) width 527: "styles have been applied to it besides the negative margin and the background color." + RenderBlock {P} at (0,1405) size 769x21 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderTable {TABLE} at (0,1425) size 769x1294 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1292 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x1224 - RenderTableCell {TD} at (0,625) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x1264 + RenderTableCell {TD} at (0,645) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x1224 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x1264 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x40 - RenderText {#text} at (0,0) size 709x39 - text run at (0,0) width 709: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in" - text run at (0,20) width 239: "section 4.1.1 of the CSS1 specification." + RenderText {#text} at (0,0) size 738x39 + text run at (0,0) width 738: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in" + text run at (0,20) width 248: "section 4.1.1 of the CSS1 specification." RenderBlock {P} at (4,60) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (52,128) size 651x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 618x19 - text run at (0,0) width 618: "This sentence should have an overall margin of half an inch, which will require extra text in order to test." - RenderBlock {P} at (4,196) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (29,241) size 697x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 605x19 - text run at (0,0) width 605: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." - RenderBlock {P} at (4,286) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (84,386) size 587x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 581x19 - text run at (0,0) width 581: "This sentence should have an overall margin of 5 em, which will require extra text in order to test." - RenderBlock {P} at (4,486) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (190,692) size 375x61 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 367x59 - text run at (0,0) width 367: "This sentence should have an overall margin of 25%, which is" - text run at (0,20) width 346: "calculated with respect to the width of the parent element." - text run at (0,40) width 251: "This will require extra text in order to test." - RenderBlock {P} at (4,939) size 747x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {UL} at (29,984) size 697x131 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (52,128) size 651x40 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 629x39 + text run at (0,0) width 629: "This sentence should have an overall margin of half an inch, which will require extra text in order to" + text run at (0,20) width 25: "test." + RenderBlock {P} at (4,216) size 747x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (29,261) size 697x20 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 641x19 + text run at (0,0) width 641: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." + RenderBlock {P} at (4,306) size 747x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (84,406) size 587x40 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 586x39 + text run at (0,0) width 586: "This sentence should have an overall margin of 5 em, which will require extra text in order to" + text run at (0,20) width 25: "test." + RenderBlock {P} at (4,526) size 747x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (190,732) size 375x61 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 362x59 + text run at (0,0) width 334: "This sentence should have an overall margin of 25%," + text run at (0,20) width 362: "which is calculated with respect to the width of the parent" + text run at (0,40) width 57: "element. " + text run at (57,40) width 264: "This will require extra text in order to test." + RenderBlock {P} at (4,979) size 747x21 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {UL} at (29,1024) size 697x131 [bgcolor=#00FFFF] RenderListItem {LI} at (40,0) size 657x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 353x19 - text run at (0,0) width 353: "This list has a margin of 25px, and a light blue background." + RenderText {#text} at (0,0) size 375x19 + text run at (0,0) width 375: "This list has a margin of 25px, and a light blue background." RenderListItem {LI} at (40,20) size 657x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." + RenderText {#text} at (0,0) size 264x19 + text run at (0,0) width 264: "Therefore, it ought to have such a margin." RenderListItem {LI} at (65,65) size 607x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 511x19 - text run at (0,0) width 511: "This list item has a margin of 25px, which should cause it to be offset in some fashion." + RenderText {#text} at (0,0) size 543x19 + text run at (0,0) width 543: "This list item has a margin of 25px, which should cause it to be offset in some fashion." RenderListItem {LI} at (40,110) size 657x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." - RenderBlock {P} at (4,1139) size 747x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (-6,1149) size 767x61 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 741x59 - text run at (0,0) width 714: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" - text run at (0,20) width 352: "subsequent text up toward it, and a light blue background. " - text run at (352,20) width 369: "In all other respects, however, the element should be normal. " - text run at (721,20) width 20: "No" - text run at (0,40) width 504: "styles have been applied to it besides the negative margin and the background color." - RenderBlock {P} at (4,1199) size 747x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "This list item has no special styles applied to it." + RenderBlock {P} at (4,1179) size 747x21 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (-6,1189) size 767x61 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 758x59 + text run at (0,0) width 758: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" + text run at (0,20) width 369: "subsequent text up toward it, and a light blue background. " + text run at (369,20) width 382: "In all other respects, however, the element should be normal." + text run at (0,40) width 551: "No styles have been applied to it besides the negative margin and the background color." + RenderBlock {P} at (4,1239) size 747x21 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." layer at (8,169) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,161) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin_bottom-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin_bottom-expected.txt index 6778a307b88c..7b9004b8811d 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin_bottom-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin_bottom-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1822 RenderBlock {HTML} at (0,0) size 785x1822 RenderBody {BODY} at (8,8) size 769x1806 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x144 RenderText {#text} at (0,0) size 416x144 text run at (0,0) width 408: ".zero {background-color: silver; margin-bottom: 0;}" @@ -26,126 +26,126 @@ layer at (0,0) size 785x1822 text run at (176,112) width 0: " " text run at (0,128) width 0: " " RenderBlock {P} at (0,203) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,223) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 743x39 - text run at (0,0) width 743: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the margin" - text run at (0,20) width 147: "isn't applied to each line." + RenderText {#text} at (0,0) size 740x39 + text run at (0,0) width 740: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the" + text run at (0,20) width 203: "margin isn't applied to each line." RenderBlock {P} at (0,311) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 757x39 - text run at (0,0) width 757: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 723x39 + text run at (0,0) width 723: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the" + text run at (0,20) width 203: "margin isn't applied to each line." RenderBlock {P} at (0,376) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 733x39 - text run at (0,0) width 733: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 745x39 + text run at (0,0) width 745: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin" + text run at (0,20) width 155: "isn't applied to each line." RenderBlock {P} at (0,496) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 726x39 - text run at (0,0) width 726: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 767x39 + text run at (0,0) width 767: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin isn't" + text run at (0,20) width 126: "applied to each line." RenderBlock {P} at (0,728) size 769x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,748) size 769x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." + RenderText {#text} at (0,0) size 232x19 + text run at (0,0) width 232: "This element also has a class of zero." RenderBlock {UL} at (0,768) size 769x106 [bgcolor=#00FFFF] RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 402x19 - text run at (0,0) width 402: "This list has a margin-bottom of 25px, and a light blue background." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "This list has a margin-bottom of 25px, and a light blue background." RenderListItem {LI} at (40,20) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." + RenderText {#text} at (0,0) size 264x19 + text run at (0,0) width 264: "Therefore, it ought to have such a margin." RenderListItem {LI} at (40,40) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 558x19 - text run at (0,0) width 558: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." + RenderText {#text} at (0,0) size 591x19 + text run at (0,0) width 591: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." RenderListItem {LI} at (40,85) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "This list item has no special styles applied to it." RenderBlock {P} at (0,898) size 769x61 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 756x59 - text run at (0,0) width 756: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the page, and no" - text run at (0,20) width 72: "top margin. " - text run at (72,20) width 468: "No other styles have been applied to it besides a light blue background color. " - text run at (540,20) width 194: "In all other respects, the element" - text run at (0,40) width 107: "should be normal." + RenderText {#text} at (0,0) size 759x59 + text run at (0,0) width 748: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the page," + text run at (0,20) width 123: "and no top margin. " + text run at (123,20) width 487: "No other styles have been applied to it besides a light blue background color. " + text run at (610,20) width 149: "In all other respects, the" + text run at (0,40) width 166: "element should be normal." RenderBlock {P} at (0,948) size 769x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,968) size 769x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." + RenderText {#text} at (0,0) size 232x19 + text run at (0,0) width 232: "This element also has a class of zero." RenderTable {TABLE} at (0,988) size 769x818 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x816 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x788 RenderTableCell {TD} at (0,407) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x788 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,24) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 743x39 - text run at (0,0) width 743: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the margin" - text run at (0,20) width 147: "isn't applied to each line." + RenderText {#text} at (0,0) size 740x39 + text run at (0,0) width 740: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the" + text run at (0,20) width 203: "margin isn't applied to each line." RenderBlock {P} at (4,112) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 730x39 - text run at (0,0) width 730: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the margin" - text run at (0,20) width 147: "isn't applied to each line." + RenderText {#text} at (0,0) size 723x39 + text run at (0,0) width 723: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the" + text run at (0,20) width 203: "margin isn't applied to each line." RenderBlock {P} at (4,177) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 733x39 - text run at (0,0) width 733: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 745x39 + text run at (0,0) width 745: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin" + text run at (0,20) width 155: "isn't applied to each line." RenderBlock {P} at (4,297) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 726x39 - text run at (0,0) width 726: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 738x39 + text run at (0,0) width 738: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin" + text run at (0,20) width 155: "isn't applied to each line." RenderBlock {P} at (4,523) size 747x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,543) size 747x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." + RenderText {#text} at (0,0) size 232x19 + text run at (0,0) width 232: "This element also has a class of zero." RenderBlock {UL} at (4,563) size 747x106 [bgcolor=#00FFFF] RenderListItem {LI} at (40,0) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 402x19 - text run at (0,0) width 402: "This list has a margin-bottom of 25px, and a light blue background." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "This list has a margin-bottom of 25px, and a light blue background." RenderListItem {LI} at (40,20) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." + RenderText {#text} at (0,0) size 264x19 + text run at (0,0) width 264: "Therefore, it ought to have such a margin." RenderListItem {LI} at (40,40) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 558x19 - text run at (0,0) width 558: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." + RenderText {#text} at (0,0) size 591x19 + text run at (0,0) width 591: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." RenderListItem {LI} at (40,85) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "This list item has no special styles applied to it." RenderBlock {P} at (4,693) size 747x61 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 737x59 - text run at (0,0) width 737: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the page, and" - text run at (0,20) width 91: "no top margin. " - text run at (91,20) width 468: "No other styles have been applied to it besides a light blue background color. " - text run at (559,20) width 144: "In all other respects, the" - text run at (0,40) width 157: "element should be normal." + RenderText {#text} at (0,0) size 716x59 + text run at (0,0) width 710: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the" + text run at (0,20) width 161: "page, and no top margin. " + text run at (161,20) width 487: "No other styles have been applied to it besides a light blue background color. " + text run at (648,20) width 68: "In all other" + text run at (0,40) width 247: "respects, the element should be normal." RenderBlock {P} at (4,743) size 747x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,763) size 747x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." + RenderText {#text} at (0,0) size 232x19 + text run at (0,0) width 232: "This element also has a class of zero." layer at (8,201) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,193) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin_bottom_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin_bottom_inline-expected.txt index 4a5f671b1e48..ef4864576f1e 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin_bottom_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin_bottom_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x32 RenderText {#text} at (0,0) size 416x32 text run at (0,0) width 408: ".one {margin-bottom: 25px; background-color: aqua;}" @@ -13,84 +13,84 @@ layer at (0,0) size 800x600 text run at (0,16) width 416: ".two {margin-bottom: -10px; background-color: aqua;}" text run at (416,16) width 0: " " RenderBlock {P} at (0,99) size 784x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 373: "This element is unstyled save for a background color of gray.. " - text run at (373,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 718x39 [bgcolor=#00FFFF] - RenderText {#text} at (457,0) size 133x19 - text run at (457,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " + text run at (392,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 760x39 [bgcolor=#00FFFF] + RenderText {#text} at (480,0) size 143x19 + text run at (480,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (590,3) size 24x16 - text run at (590,3) width 24: "one" - RenderText {#text} at (614,0) size 718x39 - text run at (614,0) width 104: ", giving it an aqua" - text run at (0,20) width 235: "background and a 25px bottom margin" - RenderText {#text} at (235,20) size 739x39 - text run at (235,20) width 8: ". " - text run at (243,20) width 496: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." + RenderText {#text} at (623,3) size 24x16 + text run at (623,3) width 24: "one" + RenderText {#text} at (647,0) size 760x39 + text run at (647,0) width 113: ", giving it an aqua" + text run at (0,20) width 245: "background and a 25px bottom margin" + RenderText {#text} at (245,20) size 784x39 + text run at (245,20) width 8: ". " + text run at (253,20) width 531: "Margins on inline elements does not affect line-height calculations, so all lines in this" + text run at (0,40) width 263: "element should have the same line-height." RenderBlock {P} at (0,175) size 784x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 373: "This element is unstyled save for a background color of gray.. " - text run at (373,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 718x39 [bgcolor=#00FFFF] - RenderText {#text} at (457,0) size 133x19 - text run at (457,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " + text run at (392,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 760x39 [bgcolor=#00FFFF] + RenderText {#text} at (480,0) size 143x19 + text run at (480,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (590,3) size 24x16 - text run at (590,3) width 24: "two" - RenderText {#text} at (614,0) size 718x39 - text run at (614,0) width 104: ", giving it an aqua" - text run at (0,20) width 241: "background and a -10px bottom margin" - RenderText {#text} at (241,20) size 745x39 - text run at (241,20) width 8: ". " - text run at (249,20) width 496: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." + RenderText {#text} at (623,3) size 24x16 + text run at (623,3) width 24: "two" + RenderText {#text} at (647,0) size 760x39 + text run at (647,0) width 113: ", giving it an aqua" + text run at (0,20) width 250: "background and a -10px bottom margin" + RenderText {#text} at (250,20) size 763x39 + text run at (250,20) width 8: ". " + text run at (258,20) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in" + text run at (0,40) width 289: "this element should have the same line-height." RenderTable {TABLE} at (0,251) size 784x174 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x172 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x144 RenderTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 373: "This element is unstyled save for a background color of gray.. " - text run at (373,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 718x39 [bgcolor=#00FFFF] - RenderText {#text} at (457,0) size 133x19 - text run at (457,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " + text run at (392,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 760x39 [bgcolor=#00FFFF] + RenderText {#text} at (480,0) size 143x19 + text run at (480,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (590,3) size 24x16 - text run at (590,3) width 24: "one" - RenderText {#text} at (614,0) size 718x39 - text run at (614,0) width 104: ", giving it an aqua" - text run at (0,20) width 235: "background and a 25px bottom margin" - RenderText {#text} at (235,20) size 739x39 - text run at (235,20) width 8: ". " - text run at (243,20) width 496: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." + RenderText {#text} at (623,3) size 24x16 + text run at (623,3) width 24: "one" + RenderText {#text} at (647,0) size 760x39 + text run at (647,0) width 113: ", giving it an aqua" + text run at (0,20) width 245: "background and a 25px bottom margin" + RenderText {#text} at (245,20) size 758x39 + text run at (245,20) width 8: ". " + text run at (253,20) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in" + text run at (0,40) width 289: "this element should have the same line-height." RenderBlock {P} at (4,80) size 762x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 373: "This element is unstyled save for a background color of gray.. " - text run at (373,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 718x39 [bgcolor=#00FFFF] - RenderText {#text} at (457,0) size 133x19 - text run at (457,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " + text run at (392,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 760x39 [bgcolor=#00FFFF] + RenderText {#text} at (480,0) size 143x19 + text run at (480,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (590,3) size 24x16 - text run at (590,3) width 24: "two" - RenderText {#text} at (614,0) size 718x39 - text run at (614,0) width 104: ", giving it an aqua" - text run at (0,20) width 241: "background and a -10px bottom margin" - RenderText {#text} at (241,20) size 745x39 - text run at (241,20) width 8: ". " - text run at (249,20) width 496: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." + RenderText {#text} at (623,3) size 24x16 + text run at (623,3) width 24: "two" + RenderText {#text} at (647,0) size 760x39 + text run at (647,0) width 113: ", giving it an aqua" + text run at (0,20) width 250: "background and a -10px bottom margin" + RenderText {#text} at (250,20) size 747x39 + text run at (250,20) width 8: ". " + text run at (258,20) width 489: "Margins on inline elements does not affect line-height calculations, so all lines" + text run at (0,40) width 305: "in this element should have the same line-height." layer at (8,89) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,81) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin_inline-expected.txt index 14a6529b2120..ad7e5155442c 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin_inline-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x729 +layer at (0,0) size 785x769 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x729 - RenderBlock {HTML} at (0,0) size 785x729 - RenderBody {BODY} at (8,8) size 769x713 [bgcolor=#CCCCCC] +layer at (0,0) size 785x769 + RenderBlock {HTML} at (0,0) size 785x769 + RenderBody {BODY} at (8,8) size 769x753 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x48 RenderText {#text} at (0,0) size 360x48 text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}" @@ -15,110 +15,112 @@ layer at (0,0) size 785x729 text run at (0,32) width 360: ".two {margin: -10px; background-color: aqua;}" text run at (360,32) width 0: " " RenderBlock {P} at (0,107) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,143) size 769x80 [bgcolor=#808080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 373: "This element is unstyled save for a background color of gray.. " - text run at (373,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 743x39 [bgcolor=#00FFFF] - RenderText {#text} at (482,0) size 133x19 - text run at (482,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " + text run at (392,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 751x39 [bgcolor=#00FFFF] + RenderText {#text} at (505,0) size 143x19 + text run at (505,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (615,3) size 24x16 - text run at (615,3) width 24: "one" - RenderText {#text} at (639,0) size 743x39 - text run at (639,0) width 104: ", giving it an aqua" - text run at (0,20) width 188: "background and a 25px margin" - RenderText {#text} at (213,20) size 767x59 - text run at (213,20) width 8: ". " - text run at (221,20) width 546: "Margins on inline elements does not affect line-height calculations, so all lines in this element" - text run at (0,40) width 201: "should have the same line-height. " - text run at (201,40) width 530: "However, there should be a 25px margin to the left side of the inline box in the first line it" - text run at (0,60) width 605: "appears, and a 25px margin to the right side of the inline element box in the last line where it appears." + RenderText {#text} at (648,3) size 24x16 + text run at (648,3) width 24: "one" + RenderText {#text} at (672,0) size 751x39 + text run at (672,0) width 79: ", giving it an" + text run at (0,20) width 231: "aqua background and a 25px margin" + RenderText {#text} at (256,20) size 769x59 + text run at (256,20) width 8: ". " + text run at (264,20) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in" + text run at (0,40) width 293: "this element should have the same line-height. " + text run at (293,40) width 473: "However, there should be a 25px margin to the left side of the inline box in" + text run at (0,60) width 727: "the first line it appears, and a 25px margin to the right side of the inline element box in the last line where it appears." RenderBlock {P} at (0,239) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,275) size 769x80 [bgcolor=#808080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 373: "This element is unstyled save for a background color of gray.. " - text run at (373,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 708x39 [bgcolor=#00FFFF] - RenderText {#text} at (447,0) size 133x19 - text run at (447,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " + text run at (392,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 750x39 [bgcolor=#00FFFF] + RenderText {#text} at (470,0) size 143x19 + text run at (470,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (580,3) size 24x16 - text run at (580,3) width 24: "two" - RenderText {#text} at (604,0) size 708x39 - text run at (604,0) width 104: ", giving it an aqua" - text run at (0,20) width 194: "background and a -10px margin" - RenderText {#text} at (184,20) size 738x59 - text run at (184,20) width 8: ". " - text run at (192,20) width 546: "Margins on inline elements does not affect line-height calculations, so all lines in this element" - text run at (0,40) width 201: "should have the same line-height. " - text run at (201,40) width 536: "However, there should be a -10px margin to the left side of the inline box in the first line it" - text run at (0,60) width 611: "appears, and a -10px margin to the right side of the inline element box in the last line where it appears." + RenderText {#text} at (613,3) size 24x16 + text run at (613,3) width 24: "two" + RenderText {#text} at (637,0) size 750x39 + text run at (637,0) width 113: ", giving it an aqua" + text run at (0,20) width 202: "background and a -10px margin" + RenderText {#text} at (192,20) size 768x59 + text run at (192,20) width 8: ". " + text run at (200,20) width 531: "Margins on inline elements does not affect line-height calculations, so all lines in this" + text run at (0,40) width 267: "element should have the same line-height. " + text run at (267,40) width 501: "However, there should be a -10px margin to the left side of the inline box in the" + text run at (0,60) width 709: "first line it appears, and a -10px margin to the right side of the inline element box in the last line where it appears." RenderBlock {P} at (0,371) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderTable {TABLE} at (0,391) size 769x322 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x320 + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderTable {TABLE} at (0,391) size 769x362 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x360 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x292 - RenderTableCell {TD} at (0,160) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x332 + RenderTableCell {TD} at (0,180) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x292 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x332 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (4,40) size 747x80 [bgcolor=#808080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 373: "This element is unstyled save for a background color of gray.. " - text run at (373,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 743x39 [bgcolor=#00FFFF] - RenderText {#text} at (482,0) size 133x19 - text run at (482,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (4,40) size 747x100 [bgcolor=#808080] + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " + text run at (392,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 732x39 [bgcolor=#00FFFF] + RenderText {#text} at (505,0) size 143x19 + text run at (505,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (615,3) size 24x16 - text run at (615,3) width 24: "one" - RenderText {#text} at (639,0) size 743x39 - text run at (639,0) width 104: ", giving it an aqua" - text run at (0,20) width 188: "background and a 25px margin" - RenderText {#text} at (213,20) size 746x59 - text run at (213,20) width 8: ". " - text run at (221,20) width 496: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 495: "However, there should be a 25px margin to the left side of the inline box in the first" - text run at (0,60) width 640: "line it appears, and a 25px margin to the right side of the inline element box in the last line where it appears." - RenderBlock {P} at (4,136) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (4,172) size 747x80 [bgcolor=#808080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 373: "This element is unstyled save for a background color of gray.. " - text run at (373,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 708x39 [bgcolor=#00FFFF] - RenderText {#text} at (447,0) size 133x19 - text run at (447,0) width 133: "inline element of class " + RenderText {#text} at (648,3) size 24x16 + text run at (648,3) width 24: "one" + RenderText {#text} at (672,0) size 732x39 + text run at (672,0) width 60: ", giving it" + text run at (0,20) width 250: "an aqua background and a 25px margin" + RenderText {#text} at (275,20) size 742x79 + text run at (275,20) width 8: ". " + text run at (283,20) width 456: "Margins on inline elements does not affect line-height calculations, so all" + text run at (0,40) width 342: "lines in this element should have the same line-height. " + text run at (342,40) width 390: "However, there should be a 25px margin to the left side of the" + text run at (0,60) width 742: "inline box in the first line it appears, and a 25px margin to the right side of the inline element box in the last line where" + text run at (0,80) width 64: "it appears." + RenderBlock {P} at (4,156) size 747x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (4,192) size 747x100 [bgcolor=#808080] + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " + text run at (392,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 716x39 [bgcolor=#00FFFF] + RenderText {#text} at (470,0) size 143x19 + text run at (470,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (580,3) size 24x16 - text run at (580,3) width 24: "two" - RenderText {#text} at (604,0) size 708x39 - text run at (604,0) width 104: ", giving it an aqua" - text run at (0,20) width 194: "background and a -10px margin" - RenderText {#text} at (184,20) size 738x59 - text run at (184,20) width 8: ". " - text run at (192,20) width 546: "Margins on inline elements does not affect line-height calculations, so all lines in this element" - text run at (0,40) width 201: "should have the same line-height. " - text run at (201,40) width 536: "However, there should be a -10px margin to the left side of the inline box in the first line it" - text run at (0,60) width 611: "appears, and a -10px margin to the right side of the inline element box in the last line where it appears." - RenderBlock {P} at (4,268) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (613,3) size 24x16 + text run at (613,3) width 24: "two" + RenderText {#text} at (637,0) size 716x39 + text run at (637,0) width 79: ", giving it an" + text run at (0,20) width 236: "aqua background and a -10px margin" + RenderText {#text} at (226,20) size 739x79 + text run at (226,20) width 8: ". " + text run at (234,20) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in" + text run at (0,40) width 293: "this element should have the same line-height. " + text run at (293,40) width 434: "However, there should be a -10px margin to the left side of the inline" + text run at (0,60) width 720: "box in the first line it appears, and a -10px margin to the right side of the inline element box in the last line where it" + text run at (0,80) width 52: "appears." + RenderBlock {P} at (4,308) size 747x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." layer at (8,105) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin_left-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin_left-expected.txt index 5a9da1870306..74fe480615f1 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin_left-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin_left-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1057 +layer at (0,0) size 785x1077 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1057 - RenderBlock {HTML} at (0,0) size 785x1057 - RenderBody {BODY} at (8,8) size 769x1041 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1077 + RenderBlock {HTML} at (0,0) size 785x1077 + RenderBody {BODY} at (8,8) size 769x1061 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 408x96 text run at (0,0) width 392: ".zero {background-color: silver; margin-left: 0;}" @@ -21,100 +21,101 @@ layer at (0,0) size 785x1057 text run at (0,80) width 408: ".five {margin-left: -10px; background-color: aqua;}" text run at (408,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (48,199) size 721x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 324x19 - text run at (0,0) width 324: "This sentence should have a left margin of half an inch." + RenderText {#text} at (0,0) size 348x19 + text run at (0,0) width 348: "This sentence should have a left margin of half an inch." RenderBlock {P} at (25,235) size 744x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 311x19 - text run at (0,0) width 311: "This sentence should have a left margin of 25 pixels." + RenderText {#text} at (0,0) size 331x19 + text run at (0,0) width 331: "This sentence should have a left margin of 25 pixels." RenderBlock {P} at (80,271) size 689x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 287x19 - text run at (0,0) width 287: "This sentence should have a left margin of 5 em." + RenderText {#text} at (0,0) size 305x19 + text run at (0,0) width 305: "This sentence should have a left margin of 5 em." RenderBlock {P} at (192,307) size 577x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 570x39 - text run at (0,0) width 570: "This sentence should have a left margin of 25%, which is calculated with respect to the width of" - text run at (0,20) width 114: "the parent element." + RenderText {#text} at (0,0) size 546x39 + text run at (0,0) width 546: "This sentence should have a left margin of 25%, which is calculated with respect to the" + text run at (0,20) width 176: "width of the parent element." RenderBlock {UL} at (25,363) size 744x100 [bgcolor=#808080] RenderListItem {LI} at (40,0) size 704x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 656x19 - text run at (0,0) width 656: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to gray." + RenderText {#text} at (0,0) size 685x19 + text run at (0,0) width 685: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to gray." RenderListItem {LI} at (65,20) size 679x60 [bgcolor=#FFFFFF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 644x59 - text run at (0,0) width 625: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (0,20) width 59: "checked. " - text run at (59,20) width 585: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin to" - text run at (0,40) width 443: "make 50 pixels of margin, and its background color has been set to white." + RenderText {#text} at (0,0) size 668x59 + text run at (0,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" + text run at (0,20) width 60: "checked. " + text run at (60,20) width 608: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin" + text run at (0,40) width 479: "to make 50 pixels of margin, and its background color has been set to white." RenderListItem {LI} at (40,80) size 704x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 167x19 - text run at (0,0) width 167: "This is an unclassed list item" + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "This is an unclassed list item" RenderBlock {P} at (0,479) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (-10,515) size 779x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 770x59 - text run at (0,0) width 746: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light blue" - text run at (0,20) width 80: "background. " - text run at (80,20) width 369: "In all other respects, however, the element should be normal. " - text run at (449,20) width 321: "No styles have been applied to it besides the negative" - text run at (0,40) width 225: "left margin and the background color." - RenderTable {TABLE} at (0,591) size 769x450 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x448 + RenderText {#text} at (0,0) size 778x59 + text run at (0,0) width 758: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light" + text run at (0,20) width 114: "blue background. " + text run at (114,20) width 386: "In all other respects, however, the element should be normal. " + text run at (500,20) width 278: "No styles have been applied to it besides the" + text run at (0,40) width 293: "negative left margin and the background color." + RenderTable {TABLE} at (0,591) size 769x470 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x468 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x420 - RenderTableCell {TD} at (0,224) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x440 + RenderTableCell {TD} at (0,234) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x420 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x440 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (52,40) size 699x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 324x19 - text run at (0,0) width 324: "This sentence should have a left margin of half an inch." + RenderText {#text} at (0,0) size 348x19 + text run at (0,0) width 348: "This sentence should have a left margin of half an inch." RenderBlock {P} at (29,76) size 722x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 311x19 - text run at (0,0) width 311: "This sentence should have a left margin of 25 pixels." + RenderText {#text} at (0,0) size 331x19 + text run at (0,0) width 331: "This sentence should have a left margin of 25 pixels." RenderBlock {P} at (84,112) size 667x20 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 287x19 - text run at (0,0) width 287: "This sentence should have a left margin of 5 em." + RenderText {#text} at (0,0) size 305x19 + text run at (0,0) width 305: "This sentence should have a left margin of 5 em." RenderBlock {P} at (190,148) size 561x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 554x39 - text run at (0,0) width 554: "This sentence should have a left margin of 25%, which is calculated with respect to the width" - text run at (0,20) width 130: "of the parent element." - RenderBlock {UL} at (29,204) size 722x100 [bgcolor=#808080] - RenderListItem {LI} at (40,0) size 682x20 + RenderText {#text} at (0,0) size 546x39 + text run at (0,0) width 546: "This sentence should have a left margin of 25%, which is calculated with respect to the" + text run at (0,20) width 176: "width of the parent element." + RenderBlock {UL} at (29,204) size 722x120 [bgcolor=#808080] + RenderListItem {LI} at (40,0) size 682x40 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 656x19 - text run at (0,0) width 656: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to gray." - RenderListItem {LI} at (65,20) size 657x60 [bgcolor=#FFFFFF] + RenderText {#text} at (0,0) size 650x39 + text run at (0,0) width 650: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to" + text run at (0,20) width 31: "gray." + RenderListItem {LI} at (65,40) size 657x60 [bgcolor=#FFFFFF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 644x59 - text run at (0,0) width 625: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (0,20) width 59: "checked. " - text run at (59,20) width 585: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin to" - text run at (0,40) width 443: "make 50 pixels of margin, and its background color has been set to white." - RenderListItem {LI} at (40,80) size 682x20 + RenderText {#text} at (0,0) size 656x59 + text run at (0,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" + text run at (0,20) width 60: "checked. " + text run at (60,20) width 560: "This list item has its left margin also set to 25 pixels, which should combine with the list's" + text run at (0,40) width 527: "margin to make 50 pixels of margin, and its background color has been set to white." + RenderListItem {LI} at (40,100) size 682x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 167x19 - text run at (0,0) width 167: "This is an unclassed list item" - RenderBlock {P} at (4,320) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (-6,356) size 757x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 746x59 - text run at (0,0) width 746: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light blue" - text run at (0,20) width 80: "background. " - text run at (80,20) width 369: "In all other respects, however, the element should be normal. " - text run at (449,20) width 268: "No styles have been applied to it besides the" - text run at (0,40) width 278: "negative left margin and the background color." + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "This is an unclassed list item" + RenderBlock {P} at (4,340) size 747x20 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (-6,376) size 757x60 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 737x59 + text run at (0,0) width 726: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a" + text run at (0,20) width 146: "light blue background. " + text run at (146,20) width 386: "In all other respects, however, the element should be normal. " + text run at (532,20) width 205: "No styles have been applied to it" + text run at (0,40) width 366: "besides the negative left margin and the background color." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin_left_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin_left_inline-expected.txt index b463b5a7c142..96f1384f59fb 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin_left_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin_left_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x32 RenderText {#text} at (0,0) size 400x32 text run at (0,0) width 392: ".one {margin-left: 25px; background-color: aqua;}" @@ -13,88 +13,88 @@ layer at (0,0) size 800x600 text run at (0,16) width 400: ".two {margin-left: -10px; background-color: aqua;}" text run at (400,16) width 0: " " RenderBlock {P} at (0,99) size 784x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (540,0) size 133x19 - text run at (540,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (567,0) size 143x19 + text run at (567,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (673,3) size 24x16 - text run at (673,3) width 24: "one" - RenderText {#text} at (697,0) size 783x39 - text run at (697,0) width 86: ", which should" - text run at (0,20) width 235: "result in 25-pixel left margin only in the " + RenderText {#text} at (710,3) size 24x16 + text run at (710,3) width 24: "one" + RenderText {#text} at (734,0) size 781x39 + text run at (734,0) width 47: ", which" + text run at (0,20) width 299: "should result in 25-pixel left margin only in the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (235,20) size 27x19 - text run at (235,20) width 27: "first" - RenderText {#text} at (262,20) size 216x19 - text run at (262,20) width 216: " line in which the inline box appears." + RenderText {#text} at (299,20) size 27x19 + text run at (299,20) width 27: "first" + RenderText {#text} at (326,20) size 232x19 + text run at (326,20) width 232: " line in which the inline box appears." RenderBlock {P} at (0,155) size 784x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (505,0) size 133x19 - text run at (505,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (532,0) size 143x19 + text run at (532,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (638,3) size 24x16 - text run at (638,3) width 24: "two" - RenderText {#text} at (662,0) size 784x39 - text run at (662,0) width 122: ", which should result" - text run at (0,20) width 186: "in -10px left margin only in the " + RenderText {#text} at (675,3) size 24x16 + text run at (675,3) width 24: "two" + RenderText {#text} at (699,0) size 746x39 + text run at (699,0) width 47: ", which" + text run at (0,20) width 284: "should result in -10px left margin only in the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (186,20) size 27x19 - text run at (186,20) width 27: "first" - RenderText {#text} at (213,20) size 216x19 - text run at (213,20) width 216: " line in which the inline box appears." + RenderText {#text} at (284,20) size 27x19 + text run at (284,20) width 27: "first" + RenderText {#text} at (311,20) size 232x19 + text run at (311,20) width 232: " line in which the inline box appears." RenderTable {TABLE} at (0,211) size 784x134 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x132 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x104 RenderTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (540,0) size 133x19 - text run at (540,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (567,0) size 143x19 + text run at (567,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (673,3) size 24x16 - text run at (673,3) width 24: "one" - RenderText {#text} at (697,0) size 740x39 - text run at (697,0) width 43: ", which" - text run at (0,20) width 278: "should result in 25-pixel left margin only in the " + RenderText {#text} at (710,3) size 24x16 + text run at (710,3) width 24: "one" + RenderText {#text} at (734,0) size 738x39 + text run at (734,0) width 4: "," + text run at (0,20) width 342: "which should result in 25-pixel left margin only in the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (278,20) size 27x19 - text run at (278,20) width 27: "first" - RenderText {#text} at (305,20) size 216x19 - text run at (305,20) width 216: " line in which the inline box appears." + RenderText {#text} at (342,20) size 27x19 + text run at (342,20) width 27: "first" + RenderText {#text} at (369,20) size 232x19 + text run at (369,20) width 232: " line in which the inline box appears." RenderBlock {P} at (4,60) size 762x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (505,0) size 133x19 - text run at (505,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (532,0) size 143x19 + text run at (532,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (638,3) size 24x16 - text run at (638,3) width 24: "two" - RenderText {#text} at (662,0) size 748x39 - text run at (662,0) width 86: ", which should" - text run at (0,20) width 222: "result in -10px left margin only in the " + RenderText {#text} at (675,3) size 24x16 + text run at (675,3) width 24: "two" + RenderText {#text} at (699,0) size 746x39 + text run at (699,0) width 47: ", which" + text run at (0,20) width 284: "should result in -10px left margin only in the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (222,20) size 27x19 - text run at (222,20) width 27: "first" - RenderText {#text} at (249,20) size 216x19 - text run at (249,20) width 216: " line in which the inline box appears." + RenderText {#text} at (284,20) size 27x19 + text run at (284,20) width 27: "first" + RenderText {#text} at (311,20) size 232x19 + text run at (311,20) width 232: " line in which the inline box appears." layer at (8,89) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,81) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin_right-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin_right-expected.txt index 892ec252ebb9..8c8c5d2727f0 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin_right-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin_right-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 787x1057 +layer at (0,0) size 787x1077 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x1057 - RenderBlock {HTML} at (0,0) size 785x1057 - RenderBody {BODY} at (8,8) size 769x1041 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1077 + RenderBlock {HTML} at (0,0) size 785x1077 + RenderBody {BODY} at (8,8) size 769x1061 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 560x96 text run at (0,0) width 552: ".zero {background-color: silver; margin-right: 0; text-align: right;}" @@ -21,100 +21,101 @@ layer at (0,0) size 785x1057 text run at (0,80) width 416: ".five {margin-right: -10px; background-color: aqua;}" text run at (416,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (576,0) size 193x19 - text run at (576,0) width 193: "This element has a class of zero." + RenderText {#text} at (566,0) size 203x19 + text run at (566,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,199) size 721x20 [bgcolor=#00FFFF] - RenderText {#text} at (389,0) size 332x19 - text run at (389,0) width 332: "This sentence should have a right margin of half an inch." + RenderText {#text} at (364,0) size 357x19 + text run at (364,0) width 357: "This sentence should have a right margin of half an inch." RenderBlock {P} at (0,235) size 744x20 [bgcolor=#00FFFF] - RenderText {#text} at (425,0) size 319x19 - text run at (425,0) width 319: "This sentence should have a right margin of 25 pixels." + RenderText {#text} at (404,0) size 340x19 + text run at (404,0) width 340: "This sentence should have a right margin of 25 pixels." RenderBlock {P} at (0,271) size 689x20 [bgcolor=#00FFFF] - RenderText {#text} at (394,0) size 295x19 - text run at (394,0) width 295: "This sentence should have a right margin of 5 em." + RenderText {#text} at (375,0) size 314x19 + text run at (375,0) width 314: "This sentence should have a right margin of 5 em." RenderBlock {P} at (0,307) size 577x40 [bgcolor=#00FFFF] - RenderText {#text} at (14,0) size 563x39 - text run at (14,0) width 563: "This sentence should have a right margin of 25%, which is calculated with respect to the width" - text run at (446,20) width 131: "of the parent element." + RenderText {#text} at (21,0) size 556x39 + text run at (21,0) width 556: "This sentence should have a right margin of 25%, which is calculated with respect to the" + text run at (400,20) width 177: "width of the parent element." RenderBlock {UL} at (0,363) size 744x100 [bgcolor=#808080] RenderListItem {LI} at (40,0) size 704x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (35,0) size 669x19 - text run at (35,0) width 669: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray." + RenderText {#text} at (5,0) size 699x19 + text run at (5,0) width 699: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray." RenderListItem {LI} at (40,20) size 679x60 [bgcolor=#FFFFFF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (54,0) size 652x59 - text run at (54,0) width 625: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (27,20) width 59: "checked. " - text run at (86,20) width 593: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin to" - text run at (234,40) width 445: "make 50 pixels of margin, and its background-color has been set to white." + RenderText {#text} at (23,0) size 677x59 + text run at (23,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" + text run at (2,20) width 60: "checked. " + text run at (62,20) width 617: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin" + text run at (199,40) width 480: "to make 50 pixels of margin, and its background-color has been set to white." RenderListItem {LI} at (40,80) size 704x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (537,0) size 167x19 - text run at (537,0) width 167: "This is an unclassed list item" + RenderText {#text} at (525,0) size 179x19 + text run at (525,0) width 179: "This is an unclassed list item" RenderBlock {P} at (0,479) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (576,0) size 193x19 - text run at (576,0) width 193: "This element has a class of zero." + RenderText {#text} at (566,0) size 203x19 + text run at (566,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,515) size 779x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 770x59 - text run at (0,0) width 754: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light blue" - text run at (0,20) width 80: "background. " - text run at (80,20) width 369: "In all other respects, however, the element should be normal. " - text run at (449,20) width 321: "No styles have been applied to it besides the negative" - text run at (0,40) width 233: "right margin and the background color." - RenderTable {TABLE} at (0,591) size 769x450 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x448 + RenderText {#text} at (0,0) size 778x59 + text run at (0,0) width 767: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light" + text run at (0,20) width 114: "blue background. " + text run at (114,20) width 386: "In all other respects, however, the element should be normal. " + text run at (500,20) width 278: "No styles have been applied to it besides the" + text run at (0,40) width 302: "negative right margin and the background color." + RenderTable {TABLE} at (0,591) size 769x470 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x468 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x420 - RenderTableCell {TD} at (0,224) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x440 + RenderTableCell {TD} at (0,234) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x420 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x440 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (554,0) size 193x19 - text run at (554,0) width 193: "This element has a class of zero." + RenderText {#text} at (544,0) size 203x19 + text run at (544,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,40) size 699x20 [bgcolor=#00FFFF] - RenderText {#text} at (367,0) size 332x19 - text run at (367,0) width 332: "This sentence should have a right margin of half an inch." + RenderText {#text} at (342,0) size 357x19 + text run at (342,0) width 357: "This sentence should have a right margin of half an inch." RenderBlock {P} at (4,76) size 722x20 [bgcolor=#00FFFF] - RenderText {#text} at (403,0) size 319x19 - text run at (403,0) width 319: "This sentence should have a right margin of 25 pixels." + RenderText {#text} at (382,0) size 340x19 + text run at (382,0) width 340: "This sentence should have a right margin of 25 pixels." RenderBlock {P} at (4,112) size 667x20 [bgcolor=#00FFFF] - RenderText {#text} at (372,0) size 295x19 - text run at (372,0) width 295: "This sentence should have a right margin of 5 em." + RenderText {#text} at (353,0) size 314x19 + text run at (353,0) width 314: "This sentence should have a right margin of 5 em." RenderBlock {P} at (4,148) size 561x40 [bgcolor=#00FFFF] - RenderText {#text} at (35,0) size 526x39 - text run at (35,0) width 526: "This sentence should have a right margin of 25%, which is calculated with respect to the" - text run at (393,20) width 168: "width of the parent element." - RenderBlock {UL} at (4,204) size 722x100 [bgcolor=#808080] - RenderListItem {LI} at (40,0) size 682x20 + RenderText {#text} at (5,0) size 556x39 + text run at (5,0) width 556: "This sentence should have a right margin of 25%, which is calculated with respect to the" + text run at (384,20) width 177: "width of the parent element." + RenderBlock {UL} at (4,204) size 722x120 [bgcolor=#808080] + RenderListItem {LI} at (40,0) size 682x40 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (13,0) size 669x19 - text run at (13,0) width 669: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray." - RenderListItem {LI} at (40,20) size 657x60 [bgcolor=#FFFFFF] + RenderText {#text} at (18,0) size 664x39 + text run at (18,0) width 664: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to" + text run at (651,20) width 31: "gray." + RenderListItem {LI} at (40,40) size 657x60 [bgcolor=#FFFFFF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (32,0) size 652x59 - text run at (32,0) width 625: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (5,20) width 59: "checked. " - text run at (64,20) width 593: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin to" - text run at (212,40) width 445: "make 50 pixels of margin, and its background-color has been set to white." - RenderListItem {LI} at (40,80) size 682x20 + RenderText {#text} at (1,0) size 656x59 + text run at (1,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" + text run at (28,20) width 60: "checked. " + text run at (88,20) width 569: "This list item has its right margin also set to 25 pixels, which should combine with the list's" + text run at (129,40) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white." + RenderListItem {LI} at (40,100) size 682x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (515,0) size 167x19 - text run at (515,0) width 167: "This is an unclassed list item" - RenderBlock {P} at (4,320) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (554,0) size 193x19 - text run at (554,0) width 193: "This element has a class of zero." - RenderBlock {P} at (4,356) size 757x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 754x59 - text run at (0,0) width 754: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light blue" - text run at (0,20) width 80: "background. " - text run at (80,20) width 369: "In all other respects, however, the element should be normal. " - text run at (449,20) width 268: "No styles have been applied to it besides the" - text run at (0,40) width 286: "negative right margin and the background color." + RenderText {#text} at (503,0) size 179x19 + text run at (503,0) width 179: "This is an unclassed list item" + RenderBlock {P} at (4,340) size 747x20 [bgcolor=#C0C0C0] + RenderText {#text} at (544,0) size 203x19 + text run at (544,0) width 203: "This element has a class of zero." + RenderBlock {P} at (4,376) size 757x60 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 737x59 + text run at (0,0) width 735: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a" + text run at (0,20) width 146: "light blue background. " + text run at (146,20) width 386: "In all other respects, however, the element should be normal. " + text run at (532,20) width 205: "No styles have been applied to it" + text run at (0,40) width 375: "besides the negative right margin and the background color." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin_right_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin_right_inline-expected.txt index 661946eb9a63..344c0cf1dbe6 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin_right_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin_right_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x32 RenderText {#text} at (0,0) size 552x32 text run at (0,0) width 552: ".one {margin-right: 25px; text-align: right; background-color: aqua;}" @@ -13,88 +13,88 @@ layer at (0,0) size 800x600 text run at (0,16) width 408: ".two {margin-right: -10px; background-color: aqua;}" text run at (408,16) width 0: " " RenderBlock {P} at (0,99) size 784x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "one" - RenderText {#text} at (697,0) size 783x39 - text run at (697,0) width 86: ", which should" - text run at (0,20) width 243: "result in 25-pixel right margin only in the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (243,20) size 24x19 - text run at (243,20) width 24: "last" - RenderText {#text} at (267,20) size 216x19 - text run at (267,20) width 216: " line in which the inline box appears." + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "one" + RenderText {#text} at (734,0) size 781x39 + text run at (734,0) width 47: ", which" + text run at (0,20) width 308: "should result in 25-pixel right margin only in the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (308,20) size 23x19 + text run at (308,20) width 23: "last" + RenderText {#text} at (331,20) size 232x19 + text run at (331,20) width 232: " line in which the inline box appears." RenderBlock {P} at (0,155) size 784x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "two" - RenderText {#text} at (662,0) size 784x39 - text run at (662,0) width 122: ", which should result" - text run at (0,20) width 194: "in -10px right margin only in the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (194,20) size 24x19 - text run at (194,20) width 24: "last" - RenderText {#text} at (218,20) size 216x19 - text run at (218,20) width 216: " line in which the inline box appears." + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "two" + RenderText {#text} at (699,0) size 746x39 + text run at (699,0) width 47: ", which" + text run at (0,20) width 293: "should result in -10px right margin only in the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (293,20) size 23x19 + text run at (293,20) width 23: "last" + RenderText {#text} at (316,20) size 232x19 + text run at (316,20) width 232: " line in which the inline box appears." RenderTable {TABLE} at (0,211) size 784x134 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x132 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x104 RenderTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "one" - RenderText {#text} at (697,0) size 740x39 - text run at (697,0) width 43: ", which" - text run at (0,20) width 286: "should result in 25-pixel right margin only in the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (286,20) size 24x19 - text run at (286,20) width 24: "last" - RenderText {#text} at (310,20) size 216x19 - text run at (310,20) width 216: " line in which the inline box appears." + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "one" + RenderText {#text} at (734,0) size 738x39 + text run at (734,0) width 4: "," + text run at (0,20) width 351: "which should result in 25-pixel right margin only in the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (351,20) size 23x19 + text run at (351,20) width 23: "last" + RenderText {#text} at (374,20) size 232x19 + text run at (374,20) width 232: " line in which the inline box appears." RenderBlock {P} at (4,60) size 762x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "two" - RenderText {#text} at (662,0) size 748x39 - text run at (662,0) width 86: ", which should" - text run at (0,20) width 230: "result in -10px right margin only in the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (230,20) size 24x19 - text run at (230,20) width 24: "last" - RenderText {#text} at (254,20) size 216x19 - text run at (254,20) width 216: " line in which the inline box appears." + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "two" + RenderText {#text} at (699,0) size 746x39 + text run at (699,0) width 47: ", which" + text run at (0,20) width 293: "should result in -10px right margin only in the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (293,20) size 23x19 + text run at (293,20) width 23: "last" + RenderText {#text} at (316,20) size 232x19 + text run at (316,20) width 232: " line in which the inline box appears." layer at (8,89) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,81) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin_top-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin_top-expected.txt index a6d34780d5e8..b858fd1cea91 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin_top-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin_top-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1703 +layer at (0,0) size 785x1723 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1703 - RenderBlock {HTML} at (0,0) size 785x1703 - RenderBody {BODY} at (8,8) size 769x1687 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1723 + RenderBlock {HTML} at (0,0) size 785x1723 + RenderBody {BODY} at (8,8) size 769x1707 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,33) size 769x128 RenderText {#text} at (0,0) size 392x128 text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}" @@ -25,114 +25,114 @@ layer at (0,0) size 785x1703 text run at (0,112) width 200: "P, UL {margin-bottom: 0;}" text run at (200,112) width 0: " " RenderBlock {P} at (0,184) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,204) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." + RenderText {#text} at (0,0) size 232x19 + text run at (0,0) width 232: "This element also has a class of zero." RenderBlock {P} at (0,272) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 741x39 - text run at (0,0) width 741: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 759x39 + text run at (0,0) width 759: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the margin" + text run at (0,20) width 155: "isn't applied to each line." RenderBlock {P} at (0,337) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 728x39 - text run at (0,0) width 728: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 742x39 + text run at (0,0) width 742: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin" + text run at (0,20) width 155: "isn't applied to each line." RenderBlock {P} at (0,457) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 768x39 - text run at (0,0) width 768: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't applied to" - text run at (0,20) width 56: "each line." + RenderText {#text} at (0,0) size 745x39 + text run at (0,0) width 745: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't" + text run at (0,20) width 126: "applied to each line." RenderBlock {P} at (0,689) size 769x41 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 737x39 - text run at (0,0) width 688: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element. " - text run at (688,0) width 49: "This will" - text run at (0,20) width 198: "require extra text in order to test." + RenderText {#text} at (0,0) size 753x39 + text run at (0,0) width 725: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element. " + text run at (725,0) width 28: "This" + text run at (0,20) width 232: "will require extra text in order to test." RenderBlock {UL} at (0,754) size 769x106 [bgcolor=#00FFFF] RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 379x19 - text run at (0,0) width 379: "This list has a margin-top of 25px, and a light blue background." + RenderText {#text} at (0,0) size 400x19 + text run at (0,0) width 400: "This list has a margin-top of 25px, and a light blue background." RenderListItem {LI} at (40,20) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." + RenderText {#text} at (0,0) size 264x19 + text run at (0,0) width 264: "Therefore, it ought to have such a margin." RenderListItem {LI} at (40,65) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 535x19 - text run at (0,0) width 535: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." + RenderText {#text} at (0,0) size 567x19 + text run at (0,0) width 567: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." RenderListItem {LI} at (40,85) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "This list item has no special styles applied to it." RenderBlock {P} at (0,859) size 769x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (0,869) size 769x41 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 750x39 - text run at (0,0) width 730: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom margin. " - text run at (730,0) width 20: "No" - text run at (0,20) width 444: "other styles have been applied to it besides a light blue background color. " - text run at (444,20) width 305: "In all other respects, the element should be normal." - RenderTable {TABLE} at (0,909) size 769x778 [border: (1px outset #808080)] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (0,869) size 769x61 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 766x59 + text run at (0,0) width 766: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom margin." + text run at (0,20) width 487: "No other styles have been applied to it besides a light blue background color. " + text run at (487,20) width 267: "In all other respects, the element should be" + text run at (0,40) width 48: "normal." + RenderTable {TABLE} at (0,929) size 769x778 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x776 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x748 RenderTableCell {TD} at (0,387) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x748 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,24) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." + RenderText {#text} at (0,0) size 232x19 + text run at (0,0) width 232: "This element also has a class of zero." RenderBlock {P} at (4,92) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 741x39 - text run at (0,0) width 741: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 711x39 + text run at (0,0) width 711: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the" + text run at (0,20) width 203: "margin isn't applied to each line." RenderBlock {P} at (4,157) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 728x39 - text run at (0,0) width 728: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 742x39 + text run at (0,0) width 742: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin" + text run at (0,20) width 155: "isn't applied to each line." RenderBlock {P} at (4,277) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 704x39 - text run at (0,0) width 704: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." + RenderText {#text} at (0,0) size 745x39 + text run at (0,0) width 745: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't" + text run at (0,20) width 126: "applied to each line." RenderBlock {P} at (4,503) size 747x41 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 737x39 - text run at (0,0) width 688: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element. " - text run at (688,0) width 49: "This will" - text run at (0,20) width 198: "require extra text in order to test." + RenderText {#text} at (0,0) size 721x39 + text run at (0,0) width 721: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element." + text run at (0,20) width 264: "This will require extra text in order to test." RenderBlock {UL} at (4,568) size 747x106 [bgcolor=#00FFFF] RenderListItem {LI} at (40,0) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 379x19 - text run at (0,0) width 379: "This list has a margin-top of 25px, and a light blue background." + RenderText {#text} at (0,0) size 400x19 + text run at (0,0) width 400: "This list has a margin-top of 25px, and a light blue background." RenderListItem {LI} at (40,20) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." + RenderText {#text} at (0,0) size 264x19 + text run at (0,0) width 264: "Therefore, it ought to have such a margin." RenderListItem {LI} at (40,65) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 535x19 - text run at (0,0) width 535: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." + RenderText {#text} at (0,0) size 567x19 + text run at (0,0) width 567: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." RenderListItem {LI} at (40,85) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "This list item has no special styles applied to it." RenderBlock {P} at (4,673) size 747x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,683) size 747x61 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 726x59 - text run at (0,0) width 726: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom margin." - text run at (0,20) width 468: "No other styles have been applied to it besides a light blue background color. " - text run at (468,20) width 256: "In all other respects, the element should be" - text run at (0,40) width 45: "normal." + RenderText {#text} at (0,0) size 741x59 + text run at (0,0) width 714: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom" + text run at (0,20) width 52: "margin. " + text run at (52,20) width 487: "No other styles have been applied to it besides a light blue background color. " + text run at (539,20) width 202: "In all other respects, the element" + text run at (0,40) width 113: "should be normal." layer at (8,182) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,174) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/margin_top_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/margin_top_inline-expected.txt index ad71955c78a8..9a8469641479 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/margin_top_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/margin_top_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x64 RenderText {#text} at (0,0) size 392x64 text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}" @@ -16,84 +16,84 @@ layer at (0,0) size 800x600 text run at (392,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 784x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "one" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 212: "background and a 25px top margin" - RenderText {#text} at (212,20) size 753x39 - text run at (212,20) width 8: ". " - text run at (220,20) width 533: "Margins on inline elements do not affect line-height calculations, so all lines in this element" - text run at (0,40) width 197: "should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "one" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 221: "background and a 25px top margin" + RenderText {#text} at (221,20) size 747x39 + text run at (221,20) width 8: ". " + text run at (229,20) width 518: "Margins on inline elements do not affect line-height calculations, so all lines in this" + text run at (0,40) width 263: "element should have the same line-height." RenderBlock {P} at (0,207) size 784x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 776x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 753x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "two" - RenderText {#text} at (610,0) size 776x39 - text run at (610,0) width 166: ", giving the inline element an" - text run at (0,20) width 251: "aqua background and a -10px top margin" - RenderText {#text} at (251,20) size 742x39 - text run at (251,20) width 8: ". " - text run at (259,20) width 483: "Margins on inline elements do not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "two" + RenderText {#text} at (643,0) size 753x39 + text run at (643,0) width 110: ", giving the inline" + text run at (0,20) width 332: "element an aqua background and a -10px top margin" + RenderText {#text} at (332,20) size 783x39 + text run at (332,20) width 8: ". " + text run at (340,20) width 443: "Margins on inline elements do not affect line-height calculations, so all" + text run at (0,40) width 338: "lines in this element should have the same line-height." RenderTable {TABLE} at (0,283) size 784x174 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x172 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x144 RenderTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "one" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 212: "background and a 25px top margin" - RenderText {#text} at (212,20) size 753x39 - text run at (212,20) width 8: ". " - text run at (220,20) width 533: "Margins on inline elements do not affect line-height calculations, so all lines in this element" - text run at (0,40) width 197: "should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "one" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 221: "background and a 25px top margin" + RenderText {#text} at (221,20) size 747x39 + text run at (221,20) width 8: ". " + text run at (229,20) width 518: "Margins on inline elements do not affect line-height calculations, so all lines in this" + text run at (0,40) width 263: "element should have the same line-height." RenderBlock {P} at (4,80) size 762x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 758x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 753x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "two" - RenderText {#text} at (610,0) size 758x39 - text run at (610,0) width 148: ", giving the inline element" - text run at (0,20) width 269: "an aqua background and a -10px top margin" - RenderText {#text} at (269,20) size 760x39 - text run at (269,20) width 8: ". " - text run at (277,20) width 483: "Margins on inline elements do not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "two" + RenderText {#text} at (643,0) size 753x39 + text run at (643,0) width 110: ", giving the inline" + text run at (0,20) width 332: "element an aqua background and a -10px top margin" + RenderText {#text} at (332,20) size 746x39 + text run at (332,20) width 8: ". " + text run at (340,20) width 406: "Margins on inline elements do not affect line-height calculations," + text run at (0,40) width 375: "so all lines in this element should have the same line-height." layer at (8,121) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding-expected.txt index c9a28843f59f..e7fd1af85011 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x2283 RenderBlock {HTML} at (0,0) size 785x2283 RenderBody {BODY} at (8,8) size 769x2267 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 376x96 text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}" @@ -21,72 +21,74 @@ layer at (0,0) size 785x2283 text run at (0,80) width 376: ".five {padding: -20px; background-color: aqua;}" text run at (376,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,199) size 769x136 [bgcolor=#00FFFF] - RenderText {#text} at (48,48) size 653x39 - text run at (48,48) width 624: "This element should have an overall padding of half an inch, which will require extra text in order to test. " - text run at (672,48) width 29: "Both" - text run at (48,68) width 408: "the content background and the padding should be aqua (light blue)." + RenderText {#text} at (48,48) size 660x39 + text run at (48,48) width 660: "This element should have an overall padding of half an inch, which will require extra text in order to test." + text run at (48,68) width 464: "Both the content background and the padding should be aqua (light blue)." RenderBlock {P} at (0,351) size 769x90 [bgcolor=#00FFFF] - RenderText {#text} at (25,25) size 710x39 - text run at (25,25) width 611: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " - text run at (636,25) width 99: "Both the content" - text run at (25,45) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (25,25) size 701x39 + text run at (25,25) width 647: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " + text run at (672,25) width 54: "Both the" + text run at (25,45) width 406: "content background and the padding should be aqua (light blue)." RenderBlock {P} at (0,457) size 769x200 [bgcolor=#00FFFF] - RenderText {#text} at (80,80) size 583x39 - text run at (80,80) width 583: "This element should have an overall padding of 5 em, which will require extra text in order to test." - text run at (80,100) width 441: "Both the content background and the padding should be aqua (light blue)." + RenderText {#text} at (80,80) size 588x39 + text run at (80,80) width 588: "This element should have an overall padding of 5 em, which will require extra text in order to" + text run at (80,100) width 29: "test. " + text run at (109,100) width 464: "Both the content background and the padding should be aqua (light blue)." RenderBlock {P} at (0,673) size 769x465 [bgcolor=#00FFFF] RenderText {#text} at (192,192) size 380x80 - text run at (192,192) width 370: "This element should have an overall padding of 25%, which is" - text run at (192,212) width 351: "calculated with respect to the width of the parent element. " - text run at (542,212) width 30: "Both" - text run at (192,232) width 371: "the content background and the padding should be aqua (light" - text run at (192,252) width 35: "blue)." + text run at (192,192) width 380: "This element should have an overall padding of 25%, which" + text run at (192,212) width 377: "is calculated with respect to the width of the parent element." + text run at (192,232) width 354: "Both the content background and the padding should be" + text run at (192,252) width 108: "aqua (light blue)." RenderBlock {P} at (0,1153) size 769x41 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 733x39 - text run at (0,0) width 510: "This element should have no padding, since negative padding values are not allowed. " - text run at (510,0) width 223: "Both the content background and the" - text run at (0,20) width 259: "normal padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 751x39 + text run at (0,0) width 541: "This element should have no padding, since negative padding values are not allowed. " + text run at (541,0) width 210: "Both the content background and" + text run at (0,20) width 298: "the normal padding should be aqua (light blue)." RenderTable {TABLE} at (0,1209) size 769x1058 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x1056 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x1028 RenderTableCell {TD} at (0,527) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x1028 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,40) size 747x136 [bgcolor=#00FFFF] - RenderText {#text} at (48,48) size 620x39 - text run at (48,48) width 620: "This element should have an overall padding of half an inch, which will require extra text in order to test." - text run at (48,68) width 441: "Both the content background and the padding should be aqua (light blue)." + RenderText {#text} at (48,48) size 631x39 + text run at (48,48) width 631: "This element should have an overall padding of half an inch, which will require extra text in order to" + text run at (48,68) width 29: "test. " + text run at (77,68) width 464: "Both the content background and the padding should be aqua (light blue)." RenderBlock {P} at (4,192) size 747x90 [bgcolor=#00FFFF] - RenderText {#text} at (25,25) size 662x39 - text run at (25,25) width 611: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " - text run at (636,25) width 51: "Both the" - text run at (25,45) width 386: "content background and the padding should be aqua (light blue)." + RenderText {#text} at (25,25) size 678x39 + text run at (25,25) width 647: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " + text run at (672,25) width 31: "Both" + text run at (25,45) width 429: "the content background and the padding should be aqua (light blue)." RenderBlock {P} at (4,298) size 747x200 [bgcolor=#00FFFF] - RenderText {#text} at (80,80) size 583x39 - text run at (80,80) width 583: "This element should have an overall padding of 5 em, which will require extra text in order to test." - text run at (80,100) width 441: "Both the content background and the padding should be aqua (light blue)." + RenderText {#text} at (80,80) size 572x39 + text run at (80,80) width 572: "This element should have an overall padding of 5 em, which will require extra text in order" + text run at (80,100) width 45: "to test. " + text run at (125,100) width 464: "Both the content background and the padding should be aqua (light blue)." RenderBlock {P} at (4,514) size 747x454 [bgcolor=#00FFFF] - RenderText {#text} at (186,186) size 371x80 - text run at (186,186) width 370: "This element should have an overall padding of 25%, which is" - text run at (186,206) width 347: "calculated with respect to the width of the parent element." - text run at (186,226) width 371: "Both the content background and the padding should be aqua" - text run at (186,246) width 68: "(light blue)." + RenderText {#text} at (186,186) size 363x80 + text run at (186,186) width 337: "This element should have an overall padding of 25%," + text run at (186,206) width 363: "which is calculated with respect to the width of the parent" + text run at (186,226) width 58: "element. " + text run at (243,226) width 289: "Both the content background and the padding" + text run at (186,246) width 173: "should be aqua (light blue)." RenderBlock {P} at (4,983) size 747x41 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 733x39 - text run at (0,0) width 510: "This element should have no padding, since negative padding values are not allowed. " - text run at (510,0) width 223: "Both the content background and the" - text run at (0,20) width 259: "normal padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 724x39 + text run at (0,0) width 541: "This element should have no padding, since negative padding values are not allowed. " + text run at (541,0) width 183: "Both the content background" + text run at (0,20) width 325: "and the normal padding should be aqua (light blue)." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding_bottom-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding_bottom-expected.txt index 2dd369c4a7eb..928552db57ab 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding_bottom-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding_bottom-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1590 +layer at (0,0) size 785x1610 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1590 - RenderBlock {HTML} at (0,0) size 785x1590 - RenderBody {BODY} at (8,8) size 769x1574 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1610 + RenderBlock {HTML} at (0,0) size 785x1610 + RenderBody {BODY} at (8,8) size 769x1594 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 432x96 text run at (0,0) width 416: ".zero {background-color: silver; padding-bottom: 0;}" @@ -21,80 +21,80 @@ layer at (0,0) size 785x1590 text run at (0,80) width 432: ".five {padding-bottom: -20px; background-color: aqua;}" text run at (432,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,199) size 769x88 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 719x39 - text run at (0,0) width 620: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " - text run at (620,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 761x39 + text run at (0,0) width 657: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " + text run at (657,0) width 104: "Both the content" + text run at (0,20) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (0,303) size 769x65 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 706x39 - text run at (0,0) width 607: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " - text run at (607,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 744x39 + text run at (0,0) width 640: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " + text run at (640,0) width 104: "Both the content" + text run at (0,20) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (0,384) size 769x120 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 758x39 - text run at (0,0) width 583: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " - text run at (583,0) width 175: "Both the content background" - text run at (0,20) width 262: "and the padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 718x39 + text run at (0,0) width 614: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " + text run at (614,0) width 104: "Both the content" + text run at (0,20) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (0,520) size 769x233 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 768x39 - text run at (0,0) width 719: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent element. " - text run at (719,0) width 49: "This will" - text run at (0,20) width 202: "require extra text in order to test. " - text run at (202,20) width 441: "Both the content background and the padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 752x39 + text run at (0,0) width 752: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent element." + text run at (0,20) width 268: "This will require extra text in order to test. " + text run at (268,20) width 464: "Both the content background and the padding should be aqua (light blue)." RenderBlock {P} at (0,768) size 769x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,804) size 769x41 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 758x39 - text run at (0,0) width 557: "This element should have no bottom padding, since negative padding values are not allowed. " - text run at (557,0) width 201: "Both the content background and" - text run at (0,20) width 281: "the normal padding should be aqua (light blue)." - RenderTable {TABLE} at (0,860) size 769x714 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x712 + RenderText {#text} at (0,0) size 693x39 + text run at (0,0) width 589: "This element should have no bottom padding, since negative padding values are not allowed. " + text run at (589,0) width 104: "Both the content" + text run at (0,20) width 404: "background and the normal padding should be aqua (light blue)." + RenderTable {TABLE} at (0,860) size 769x734 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x732 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x684 - RenderTableCell {TD} at (0,355) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x704 + RenderTableCell {TD} at (0,365) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x684 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x704 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,40) size 747x88 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 719x39 - text run at (0,0) width 620: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " - text run at (620,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 711x39 + text run at (0,0) width 657: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " + text run at (657,0) width 54: "Both the" + text run at (0,20) width 406: "content background and the padding should be aqua (light blue)." RenderBlock {P} at (4,144) size 747x65 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 706x39 - text run at (0,0) width 607: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " - text run at (607,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,225) size 747x120 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 682x39 - text run at (0,0) width 583: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " - text run at (583,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,361) size 747x227 [bgcolor=#00FFFF] RenderText {#text} at (0,0) size 744x39 - text run at (0,0) width 719: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent element. " - text run at (719,0) width 25: "This" - text run at (0,20) width 226: "will require extra text in order to test. " - text run at (226,20) width 441: "Both the content background and the padding should be aqua (light blue)." - RenderBlock {P} at (4,603) size 747x21 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - RenderBlock {P} at (4,639) size 747x41 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 732x39 - text run at (0,0) width 557: "This element should have no bottom padding, since negative padding values are not allowed. " - text run at (557,0) width 175: "Both the content background" - text run at (0,20) width 307: "and the normal padding should be aqua (light blue)." + text run at (0,0) width 640: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " + text run at (640,0) width 104: "Both the content" + text run at (0,20) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,225) size 747x120 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 718x39 + text run at (0,0) width 614: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " + text run at (614,0) width 104: "Both the content" + text run at (0,20) width 356: "background and the padding should be aqua (light blue)." + RenderBlock {P} at (4,361) size 747x247 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 712x59 + text run at (0,0) width 695: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent" + text run at (0,20) width 57: "element. " + text run at (57,20) width 268: "This will require extra text in order to test. " + text run at (325,20) width 387: "Both the content background and the padding should be aqua" + text run at (0,40) width 73: "(light blue)." + RenderBlock {P} at (4,623) size 747x21 [bgcolor=#C0C0C0] + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." + RenderBlock {P} at (4,659) size 747x41 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 693x39 + text run at (0,0) width 589: "This element should have no bottom padding, since negative padding values are not allowed. " + text run at (589,0) width 104: "Both the content" + text run at (0,20) width 404: "background and the normal padding should be aqua (light blue)." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding_bottom_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding_bottom_inline-expected.txt index aebeb390975f..54c9f3d22d82 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding_bottom_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding_bottom_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 424x48 text run at (0,0) width 416: ".one {padding-bottom: 25px; background-color: aqua;}" @@ -14,88 +14,88 @@ layer at (0,0) size 800x600 text run at (424,16) width 0: " " text run at (0,32) width 0: " " RenderBlock {P} at (0,115) size 784x80 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x64 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x64 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "one" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 243: "background and a 25px bottom padding" - RenderText {#text} at (243,20) size 775x59 - text run at (243,20) width 8: ". " - text run at (251,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 524: "There may be implementation-specific limits on how much of the padding the user agent" - text run at (0,60) width 104: "is able to display." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "one" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 252: "background and a 25px bottom padding" + RenderText {#text} at (252,20) size 781x59 + text run at (252,20) width 8: ". " + text run at (260,20) width 505: "Padding on inline elements does not affect line-height calculations, so all lines in" + text run at (0,40) width 293: "this element should have the same line-height. " + text run at (293,40) width 488: "There may be implementation-specific limits on how much of the padding the" + text run at (0,60) width 176: "user agent is able to display." RenderBlock {P} at (0,211) size 784x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "two" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 497: "background and no bottom padding, since negative padding values are not allowed" - RenderText {#text} at (497,20) size 756x39 - text run at (497,20) width 8: ". " - text run at (505,20) width 251: "Padding on inline elements does not affect" - text run at (0,40) width 492: "line-height calculations, so all lines in this element should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "two" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 522: "background and no bottom padding, since negative padding values are not allowed" + RenderText {#text} at (522,20) size 757x39 + text run at (522,20) width 8: ". " + text run at (530,20) width 227: "Padding on inline elements does not" + text run at (0,40) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." RenderTable {TABLE} at (0,287) size 784x194 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x192 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x164 RenderTableCell {TD} at (0,96) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x80 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x64 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x64 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "one" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 243: "background and a 25px bottom padding" - RenderText {#text} at (243,20) size 747x59 - text run at (243,20) width 8: ". " - text run at (251,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 488: "There may be implementation-specific limits on how much of the padding the user" - text run at (0,60) width 140: "agent is able to display." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "one" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 252: "background and a 25px bottom padding" + RenderText {#text} at (252,20) size 749x59 + text run at (252,20) width 8: ". " + text run at (260,20) width 489: "Padding on inline elements does not affect line-height calculations, so all lines" + text run at (0,40) width 309: "in this element should have the same line-height. " + text run at (309,40) width 410: "There may be implementation-specific limits on how much of the" + text run at (0,60) width 254: "padding the user agent is able to display." RenderBlock {P} at (4,100) size 762x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "two" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 497: "background and no bottom padding, since negative padding values are not allowed" - RenderText {#text} at (497,20) size 756x39 - text run at (497,20) width 8: ". " - text run at (505,20) width 251: "Padding on inline elements does not affect" - text run at (0,40) width 492: "line-height calculations, so all lines in this element should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "two" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 522: "background and no bottom padding, since negative padding values are not allowed" + RenderText {#text} at (522,20) size 757x39 + text run at (522,20) width 8: ". " + text run at (530,20) width 227: "Padding on inline elements does not" + text run at (0,40) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding_inline-expected.txt index bad4309702ad..a1df0f0693c6 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x809 RenderBlock {HTML} at (0,0) size 785x809 RenderBody {BODY} at (8,8) size 769x793 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x64 RenderText {#text} at (0,0) size 368x64 text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}" @@ -16,112 +16,112 @@ layer at (0,0) size 785x809 text run at (368,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,167) size 769x120 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 739x89 [bgcolor=#00FFFF] - RenderText {#text} at (478,0) size 133x19 - text run at (478,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 747x89 [bgcolor=#00FFFF] + RenderText {#text} at (501,0) size 143x19 + text run at (501,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (611,3) size 24x16 - text run at (611,3) width 24: "one" - RenderText {#text} at (635,0) size 739x39 - text run at (635,0) width 104: ", giving it an aqua" - text run at (0,20) width 196: "background and a 25px padding" - RenderText {#text} at (221,20) size 739x99 - text run at (221,20) width 8: ". " - text run at (229,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 488: "There may be implementation-specific limits on how much of the padding the user" - text run at (0,60) width 308: "agent is able to display above and below each line. " - text run at (308,60) width 431: "However, there should be at least 25px of padding to the left side of the" - text run at (0,80) width 720: "inline box in the first line it appears, and 25px of padding to the right side of the inline element box in the last line where it" - text run at (0,100) width 52: "appears." + RenderText {#text} at (644,3) size 24x16 + text run at (644,3) width 24: "one" + RenderText {#text} at (668,0) size 747x39 + text run at (668,0) width 79: ", giving it an" + text run at (0,20) width 238: "aqua background and a 25px padding" + RenderText {#text} at (263,20) size 765x99 + text run at (263,20) width 8: ". " + text run at (271,20) width 489: "Padding on inline elements does not affect line-height calculations, so all lines" + text run at (0,40) width 309: "in this element should have the same line-height. " + text run at (309,40) width 410: "There may be implementation-specific limits on how much of the" + text run at (0,60) width 431: "padding the user agent is able to display above and below each line. " + text run at (431,60) width 334: "However, there should be at least 25px of padding to" + text run at (0,80) width 753: "the left side of the inline box in the first line it appears, and 25px of padding to the right side of the inline element box in" + text run at (0,100) width 182: "the last line where it appears." RenderBlock {P} at (0,303) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,339) size 769x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "two" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 450: "background and no padding, since negative padding values are not allowed" - RenderText {#text} at (450,20) size 739x39 - text run at (450,20) width 8: ". " - text run at (458,20) width 281: "Padding on inline elements does not affect line-" - text run at (0,40) width 466: "height calculations, so all lines in this element should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "two" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 474: "background and no padding, since negative padding values are not allowed" + RenderText {#text} at (474,20) size 748x39 + text run at (474,20) width 8: ". " + text run at (482,20) width 266: "Padding on inline elements does not affect" + text run at (0,40) width 528: "line-height calculations, so all lines in this element should have the same line-height." RenderBlock {P} at (0,415) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderTable {TABLE} at (0,451) size 769x342 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x340 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x312 RenderTableCell {TD} at (0,170) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x312 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,40) size 747x120 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 739x89 [bgcolor=#00FFFF] - RenderText {#text} at (478,0) size 133x19 - text run at (478,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 747x89 [bgcolor=#00FFFF] + RenderText {#text} at (501,0) size 143x19 + text run at (501,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (611,3) size 24x16 - text run at (611,3) width 24: "one" - RenderText {#text} at (635,0) size 739x39 - text run at (635,0) width 104: ", giving it an aqua" - text run at (0,20) width 196: "background and a 25px padding" - RenderText {#text} at (221,20) size 739x99 - text run at (221,20) width 8: ". " - text run at (229,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 488: "There may be implementation-specific limits on how much of the padding the user" - text run at (0,60) width 308: "agent is able to display above and below each line. " - text run at (308,60) width 431: "However, there should be at least 25px of padding to the left side of the" - text run at (0,80) width 720: "inline box in the first line it appears, and 25px of padding to the right side of the inline element box in the last line where it" - text run at (0,100) width 52: "appears." + RenderText {#text} at (644,3) size 24x16 + text run at (644,3) width 24: "one" + RenderText {#text} at (668,0) size 747x39 + text run at (668,0) width 79: ", giving it an" + text run at (0,20) width 238: "aqua background and a 25px padding" + RenderText {#text} at (263,20) size 729x99 + text run at (263,20) width 8: ". " + text run at (271,20) width 456: "Padding on inline elements does not affect line-height calculations, so all" + text run at (0,40) width 342: "lines in this element should have the same line-height. " + text run at (342,40) width 387: "There may be implementation-specific limits on how much of" + text run at (0,60) width 454: "the padding the user agent is able to display above and below each line. " + text run at (454,60) width 263: "However, there should be at least 25px of" + text run at (0,80) width 727: "padding to the left side of the inline box in the first line it appears, and 25px of padding to the right side of the inline" + text run at (0,100) width 279: "element box in the last line where it appears." RenderBlock {P} at (4,176) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,212) size 747x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 722x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "two" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 450: "background and no padding, since negative padding values are not allowed" - RenderText {#text} at (450,20) size 739x39 - text run at (450,20) width 8: ". " - text run at (458,20) width 281: "Padding on inline elements does not affect line-" - text run at (0,40) width 466: "height calculations, so all lines in this element should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "two" + RenderText {#text} at (643,0) size 722x39 + text run at (643,0) width 79: ", giving it an" + text run at (0,20) width 508: "aqua background and no padding, since negative padding values are not allowed" + RenderText {#text} at (508,20) size 743x39 + text run at (508,20) width 8: ". " + text run at (516,20) width 227: "Padding on inline elements does not" + text run at (0,40) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." RenderBlock {P} at (4,288) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." layer at (8,121) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding_left-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding_left-expected.txt index 1a49d8df3f1a..8e0cda0e8ee9 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding_left-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding_left-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1045 +layer at (0,0) size 785x1065 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1045 - RenderBlock {HTML} at (0,0) size 785x1045 - RenderBody {BODY} at (8,8) size 769x1029 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1065 + RenderBlock {HTML} at (0,0) size 785x1065 + RenderBody {BODY} at (8,8) size 769x1049 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 416x96 text run at (0,0) width 400: ".zero {background-color: silver; padding-left: 0;}" @@ -21,96 +21,97 @@ layer at (0,0) size 785x1045 text run at (0,80) width 416: ".five {padding-left: -20px; background-color: aqua;}" text run at (416,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,199) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (48,0) size 694x39 - text run at (48,0) width 595: "This element should have a left padding of half an inch, which will require extra text in order to test. " - text run at (643,0) width 99: "Both the content" - text run at (48,20) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (48,0) size 687x39 + text run at (48,0) width 633: "This element should have a left padding of half an inch, which will require extra text in order to test. " + text run at (681,0) width 54: "Both the" + text run at (48,20) width 406: "content background and the padding should be aqua (light blue)." RenderBlock {P} at (0,255) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (25,0) size 681x39 - text run at (25,0) width 582: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " - text run at (607,0) width 99: "Both the content" - text run at (25,20) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (25,0) size 720x39 + text run at (25,0) width 616: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " + text run at (641,0) width 104: "Both the content" + text run at (25,20) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (0,311) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (80,0) size 653x39 - text run at (80,0) width 554: "This element should have a left padding of 5em, which will require extra text in order to test. " - text run at (634,0) width 99: "Both the content" - text run at (80,20) width 338: "background and the padding should be aqua (light blue)." - RenderBlock {P} at (0,367) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (192,0) size 573x39 - text run at (192,0) width 573: "This element should have a left padding of 25%, which is calculated with respect to the width of" - text run at (192,20) width 119: "the parent element. " - text run at (310,20) width 442: "Both the content background and the padding should be aqua (light blue)." - RenderBlock {UL} at (0,423) size 769x80 [bgcolor=#808080] + RenderText {#text} at (80,0) size 640x39 + text run at (80,0) width 586: "This element should have a left padding of 5em, which will require extra text in order to test. " + text run at (666,0) width 54: "Both the" + text run at (80,20) width 406: "content background and the padding should be aqua (light blue)." + RenderBlock {P} at (0,367) size 769x60 [bgcolor=#00FFFF] + RenderText {#text} at (192,0) size 568x59 + text run at (192,0) width 549: "This element should have a left padding of 25%, which is calculated with respect to the" + text run at (192,20) width 181: "width of the parent element. " + text run at (372,20) width 388: "Both the content background and the padding should be aqua" + text run at (192,40) width 74: "(light blue)." + RenderBlock {UL} at (0,443) size 769x80 [bgcolor=#808080] RenderListItem {LI} at (25,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 682x19 - text run at (0,0) width 682: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." + RenderText {#text} at (0,0) size 715x19 + text run at (0,0) width 715: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." RenderListItem {LI} at (25,20) size 744x60 [bgcolor=#FFFFFF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (25,0) size 709x59 - text run at (25,0) width 684: "Another list item might not be such a bad idea, either, considering that such things do need to be double-checked. " - text run at (709,0) width 25: "This" - text run at (25,20) width 683: "list item has its left padding also set to 25 pixels, which should combine with the list's padding to make 50 pixels of" - text run at (25,40) width 44: "margin." - RenderBlock {P} at (0,519) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 755x39 - text run at (0,0) width 532: "This element should have no left padding, since negative padding values are not allowed. " - text run at (532,0) width 223: "Both the content background and the" - text run at (0,20) width 259: "normal padding should be aqua (light blue)." - RenderTable {TABLE} at (0,575) size 769x454 [border: (1px outset #808080)] + RenderText {#text} at (25,0) size 712x59 + text run at (25,0) width 712: "Another list item might not be such a bad idea, either, considering that such things do need to be double-checked." + text run at (25,20) width 696: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding to make 50" + text run at (25,40) width 106: "pixels of margin." + RenderBlock {P} at (0,539) size 769x40 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 748x39 + text run at (0,0) width 565: "This element should have no left padding, since negative padding values are not allowed. " + text run at (565,0) width 183: "Both the content background" + text run at (0,20) width 325: "and the normal padding should be aqua (light blue)." + RenderTable {TABLE} at (0,595) size 769x454 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x452 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x424 RenderTableCell {TD} at (0,226) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x424 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,40) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (48,0) size 694x39 - text run at (48,0) width 595: "This element should have a left padding of half an inch, which will require extra text in order to test. " - text run at (643,0) width 99: "Both the content" - text run at (48,20) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (48,0) size 687x39 + text run at (48,0) width 633: "This element should have a left padding of half an inch, which will require extra text in order to test. " + text run at (681,0) width 54: "Both the" + text run at (48,20) width 406: "content background and the padding should be aqua (light blue)." RenderBlock {P} at (4,96) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (25,0) size 681x39 - text run at (25,0) width 582: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " - text run at (607,0) width 99: "Both the content" - text run at (25,20) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (25,0) size 720x39 + text run at (25,0) width 616: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " + text run at (641,0) width 104: "Both the content" + text run at (25,20) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (4,152) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (80,0) size 653x39 - text run at (80,0) width 554: "This element should have a left padding of 5em, which will require extra text in order to test. " - text run at (634,0) width 99: "Both the content" - text run at (80,20) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (80,0) size 640x39 + text run at (80,0) width 586: "This element should have a left padding of 5em, which will require extra text in order to test. " + text run at (666,0) width 54: "Both the" + text run at (80,20) width 406: "content background and the padding should be aqua (light blue)." RenderBlock {P} at (4,208) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (186,0) size 557x59 - text run at (186,0) width 557: "This element should have a left padding of 25%, which is calculated with respect to the width" - text run at (186,20) width 135: "of the parent element. " - text run at (320,20) width 404: "Both the content background and the padding should be aqua (light" - text run at (186,40) width 35: "blue)." + RenderText {#text} at (186,0) size 549x59 + text run at (186,0) width 549: "This element should have a left padding of 25%, which is calculated with respect to the" + text run at (186,20) width 181: "width of the parent element. " + text run at (366,20) width 354: "Both the content background and the padding should be" + text run at (186,40) width 108: "aqua (light blue)." RenderBlock {UL} at (4,284) size 747x80 [bgcolor=#808080] RenderListItem {LI} at (25,0) size 722x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 682x19 - text run at (0,0) width 682: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." + RenderText {#text} at (0,0) size 715x19 + text run at (0,0) width 715: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." RenderListItem {LI} at (25,20) size 722x60 [bgcolor=#FFFFFF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (25,0) size 696x59 - text run at (25,0) width 680: "Another list item might not be such a bad idea, either, considering that such things do need to be double-checked." - text run at (25,20) width 696: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding to make 50 pixels" - text run at (25,40) width 60: "of margin." + RenderText {#text} at (25,0) size 682x59 + text run at (25,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" + text run at (25,20) width 60: "checked. " + text run at (85,20) width 622: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding" + text run at (25,40) width 180: "to make 50 pixels of margin." RenderBlock {P} at (4,380) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 733x39 - text run at (0,0) width 532: "This element should have no left padding, since negative padding values are not allowed. " - text run at (532,0) width 201: "Both the content background and" - text run at (0,20) width 281: "the normal padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 669x39 + text run at (0,0) width 565: "This element should have no left padding, since negative padding values are not allowed. " + text run at (565,0) width 104: "Both the content" + text run at (0,20) width 404: "background and the normal padding should be aqua (light blue)." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding_left_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding_left_inline-expected.txt index c39db318cab8..9721419a306b 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding_left_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding_left_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 408x48 text run at (0,0) width 400: ".one {padding-left: 25px; background-color: aqua;}" @@ -13,89 +13,91 @@ layer at (0,0) size 800x600 text run at (0,16) width 408: ".two {padding-left: -10px; background-color: aqua;}" text run at (408,16) width 0: " " text run at (0,32) width 0: " " - RenderBlock {P} at (0,115) size 784x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 182x19 [bgcolor=#00FFFF] - RenderText {#text} at (540,0) size 133x19 - text run at (540,0) width 133: "inline element of class " + RenderBlock {P} at (0,115) size 784x60 [bgcolor=#808080] + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 192x19 [bgcolor=#00FFFF] + RenderText {#text} at (567,0) size 143x19 + text run at (567,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (673,3) size 24x16 - text run at (673,3) width 24: "one" - RenderText {#text} at (697,0) size 779x39 - text run at (697,0) width 82: " which should" - text run at (0,20) width 450: "result in 25-pixel left padding (which should also be a light blue) only in the " + RenderText {#text} at (710,3) size 24x16 + text run at (710,3) width 24: "one" + RenderText {#text} at (734,0) size 777x39 + text run at (734,0) width 43: " which" + text run at (0,20) width 527: "should result in 25-pixel left padding (which should also be a light blue) only in the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (450,20) size 27x19 - text run at (450,20) width 27: "first" - RenderText {#text} at (477,20) size 216x19 - text run at (477,20) width 216: " line in which the inline box appears." - RenderBlock {P} at (0,171) size 784x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderText {#text} at (527,20) size 27x19 + text run at (527,20) width 27: "first" + RenderText {#text} at (554,20) size 730x39 + text run at (554,20) width 176: " line in which the inline box" + text run at (0,40) width 52: "appears." + RenderBlock {P} at (0,191) size 784x40 [bgcolor=#808080] + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "two" - RenderText {#text} at (672,0) size 754x39 - text run at (672,0) width 82: " which should" - text run at (0,20) width 437: "result in -10px left padding (which should also be a light blue) only in the " + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "two" + RenderText {#text} at (709,0) size 752x39 + text run at (709,0) width 43: " which" + text run at (0,20) width 512: "should result in -10px left padding (which should also be a light blue) only in the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (437,20) size 27x19 - text run at (437,20) width 27: "first" - RenderText {#text} at (464,20) size 216x19 - text run at (464,20) width 216: " line in which the inline box appears." - RenderTable {TABLE} at (0,227) size 784x134 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x132 + RenderText {#text} at (512,20) size 27x19 + text run at (512,20) width 27: "first" + RenderText {#text} at (539,20) size 232x19 + text run at (539,20) width 232: " line in which the inline box appears." + RenderTable {TABLE} at (0,247) size 784x174 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x172 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 782x104 - RenderTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 782x144 + RenderTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 182x19 [bgcolor=#00FFFF] - RenderText {#text} at (540,0) size 133x19 - text run at (540,0) width 133: "inline element of class " + RenderTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x60 [bgcolor=#808080] + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 192x19 [bgcolor=#00FFFF] + RenderText {#text} at (567,0) size 143x19 + text run at (567,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (673,3) size 24x16 - text run at (673,3) width 24: "one" - RenderText {#text} at (697,0) size 736x39 - text run at (697,0) width 39: " which" - text run at (0,20) width 493: "should result in 25-pixel left padding (which should also be a light blue) only in the " + RenderText {#text} at (710,3) size 24x16 + text run at (710,3) width 24: "one" + RenderText {#text} at (0,20) size 570x19 + text run at (0,20) width 570: "which should result in 25-pixel left padding (which should also be a light blue) only in the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (493,20) size 27x19 - text run at (493,20) width 27: "first" - RenderText {#text} at (520,20) size 216x19 - text run at (520,20) width 216: " line in which the inline box appears." - RenderBlock {P} at (4,60) size 762x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderText {#text} at (570,20) size 27x19 + text run at (570,20) width 27: "first" + RenderText {#text} at (597,20) size 745x39 + text run at (597,20) width 148: " line in which the inline" + text run at (0,40) width 80: "box appears." + RenderBlock {P} at (4,80) size 762x60 [bgcolor=#808080] + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "two" - RenderText {#text} at (672,0) size 754x39 - text run at (672,0) width 82: " which should" - text run at (0,20) width 437: "result in -10px left padding (which should also be a light blue) only in the " + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "two" + RenderText {#text} at (709,0) size 752x39 + text run at (709,0) width 43: " which" + text run at (0,20) width 512: "should result in -10px left padding (which should also be a light blue) only in the " RenderInline {STRONG} at (0,0) size 27x19 - RenderText {#text} at (437,20) size 27x19 - text run at (437,20) width 27: "first" - RenderText {#text} at (464,20) size 216x19 - text run at (464,20) width 216: " line in which the inline box appears." + RenderText {#text} at (512,20) size 27x19 + text run at (512,20) width 27: "first" + RenderText {#text} at (539,20) size 715x39 + text run at (539,20) width 176: " line in which the inline box" + text run at (0,40) width 52: "appears." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding_right-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding_right-expected.txt index e792b72968a8..c2a3eba5cd46 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding_right-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding_right-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1185 +layer at (0,0) size 785x1245 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1185 - RenderBlock {HTML} at (0,0) size 785x1185 - RenderBody {BODY} at (8,8) size 769x1169 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1245 + RenderBlock {HTML} at (0,0) size 785x1245 + RenderBody {BODY} at (8,8) size 769x1229 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 576x96 text run at (0,0) width 408: ".zero {background-color: silver; padding-right: 0;}" @@ -21,111 +21,115 @@ layer at (0,0) size 785x1185 text run at (0,80) width 576: ".five {padding-right: -20px; text-align: right; background-color: aqua;}" text run at (576,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,199) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (19,0) size 702x59 - text run at (19,0) width 603: "This element should have a right padding of half an inch, which will require extra text in order to test. " - text run at (622,0) width 99: "Both the content" - text run at (39,20) width 342: "background and the padding should be aqua (light blue). " - text run at (381,20) width 340: "The text has been right-aligned in order to make the right" - text run at (590,40) width 131: "padding easier to see." + RenderText {#text} at (25,0) size 712x59 + text run at (25,0) width 642: "This element should have a right padding of half an inch, which will require extra text in order to test. " + text run at (667,0) width 54: "Both the" + text run at (9,20) width 410: "content background and the padding should be aqua (light blue). " + text run at (419,20) width 302: "The text has been right-aligned in order to make" + text run at (530,40) width 191: "the right padding easier to see." RenderBlock {P} at (0,275) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (55,0) size 734x59 - text run at (55,0) width 590: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " - text run at (645,0) width 99: "Both the content" - text run at (10,20) width 342: "background and the padding should be aqua (light blue). " - text run at (352,20) width 392: "The text has been right-aligned in order to make the right padding" - text run at (665,40) width 79: "easier to see." + RenderText {#text} at (15,0) size 729x59 + text run at (15,0) width 625: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " + text run at (640,0) width 104: "Both the content" + text run at (26,20) width 360: "background and the padding should be aqua (light blue). " + text run at (386,20) width 358: "The text has been right-aligned in order to make the right" + text run at (609,40) width 135: "padding easier to see." RenderBlock {P} at (0,351) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (24,0) size 682x59 - text run at (24,0) width 566: "This element should have a right padding of 5 em, which will require extra text in order to test. " - text run at (590,0) width 99: "Both the content" - text run at (7,20) width 342: "background and the padding should be aqua (light blue). " - text run at (349,20) width 340: "The text has been right-aligned in order to make the right" - text run at (558,40) width 131: "padding easier to see." + RenderText {#text} at (36,0) size 674x59 + text run at (36,0) width 599: "This element should have a right padding of 5 em, which will require extra text in order to test. " + text run at (635,0) width 54: "Both the" + text run at (15,20) width 410: "content background and the padding should be aqua (light blue). " + text run at (425,20) width 264: "The text has been right-aligned in order to" + text run at (460,40) width 229: "make the right padding easier to see." RenderBlock {P} at (0,427) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (12,0) size 576x59 - text run at (12,0) width 565: "This element should have a right padding of 25%, which is calculated with respect to the width" - text run at (1,20) width 135: "of the parent element. " - text run at (135,20) width 442: "Both the content background and the padding should be aqua (light blue)." - text run at (101,40) width 476: "The text has been right-aligned in order to make the right padding easier to see." - RenderBlock {UL} at (0,503) size 769x40 [bgcolor=#808080] - RenderListItem {LI} at (40,0) size 704x20 + RenderText {#text} at (19,0) size 575x59 + text run at (19,0) width 558: "This element should have a right padding of 25%, which is calculated with respect to the" + text run at (9,20) width 181: "width of the parent element. " + text run at (189,20) width 388: "Both the content background and the padding should be aqua" + text run at (2,40) width 78: "(light blue). " + text run at (79,40) width 498: "The text has been right-aligned in order to make the right padding easier to see." + RenderBlock {UL} at (0,503) size 769x80 [bgcolor=#808080] + RenderListItem {LI} at (40,0) size 704x40 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (13,0) size 691x19 - text run at (13,0) width 691: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order to test." - RenderListItem {LI} at (40,20) size 704x20 [bgcolor=#FFFFFF] + RenderText {#text} at (7,0) size 697x39 + text run at (7,0) width 697: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order to" + text run at (679,20) width 25: "test." + RenderListItem {LI} at (40,40) size 704x40 [bgcolor=#FFFFFF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (5,0) size 674x19 - text run at (5,0) width 674: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL element." - RenderBlock {P} at (0,559) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (6,0) size 763x59 - text run at (6,0) width 540: "This element should have no right padding, since negative padding values are not allowed. " - text run at (546,0) width 223: "Both the content background and the" - text run at (14,20) width 263: "normal padding should be aqua (light blue). " - text run at (277,20) width 492: "The text has been right-aligned in order to make the lack of right padding easier to" - text run at (745,40) width 24: "see." - RenderTable {TABLE} at (0,635) size 769x534 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x532 + RenderText {#text} at (20,0) size 659x39 + text run at (20,0) width 659: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL" + text run at (626,20) width 53: "element." + RenderBlock {P} at (0,599) size 769x60 [bgcolor=#00FFFF] + RenderText {#text} at (12,0) size 757x59 + text run at (12,0) width 574: "This element should have no right padding, since negative padding values are not allowed. " + text run at (586,0) width 183: "Both the content background" + text run at (35,20) width 329: "and the normal padding should be aqua (light blue). " + text run at (364,20) width 405: "The text has been right-aligned in order to make the lack of right" + text run at (634,40) width 135: "padding easier to see." + RenderTable {TABLE} at (0,675) size 769x554 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x552 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x504 - RenderTableCell {TD} at (0,266) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x524 + RenderTableCell {TD} at (0,276) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x504 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x524 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,40) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (45,0) size 678x59 - text run at (45,0) width 603: "This element should have a right padding of half an inch, which will require extra text in order to test. " - text run at (648,0) width 51: "Both the" - text run at (21,20) width 390: "content background and the padding should be aqua (light blue). " - text run at (411,20) width 288: "The text has been right-aligned in order to make" - text run at (516,40) width 183: "the right padding easier to see." + RenderText {#text} at (3,0) size 696x59 + text run at (3,0) width 642: "This element should have a right padding of half an inch, which will require extra text in order to test. " + text run at (645,0) width 54: "Both the" + text run at (25,20) width 410: "content background and the padding should be aqua (light blue). " + text run at (435,20) width 264: "The text has been right-aligned in order to" + text run at (470,40) width 229: "make the right padding easier to see." RenderBlock {P} at (4,116) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (33,0) size 689x59 - text run at (33,0) width 590: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " - text run at (623,0) width 99: "Both the content" - text run at (40,20) width 342: "background and the padding should be aqua (light blue). " - text run at (382,20) width 340: "The text has been right-aligned in order to make the right" - text run at (591,40) width 131: "padding easier to see." + RenderText {#text} at (43,0) size 712x59 + text run at (43,0) width 625: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " + text run at (668,0) width 54: "Both the" + text run at (10,20) width 410: "content background and the padding should be aqua (light blue). " + text run at (420,20) width 302: "The text has been right-aligned in order to make" + text run at (531,40) width 191: "the right padding easier to see." RenderBlock {P} at (4,192) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (2,0) size 665x59 - text run at (2,0) width 566: "This element should have a right padding of 5 em, which will require extra text in order to test. " - text run at (568,0) width 99: "Both the content" - text run at (15,20) width 342: "background and the padding should be aqua (light blue). " - text run at (357,20) width 310: "The text has been right-aligned in order to make the" - text run at (506,40) width 161: "right padding easier to see." - RenderBlock {P} at (4,268) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (33,0) size 547x59 - text run at (33,0) width 528: "This element should have a right padding of 25%, which is calculated with respect to the" - text run at (19,20) width 172: "width of the parent element. " - text run at (190,20) width 371: "Both the content background and the padding should be aqua" - text run at (14,40) width 72: "(light blue). " - text run at (85,40) width 476: "The text has been right-aligned in order to make the right padding easier to see." - RenderBlock {UL} at (4,344) size 747x80 [bgcolor=#808080] + RenderText {#text} at (14,0) size 658x59 + text run at (14,0) width 599: "This element should have a right padding of 5 em, which will require extra text in order to test. " + text run at (613,0) width 54: "Both the" + text run at (9,20) width 410: "content background and the padding should be aqua (light blue). " + text run at (419,20) width 248: "The text has been right-aligned in order" + text run at (422,40) width 245: "to make the right padding easier to see." + RenderBlock {P} at (4,268) size 747x80 [bgcolor=#00FFFF] + RenderText {#text} at (3,0) size 558x79 + text run at (3,0) width 558: "This element should have a right padding of 25%, which is calculated with respect to the" + text run at (27,20) width 181: "width of the parent element. " + text run at (207,20) width 354: "Both the content background and the padding should be" + text run at (36,40) width 112: "aqua (light blue). " + text run at (147,40) width 414: "The text has been right-aligned in order to make the right padding" + text run at (480,60) width 81: "easier to see." + RenderBlock {UL} at (4,364) size 747x80 [bgcolor=#808080] RenderListItem {LI} at (40,0) size 682x40 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (20,0) size 662x39 - text run at (20,0) width 662: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order to" - text run at (657,20) width 25: "test." + RenderText {#text} at (1,0) size 681x39 + text run at (1,0) width 681: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order" + text run at (641,20) width 41: "to test." RenderListItem {LI} at (40,40) size 682x40 [bgcolor=#FFFFFF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (37,0) size 620x39 - text run at (37,0) width 620: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL" - text run at (607,20) width 50: "element." - RenderBlock {P} at (4,440) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (6,0) size 741x59 - text run at (6,0) width 540: "This element should have no right padding, since negative padding values are not allowed. " - text run at (546,0) width 201: "Both the content background and" - text run at (25,20) width 285: "the normal padding should be aqua (light blue). " - text run at (310,20) width 437: "The text has been right-aligned in order to make the lack of right padding" - text run at (668,40) width 79: "easier to see." + RenderText {#text} at (23,0) size 634x39 + text run at (23,0) width 634: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the" + text run at (579,20) width 78: "UL element." + RenderBlock {P} at (4,460) size 747x60 [bgcolor=#00FFFF] + RenderText {#text} at (69,0) size 733x59 + text run at (69,0) width 574: "This element should have no right padding, since negative padding values are not allowed. " + text run at (643,0) width 104: "Both the content" + text run at (14,20) width 408: "background and the normal padding should be aqua (light blue). " + text run at (422,20) width 325: "The text has been right-aligned in order to make the" + text run at (532,40) width 215: "lack of right padding easier to see." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding_right_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding_right_inline-expected.txt index de87bbff553d..082683f25c05 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding_right_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding_right_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 568x48 text run at (0,0) width 560: ".one {padding-right: 25px; text-align: right; background-color: aqua;}" @@ -14,88 +14,91 @@ layer at (0,0) size 800x600 text run at (568,16) width 0: " " text run at (0,32) width 0: " " RenderBlock {P} at (0,115) size 784x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 182x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 192x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "one" - RenderText {#text} at (697,0) size 783x39 - text run at (697,0) width 86: ", which should" - text run at (0,20) width 447: "result in 25-pixel right padding (which should also be light blue) only in the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (447,20) size 24x19 - text run at (447,20) width 24: "last" - RenderText {#text} at (471,20) size 216x19 - text run at (471,20) width 216: " line in which the inline box appears." - RenderBlock {P} at (0,171) size 784x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "one" + RenderText {#text} at (734,0) size 781x39 + text run at (734,0) width 47: ", which" + text run at (0,20) width 525: "should result in 25-pixel right padding (which should also be light blue) only in the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (525,20) size 23x19 + text run at (525,20) width 23: "last" + RenderText {#text} at (548,20) size 232x19 + text run at (548,20) width 232: " line in which the inline box appears." + RenderBlock {P} at (0,171) size 784x60 [bgcolor=#808080] + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "two" - RenderText {#text} at (672,0) size 758x39 - text run at (672,0) width 86: ", which should" - text run at (0,20) width 472: "result in no right padding, since negative padding values are not allowed, in the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (472,20) size 24x19 - text run at (472,20) width 24: "last" - RenderText {#text} at (496,20) size 216x19 - text run at (496,20) width 216: " line in which the inline box appears." - RenderTable {TABLE} at (0,227) size 784x134 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x132 + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "two" + RenderText {#text} at (709,0) size 756x39 + text run at (709,0) width 47: ", which" + text run at (0,20) width 548: "should result in no right padding, since negative padding values are not allowed, in the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (548,20) size 23x19 + text run at (548,20) width 23: "last" + RenderText {#text} at (571,20) size 747x39 + text run at (571,20) width 176: " line in which the inline box" + text run at (0,40) width 52: "appears." + RenderTable {TABLE} at (0,247) size 784x174 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x172 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 782x104 - RenderTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 782x144 + RenderTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 762x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 182x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 762x60 [bgcolor=#808080] + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 192x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "one" - RenderText {#text} at (697,0) size 740x39 - text run at (697,0) width 43: ", which" - text run at (0,20) width 490: "should result in 25-pixel right padding (which should also be light blue) only in the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (490,20) size 24x19 - text run at (490,20) width 24: "last" - RenderText {#text} at (514,20) size 216x19 - text run at (514,20) width 216: " line in which the inline box appears." - RenderBlock {P} at (4,60) size 762x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 515x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 146: "However, it contains an " - RenderInline {SPAN} at (0,0) size 157x19 [bgcolor=#00FFFF] - RenderText {#text} at (515,0) size 133x19 - text run at (515,0) width 133: "inline element of class " + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "one" + RenderText {#text} at (734,0) size 738x39 + text run at (734,0) width 4: "," + text run at (0,20) width 568: "which should result in 25-pixel right padding (which should also be light blue) only in the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (568,20) size 23x19 + text run at (568,20) width 23: "last" + RenderText {#text} at (591,20) size 739x39 + text run at (591,20) width 148: " line in which the inline" + text run at (0,40) width 80: "box appears." + RenderBlock {P} at (4,80) size 762x60 [bgcolor=#808080] + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 154: "However, it contains an " + RenderInline {SPAN} at (0,0) size 167x19 [bgcolor=#00FFFF] + RenderText {#text} at (542,0) size 143x19 + text run at (542,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (648,3) size 24x16 - text run at (648,3) width 24: "two" - RenderText {#text} at (672,0) size 758x39 - text run at (672,0) width 86: ", which should" - text run at (0,20) width 472: "result in no right padding, since negative padding values are not allowed, in the " - RenderInline {STRONG} at (0,0) size 24x19 - RenderText {#text} at (472,20) size 24x19 - text run at (472,20) width 24: "last" - RenderText {#text} at (496,20) size 216x19 - text run at (496,20) width 216: " line in which the inline box appears." + RenderText {#text} at (685,3) size 24x16 + text run at (685,3) width 24: "two" + RenderText {#text} at (709,0) size 756x39 + text run at (709,0) width 47: ", which" + text run at (0,20) width 548: "should result in no right padding, since negative padding values are not allowed, in the " + RenderInline {STRONG} at (0,0) size 23x19 + RenderText {#text} at (548,20) size 23x19 + text run at (548,20) width 23: "last" + RenderText {#text} at (571,20) size 747x39 + text run at (571,20) width 176: " line in which the inline box" + text run at (0,40) width 52: "appears." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding_top-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding_top-expected.txt index e2ca3c142895..68ea3a033e3b 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding_top-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding_top-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1518 RenderBlock {HTML} at (0,0) size 785x1518 RenderBody {BODY} at (8,8) size 769x1502 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 408x96 text run at (0,0) width 392: ".zero {background-color: silver; padding-top: 0;}" @@ -21,74 +21,73 @@ layer at (0,0) size 785x1518 text run at (0,80) width 408: ".five {padding-top: -20px; background-color: aqua;}" text run at (408,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (0,199) size 769x88 [bgcolor=#00FFFF] - RenderText {#text} at (0,48) size 696x39 - text run at (0,48) width 597: "This element should have a top padding of half an inch, which will require extra text in order to test. " - text run at (597,48) width 99: "Both the content" - text run at (0,68) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (0,48) size 737x39 + text run at (0,48) width 633: "This element should have a top padding of half an inch, which will require extra text in order to test. " + text run at (633,48) width 104: "Both the content" + text run at (0,68) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (0,303) size 769x65 [bgcolor=#00FFFF] - RenderText {#text} at (0,25) size 759x39 - text run at (0,25) width 584: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " - text run at (584,25) width 175: "Both the content background" - text run at (0,45) width 262: "and the padding should be aqua (light blue)." + RenderText {#text} at (0,25) size 720x39 + text run at (0,25) width 616: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " + text run at (616,25) width 104: "Both the content" + text run at (0,45) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (0,384) size 769x120 [bgcolor=#00FFFF] - RenderText {#text} at (0,80) size 761x39 - text run at (0,80) width 560: "This element should have a top padding of 5 em, which will require extra text in order to test. " - text run at (560,80) width 201: "Both the content background and" - text run at (0,100) width 236: "the padding should be aqua (light blue)." + RenderText {#text} at (0,80) size 694x39 + text run at (0,80) width 590: "This element should have a top padding of 5 em, which will require extra text in order to test. " + text run at (590,80) width 104: "Both the content" + text run at (0,100) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (0,520) size 769x233 [bgcolor=#00FFFF] - RenderText {#text} at (0,192) size 747x40 - text run at (0,192) width 696: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element. " - text run at (696,192) width 51: "Both the" - text run at (0,212) width 390: "content background and the padding should be aqua (light blue). " - text run at (390,212) width 251: "This will require extra text in order to test." + RenderText {#text} at (0,192) size 763x40 + text run at (0,192) width 732: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element. " + text run at (732,192) width 31: "Both" + text run at (0,212) width 433: "the content background and the padding should be aqua (light blue). " + text run at (433,212) width 264: "This will require extra text in order to test." RenderBlock {P} at (0,768) size 769x41 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 757x39 - text run at (0,0) width 534: "This element should have no top padding, since negative padding values are not allowed. " - text run at (534,0) width 223: "Both the content background and the" - text run at (0,20) width 259: "normal padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 748x39 + text run at (0,0) width 565: "This element should have no top padding, since negative padding values are not allowed. " + text run at (565,0) width 183: "Both the content background" + text run at (0,20) width 325: "and the normal padding should be aqua (light blue)." RenderTable {TABLE} at (0,824) size 769x678 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x676 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x648 RenderTableCell {TD} at (0,337) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x648 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - RenderText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This element has a class of zero." RenderBlock {P} at (4,40) size 747x88 [bgcolor=#00FFFF] - RenderText {#text} at (0,48) size 696x39 - text run at (0,48) width 597: "This element should have a top padding of half an inch, which will require extra text in order to test. " - text run at (597,48) width 99: "Both the content" - text run at (0,68) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (0,48) size 737x39 + text run at (0,48) width 633: "This element should have a top padding of half an inch, which will require extra text in order to test. " + text run at (633,48) width 104: "Both the content" + text run at (0,68) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (4,144) size 747x65 [bgcolor=#00FFFF] - RenderText {#text} at (0,25) size 683x39 - text run at (0,25) width 584: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " - text run at (584,25) width 99: "Both the content" - text run at (0,45) width 338: "background and the padding should be aqua (light blue)." + RenderText {#text} at (0,25) size 720x39 + text run at (0,25) width 616: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " + text run at (616,25) width 104: "Both the content" + text run at (0,45) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (4,225) size 747x120 [bgcolor=#00FFFF] - RenderText {#text} at (0,80) size 735x39 - text run at (0,80) width 560: "This element should have a top padding of 5 em, which will require extra text in order to test. " - text run at (560,80) width 175: "Both the content background" - text run at (0,100) width 262: "and the padding should be aqua (light blue)." + RenderText {#text} at (0,80) size 694x39 + text run at (0,80) width 590: "This element should have a top padding of 5 em, which will require extra text in order to test. " + text run at (590,80) width 104: "Both the content" + text run at (0,100) width 356: "background and the padding should be aqua (light blue)." RenderBlock {P} at (4,361) size 747x227 [bgcolor=#00FFFF] - RenderText {#text} at (0,186) size 747x40 - text run at (0,186) width 696: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element. " - text run at (696,186) width 51: "Both the" - text run at (0,206) width 390: "content background and the padding should be aqua (light blue). " - text run at (390,206) width 251: "This will require extra text in order to test." + RenderText {#text} at (0,186) size 732x40 + text run at (0,186) width 728: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element." + text run at (0,206) width 468: "Both the content background and the padding should be aqua (light blue). " + text run at (468,206) width 264: "This will require extra text in order to test." RenderBlock {P} at (4,603) size 747x41 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 735x39 - text run at (0,0) width 534: "This element should have no top padding, since negative padding values are not allowed. " - text run at (534,0) width 201: "Both the content background and" - text run at (0,20) width 281: "the normal padding should be aqua (light blue)." + RenderText {#text} at (0,0) size 669x39 + text run at (0,0) width 565: "This element should have no top padding, since negative padding values are not allowed. " + text run at (565,0) width 104: "Both the content" + text run at (0,20) width 404: "background and the normal padding should be aqua (light blue)." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/padding_top_inline-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/padding_top_inline-expected.txt index 97f6dda60337..74d9ed5a03dd 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/padding_top_inline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/padding_top_inline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 400x48 text run at (0,0) width 392: ".one {padding-top: 25px; background-color: aqua;}" @@ -14,88 +14,88 @@ layer at (0,0) size 800x600 text run at (400,16) width 0: " " text run at (0,32) width 0: " " RenderBlock {P} at (0,115) size 784x80 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x64 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x64 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "one" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 220: "background and a 25px top padding" - RenderText {#text} at (220,20) size 783x59 - text run at (220,20) width 8: ". " - text run at (228,20) width 546: "Padding on inline elements does not affect line-height calculations, so all lines in this element" - text run at (0,40) width 201: "should have the same line-height. " - text run at (201,40) width 582: "There may be implementation-specific limits on how much of the padding the user agent is able to" - text run at (0,60) width 46: "display." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "one" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 228: "background and a 25px top padding" + RenderText {#text} at (228,20) size 767x59 + text run at (228,20) width 8: ". " + text run at (236,20) width 531: "Padding on inline elements does not affect line-height calculations, so all lines in this" + text run at (0,40) width 267: "element should have the same line-height. " + text run at (267,40) width 488: "There may be implementation-specific limits on how much of the padding the" + text run at (0,60) width 176: "user agent is able to display." RenderBlock {P} at (0,211) size 784x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "two" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 474: "background and no top padding, since negative padding values are not allowed" - RenderText {#text} at (474,20) size 763x39 - text run at (474,20) width 8: ". " - text run at (482,20) width 281: "Padding on inline elements does not affect line-" - text run at (0,40) width 466: "height calculations, so all lines in this element should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "two" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 498: "background and no top padding, since negative padding values are not allowed" + RenderText {#text} at (498,20) size 772x39 + text run at (498,20) width 8: ". " + text run at (506,20) width 266: "Padding on inline elements does not affect" + text run at (0,40) width 528: "line-height calculations, so all lines in this element should have the same line-height." RenderTable {TABLE} at (0,287) size 784x194 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x192 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x164 RenderTableCell {TD} at (0,96) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x80 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x64 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x64 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "one" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 220: "background and a 25px top padding" - RenderText {#text} at (220,20) size 739x59 - text run at (220,20) width 8: ". " - text run at (228,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 488: "There may be implementation-specific limits on how much of the padding the user" - text run at (0,60) width 140: "agent is able to display." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "one" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 228: "background and a 25px top padding" + RenderText {#text} at (228,20) size 758x59 + text run at (228,20) width 8: ". " + text run at (236,20) width 505: "Padding on inline elements does not affect line-height calculations, so all lines in" + text run at (0,40) width 293: "this element should have the same line-height. " + text run at (293,40) width 465: "There may be implementation-specific limits on how much of the padding" + text run at (0,60) width 199: "the user agent is able to display." RenderBlock {P} at (4,100) size 762x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 453x19 - text run at (0,0) width 369: "This element is unstyled save for a background color of gray. " - text run at (369,0) width 84: "It contains an " - RenderInline {SPAN} at (0,0) size 714x39 [bgcolor=#00FFFF] - RenderText {#text} at (453,0) size 133x19 - text run at (453,0) width 133: "inline element of class " + RenderText {#text} at (0,0) size 476x19 + text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " + text run at (388,0) width 88: "It contains an " + RenderInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] + RenderText {#text} at (476,0) size 143x19 + text run at (476,0) width 143: "inline element of class " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (586,3) size 24x16 - text run at (586,3) width 24: "two" - RenderText {#text} at (610,0) size 714x39 - text run at (610,0) width 104: ", giving it an aqua" - text run at (0,20) width 474: "background and no top padding, since negative padding values are not allowed" - RenderText {#text} at (474,20) size 733x39 - text run at (474,20) width 8: ". " - text run at (482,20) width 251: "Padding on inline elements does not affect" - text run at (0,40) width 492: "line-height calculations, so all lines in this element should have the same line-height." + RenderText {#text} at (619,3) size 24x16 + text run at (619,3) width 24: "two" + RenderText {#text} at (643,0) size 756x39 + text run at (643,0) width 113: ", giving it an aqua" + text run at (0,20) width 498: "background and no top padding, since negative padding values are not allowed" + RenderText {#text} at (498,20) size 733x39 + text run at (498,20) width 8: ". " + text run at (506,20) width 227: "Padding on inline elements does not" + text run at (0,40) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/box_properties/width-expected.txt b/LayoutTests/platform/wincairo/css1/box_properties/width-expected.txt index 50b11c1d8730..9cb83d13025e 100644 --- a/LayoutTests/platform/wincairo/css1/box_properties/width-expected.txt +++ b/LayoutTests/platform/wincairo/css1/box_properties/width-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1391 RenderBlock {HTML} at (0,0) size 785x1391 RenderBody {BODY} at (8,8) size 769x1375 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x48 RenderText {#text} at (0,0) size 152x48 text run at (0,0) width 152: ".one {width: 50px;}" @@ -18,34 +18,34 @@ layer at (0,0) size 785x1391 RenderImage {IMG} at (0,0) size 50x50 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,173) size 769x20 - RenderText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "The square above should be fifty pixels wide." + RenderText {#text} at (0,0) size 287x19 + text run at (0,0) width 287: "The square above should be fifty pixels wide." RenderBlock (anonymous) at (0,209) size 769x385 RenderImage {IMG} at (0,0) size 385x385 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,610) size 769x20 - RenderText {#text} at (0,0) size 641x19 - text run at (0,0) width 641: "The square above should be half as wide as the image's parent element (either the BODY or the table cell)." + RenderText {#text} at (0,0) size 670x19 + text run at (0,0) width 670: "The square above should be half as wide as the image's parent element (either the BODY or the table cell)." RenderBlock {P} at (0,646) size 385x100 - RenderText {#text} at (0,0) size 361x79 - text run at (0,0) width 361: "This paragraph should be half the width of its parent element" - text run at (0,20) width 358: "(either the BODY or the table, which should itself be half as" - text run at (0,40) width 179: "wide as the BODY element). " - text run at (179,40) width 168: "This is extra text included to" - text run at (0,60) width 233: "ensure that this will be a fair test of the " + RenderText {#text} at (0,0) size 382x79 + text run at (0,0) width 382: "This paragraph should be half the width of its parent element" + text run at (0,20) width 378: "(either the BODY or the table, which should itself be half as" + text run at (0,40) width 187: "wide as the BODY element). " + text run at (187,40) width 178: "This is extra text included to" + text run at (0,60) width 246: "ensure that this will be a fair test of the " RenderInline {CODE} at (0,0) size 40x16 - RenderText {#text} at (233,63) size 40x16 - text run at (233,63) width 40: "width" - RenderText {#text} at (273,60) size 377x39 - text run at (273,60) width 104: " property without" - text run at (0,80) width 304: "the need for the user to resize the viewing window." + RenderText {#text} at (246,63) size 40x16 + text run at (246,63) width 40: "width" + RenderText {#text} at (286,60) size 373x39 + text run at (286,60) width 57: " property" + text run at (0,80) width 373: "without the need for the user to resize the viewing window." RenderTable {TABLE} at (0,762) size 385x613 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 383x611 RenderTableRow {TR} at (0,0) size 383x28 RenderTableCell {TD} at (0,0) size 383x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 383x583 RenderTableCell {TD} at (0,305) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 @@ -55,32 +55,33 @@ layer at (0,0) size 785x1391 RenderImage {IMG} at (0,0) size 50x50 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,70) size 363x20 - RenderText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "The square above should be fifty pixels wide." + RenderText {#text} at (0,0) size 287x19 + text run at (0,0) width 287: "The square above should be fifty pixels wide." RenderBlock (anonymous) at (4,106) size 363x181 RenderImage {IMG} at (0,0) size 182x182 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,303) size 363x40 - RenderText {#text} at (0,0) size 332x39 - text run at (0,0) width 332: "The square above should be half as wide as the image's" - text run at (0,20) width 305: "parent element (either the BODY or the table cell)." + RenderText {#text} at (0,0) size 348x39 + text run at (0,0) width 348: "The square above should be half as wide as the image's" + text run at (0,20) width 318: "parent element (either the BODY or the table cell)." RenderBlock {P} at (4,359) size 182x220 - RenderText {#text} at (0,0) size 180x159 - text run at (0,0) width 177: "This paragraph should be half" - text run at (0,20) width 180: "the width of its parent element" - text run at (0,40) width 147: "(either the BODY or the" - text run at (0,60) width 165: "table, which should itself be" - text run at (0,80) width 158: "half as wide as the BODY" - text run at (0,100) width 59: "element). " - text run at (59,100) width 98: "This is extra text" - text run at (0,120) width 159: "included to ensure that this" - text run at (0,140) width 140: "will be a fair test of the " + RenderText {#text} at (0,0) size 177x179 + text run at (0,0) width 160: "This paragraph should be" + text run at (0,20) width 165: "half the width of its parent" + text run at (0,40) width 166: "element (either the BODY" + text run at (0,60) width 163: "or the table, which should" + text run at (0,80) width 169: "itself be half as wide as the" + text run at (0,100) width 112: "BODY element). " + text run at (112,100) width 42: "This is" + text run at (0,120) width 177: "extra text included to ensure" + text run at (0,140) width 174: "that this will be a fair test of" + text run at (0,160) width 23: "the " RenderInline {CODE} at (0,0) size 40x16 - RenderText {#text} at (140,143) size 40x16 - text run at (140,143) width 40: "width" - RenderText {#text} at (0,160) size 176x59 - text run at (0,160) width 176: "property without the need for" - text run at (0,180) width 172: "the user to resize the viewing" - text run at (0,200) width 52: "window." + RenderText {#text} at (23,163) size 40x16 + text run at (23,163) width 40: "width" + RenderText {#text} at (63,160) size 173x59 + text run at (63,160) width 109: " property without" + text run at (0,180) width 144: "the need for the user to" + text run at (0,200) width 173: "resize the viewing window." layer at (8,105) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/cascade/cascade_order-expected.txt b/LayoutTests/platform/wincairo/css1/cascade/cascade_order-expected.txt index 8b75aafeacb7..b41eb9748437 100644 --- a/LayoutTests/platform/wincairo/css1/cascade/cascade_order-expected.txt +++ b/LayoutTests/platform/wincairo/css1/cascade/cascade_order-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x849 RenderBlock {HTML} at (0,0) size 785x849 RenderBody {BODY} at (8,8) size 769x833 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x176 RenderText {#text} at (0,0) size 576x176 text run at (0,0) width 576: "" @@ -32,112 +32,112 @@ layer at (0,0) size 785x849 RenderBlock {UL} at (0,243) size 769x160 RenderListItem {LI} at (40,0) size 729x20 [color=#0000FF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 177x19 - text run at (0,0) width 177: "This list item should be blue..." + RenderText {#text} at (0,0) size 189x19 + text run at (0,0) width 189: "This list item should be blue..." RenderListItem {LI} at (40,20) size 729x80 [color=#0000FF] RenderBlock (anonymous) at (0,0) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "...and so should this; neither should be purple." + RenderText {#text} at (0,0) size 289x19 + text run at (0,0) width 289: "...and so should this; neither should be purple." RenderBlock {UL} at (0,20) size 729x60 RenderListItem {LI} at (40,0) size 689x20 [color=#808080] RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 178x19 - text run at (0,0) width 178: "This list item should be gray..." + RenderText {#text} at (0,0) size 189x19 + text run at (0,0) width 189: "This list item should be gray..." RenderListItem {LI} at (40,20) size 689x20 [color=#808080] RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...as should this...." + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...as should this...." RenderListItem {LI} at (40,40) size 689x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "...but this one should be green." + RenderText {#text} at (0,0) size 193x19 + text run at (0,0) width 193: "...but this one should be green." RenderListItem {LI} at (40,100) size 729x20 [color=#660000] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "This ought to be dark red..." + RenderText {#text} at (0,0) size 171x19 + text run at (0,0) width 171: "This ought to be dark red..." RenderListItem {LI} at (40,120) size 729x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 81x19 - text run at (0,0) width 81: "...this green..." + RenderText {#text} at (0,0) size 85x19 + text run at (0,0) width 85: "...this green..." RenderListItem {LI} at (40,140) size 729x20 [color=#0000FF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 91x19 - text run at (0,0) width 91: "...and this blue." + RenderText {#text} at (0,0) size 96x19 + text run at (0,0) width 96: "...and this blue." RenderBlock {P} at (0,419) size 769x20 [color=#0000FF] - RenderText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This sentence should be blue (STYLE attr.)." + RenderText {#text} at (0,0) size 278x19 + text run at (0,0) width 278: "This sentence should be blue (STYLE attr.)." RenderBlock {P} at (0,455) size 769x20 [color=#800080] - RenderText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be purple [" + RenderText {#text} at (0,0) size 204x19 + text run at (0,0) width 204: "This sentence should be purple [" RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (194,3) size 96x16 - text run at (194,3) width 96: "class=\"test\"" - RenderText {#text} at (290,0) size 9x19 - text run at (290,0) width 9: "]." + RenderText {#text} at (204,3) size 96x16 + text run at (204,3) width 96: "class=\"test\"" + RenderText {#text} at (300,0) size 9x19 + text run at (300,0) width 9: "]." RenderBlock {P} at (0,491) size 769x20 - RenderText {#text} at (0,0) size 652x19 - text run at (0,0) width 652: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." - RenderTable {TABLE} at (0,527) size 674x306 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 672x304 - RenderTableRow {TR} at (0,0) size 672x28 - RenderTableCell {TD} at (0,0) size 672x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 672x276 + RenderText {#text} at (0,0) size 683x19 + text run at (0,0) width 683: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." + RenderTable {TABLE} at (0,527) size 705x306 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 703x304 + RenderTableRow {TR} at (0,0) size 703x28 + RenderTableCell {TD} at (0,0) size 703x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 703x276 RenderTableCell {TD} at (0,152) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 660x276 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {UL} at (4,4) size 652x160 - RenderListItem {LI} at (40,0) size 612x20 [color=#0000FF] + RenderTableCell {TD} at (12,28) size 691x276 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {UL} at (4,4) size 683x160 + RenderListItem {LI} at (40,0) size 643x20 [color=#0000FF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 177x19 - text run at (0,0) width 177: "This list item should be blue..." - RenderListItem {LI} at (40,20) size 612x80 [color=#0000FF] - RenderBlock (anonymous) at (0,0) size 612x20 + RenderText {#text} at (0,0) size 189x19 + text run at (0,0) width 189: "This list item should be blue..." + RenderListItem {LI} at (40,20) size 643x80 [color=#0000FF] + RenderBlock (anonymous) at (0,0) size 643x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "...and so should this; neither should be purple." - RenderBlock {UL} at (0,20) size 612x60 - RenderListItem {LI} at (40,0) size 572x20 [color=#808080] + RenderText {#text} at (0,0) size 289x19 + text run at (0,0) width 289: "...and so should this; neither should be purple." + RenderBlock {UL} at (0,20) size 643x60 + RenderListItem {LI} at (40,0) size 603x20 [color=#808080] RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 178x19 - text run at (0,0) width 178: "This list item should be gray..." - RenderListItem {LI} at (40,20) size 572x20 [color=#808080] + RenderText {#text} at (0,0) size 189x19 + text run at (0,0) width 189: "This list item should be gray..." + RenderListItem {LI} at (40,20) size 603x20 [color=#808080] RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...as should this...." - RenderListItem {LI} at (40,40) size 572x20 [color=#008000] + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...as should this...." + RenderListItem {LI} at (40,40) size 603x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "...but this one should be green." - RenderListItem {LI} at (40,100) size 612x20 [color=#660000] + RenderText {#text} at (0,0) size 193x19 + text run at (0,0) width 193: "...but this one should be green." + RenderListItem {LI} at (40,100) size 643x20 [color=#660000] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "This ought to be dark red..." - RenderListItem {LI} at (40,120) size 612x20 [color=#008000] + RenderText {#text} at (0,0) size 171x19 + text run at (0,0) width 171: "This ought to be dark red..." + RenderListItem {LI} at (40,120) size 643x20 [color=#008000] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 81x19 - text run at (0,0) width 81: "...this green..." - RenderListItem {LI} at (40,140) size 612x20 [color=#0000FF] + RenderText {#text} at (0,0) size 85x19 + text run at (0,0) width 85: "...this green..." + RenderListItem {LI} at (40,140) size 643x20 [color=#0000FF] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 91x19 - text run at (0,0) width 91: "...and this blue." - RenderBlock {P} at (4,180) size 652x20 [color=#0000FF] - RenderText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This sentence should be blue (STYLE attr.)." - RenderBlock {P} at (4,216) size 652x20 [color=#800080] - RenderText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be purple [" + RenderText {#text} at (0,0) size 96x19 + text run at (0,0) width 96: "...and this blue." + RenderBlock {P} at (4,180) size 683x20 [color=#0000FF] + RenderText {#text} at (0,0) size 278x19 + text run at (0,0) width 278: "This sentence should be blue (STYLE attr.)." + RenderBlock {P} at (4,216) size 683x20 [color=#800080] + RenderText {#text} at (0,0) size 204x19 + text run at (0,0) width 204: "This sentence should be purple [" RenderInline {CODE} at (0,0) size 96x16 - RenderText {#text} at (194,3) size 96x16 - text run at (194,3) width 96: "class=\"test\"" - RenderText {#text} at (290,0) size 9x19 - text run at (290,0) width 9: "]." - RenderBlock {P} at (4,252) size 652x20 - RenderText {#text} at (0,0) size 652x19 - text run at (0,0) width 652: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." + RenderText {#text} at (204,3) size 96x16 + text run at (204,3) width 96: "class=\"test\"" + RenderText {#text} at (300,0) size 9x19 + text run at (300,0) width 9: "]." + RenderBlock {P} at (4,252) size 683x20 + RenderText {#text} at (0,0) size 683x19 + text run at (0,0) width 683: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." layer at (8,233) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,225) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/cascade/important-expected.txt b/LayoutTests/platform/wincairo/css1/cascade/important-expected.txt index 7cbc20c0952e..37baa0f24275 100644 --- a/LayoutTests/platform/wincairo/css1/cascade/important-expected.txt +++ b/LayoutTests/platform/wincairo/css1/cascade/important-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x64 RenderText {#text} at (0,0) size 232x64 text run at (0,0) width 232: "P {color: green ! important;}" @@ -16,54 +16,54 @@ layer at (0,0) size 800x600 text run at (176,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 784x40 [color=#008000] - RenderText {#text} at (0,0) size 755x39 - text run at (0,0) width 755: "This sentence should be green, because the declaration marked important should override any other normal declaration for the" - text run at (0,20) width 315: "same element, even if it occurs later in the stylesheet." + RenderText {#text} at (0,0) size 767x39 + text run at (0,0) width 767: "This sentence should be green, because the declaration marked important should override any other normal declaration for" + text run at (0,20) width 355: "the same element, even if it occurs later in the stylesheet." RenderBlock {P} at (0,187) size 784x40 [color=#008000] - RenderText {#text} at (0,0) size 381x19 - text run at (0,0) width 381: "This sentence should also be green, even though it has an ID of " + RenderText {#text} at (0,0) size 403x19 + text run at (0,0) width 403: "This sentence should also be green, even though it has an ID of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (381,3) size 24x16 - text run at (381,3) width 24: "id1" - RenderText {#text} at (405,0) size 738x39 - text run at (405,0) width 242: ", which would ordinarily make it purple. " - text run at (647,0) width 91: "This is because" - text run at (0,20) width 611: "declarations marked important have more weight than normal declarations given in a STYLE attribute." + RenderText {#text} at (403,3) size 24x16 + text run at (403,3) width 24: "id1" + RenderText {#text} at (427,0) size 781x39 + text run at (427,0) width 258: ", which would ordinarily make it purple. " + text run at (685,0) width 96: "This is because" + text run at (0,20) width 645: "declarations marked important have more weight than normal declarations given in a STYLE attribute." RenderBlock {P} at (0,243) size 784x40 [color=#008000] - RenderText {#text} at (0,0) size 741x39 - text run at (0,0) width 574: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " - text run at (574,0) width 167: "This is because declarations" - text run at (0,20) width 535: "marked important have more weight than normal declarations given in a STYLE attribute." + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 604: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " + text run at (604,0) width 175: "This is because declarations" + text run at (0,20) width 566: "marked important have more weight than normal declarations given in a STYLE attribute." RenderTable {TABLE} at (0,299) size 784x190 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x188 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x160 RenderTableCell {TD} at (0,94) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x160 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x40 [color=#008000] - RenderText {#text} at (0,0) size 755x39 - text run at (0,0) width 755: "This sentence should be green, because the declaration marked important should override any other normal declaration for the" - text run at (0,20) width 315: "same element, even if it occurs later in the stylesheet." + RenderText {#text} at (0,0) size 745x39 + text run at (0,0) width 745: "This sentence should be green, because the declaration marked important should override any other normal declaration" + text run at (0,20) width 377: "for the same element, even if it occurs later in the stylesheet." RenderBlock {P} at (4,60) size 762x40 [color=#008000] - RenderText {#text} at (0,0) size 381x19 - text run at (0,0) width 381: "This sentence should also be green, even though it has an ID of " + RenderText {#text} at (0,0) size 403x19 + text run at (0,0) width 403: "This sentence should also be green, even though it has an ID of " RenderInline {TT} at (0,0) size 24x16 - RenderText {#text} at (381,3) size 24x16 - text run at (381,3) width 24: "id1" - RenderText {#text} at (405,0) size 738x39 - text run at (405,0) width 242: ", which would ordinarily make it purple. " - text run at (647,0) width 91: "This is because" - text run at (0,20) width 611: "declarations marked important have more weight than normal declarations given in a STYLE attribute." + RenderText {#text} at (403,3) size 24x16 + text run at (403,3) width 24: "id1" + RenderText {#text} at (427,0) size 727x39 + text run at (427,0) width 258: ", which would ordinarily make it purple. " + text run at (685,0) width 42: "This is" + text run at (0,20) width 699: "because declarations marked important have more weight than normal declarations given in a STYLE attribute." RenderBlock {P} at (4,116) size 762x40 [color=#008000] - RenderText {#text} at (0,0) size 741x39 - text run at (0,0) width 574: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " - text run at (574,0) width 167: "This is because declarations" - text run at (0,20) width 535: "marked important have more weight than normal declarations given in a STYLE attribute." + RenderText {#text} at (0,0) size 700x39 + text run at (0,0) width 604: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " + text run at (604,0) width 96: "This is because" + text run at (0,20) width 645: "declarations marked important have more weight than normal declarations given in a STYLE attribute." layer at (8,121) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/classification/display-expected.txt b/LayoutTests/platform/wincairo/css1/classification/display-expected.txt index 80c85682da5f..72be854feb59 100644 --- a/LayoutTests/platform/wincairo/css1/classification/display-expected.txt +++ b/LayoutTests/platform/wincairo/css1/classification/display-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x873 RenderBlock {HTML} at (0,0) size 785x873 RenderBody {BODY} at (8,8) size 769x857 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x80 RenderText {#text} at (0,0) size 568x80 text run at (0,0) width 176: ".one {display: block;}" @@ -19,113 +19,114 @@ layer at (0,0) size 785x873 text run at (0,64) width 152: "I {display: block;}" text run at (152,64) width 0: " " RenderBlock {P} at (0,147) size 769x20 - RenderText {#text} at (0,0) size 279x19 - text run at (0,0) width 279: "This sentence should be a block-level element." + RenderText {#text} at (0,0) size 293x19 + text run at (0,0) width 293: "This sentence should be a block-level element." RenderBlock (anonymous) at (0,183) size 769x60 - RenderInline {P} at (0,0) size 426x19 - RenderText {#text} at (0,0) size 426x19 - text run at (0,0) width 426: "This sentence should be part of an inline element, as are the next three. " - RenderInline {P} at (0,0) size 742x59 - RenderText {#text} at (426,0) size 742x59 - text run at (426,0) width 310: "This sentence and the next two are part of a second" - text run at (0,20) width 88: "inline element. " - text run at (88,20) width 654: "They should therefore appear, along with the sentence above, to be all one paragraph which is four sentences" - text run at (0,40) width 33: "long. " - text run at (33,40) width 239: "If this is not the case, then the keyword " + RenderInline {P} at (0,0) size 448x19 + RenderText {#text} at (0,0) size 448x19 + text run at (0,0) width 448: "This sentence should be part of an inline element, as are the next three. " + RenderInline {P} at (0,0) size 766x59 + RenderText {#text} at (448,0) size 766x59 + text run at (448,0) width 274: "This sentence and the next two are part of a" + text run at (0,20) width 144: "second inline element. " + text run at (144,20) width 622: "They should therefore appear, along with the sentence above, to be all one paragraph which is four" + text run at (0,40) width 100: "sentences long. " + text run at (100,40) width 250: "If this is not the case, then the keyword " RenderInline {CODE} at (0,0) size 48x16 - RenderText {#text} at (272,43) size 48x16 - text run at (272,43) width 48: "inline" - RenderText {#text} at (320,40) size 102x19 - text run at (320,40) width 102: " is being ignored." + RenderText {#text} at (350,43) size 48x16 + text run at (350,43) width 48: "inline" + RenderText {#text} at (398,40) size 109x19 + text run at (398,40) width 109: " is being ignored." RenderText {#text} at (0,0) size 0x0 RenderListItem {P} at (48,259) size 721x60 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 701x19 - text run at (0,0) width 701: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list items (if" + RenderText {#text} at (0,0) size 715x39 + text run at (0,0) width 715: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list items" + text run at (0,20) width 18: "(if " RenderInline {CODE} at (0,0) size 120x16 - RenderText {#text} at (0,23) size 120x16 - text run at (0,23) width 120: "list-style-type" - RenderText {#text} at (120,20) size 692x39 - text run at (120,20) width 346: " is supported, there will be a square for the item marker). " - text run at (466,20) width 226: "A 3em left margin has been applied in" - text run at (0,40) width 349: "order to ensure that there is space for the list-item marker." + RenderText {#text} at (18,23) size 120x16 + text run at (18,23) width 120: "list-style-type" + RenderText {#text} at (138,20) size 720x39 + text run at (138,20) width 359: " is supported, there will be a square for the item marker). " + text run at (497,20) width 223: "A 3em left margin has been applied" + text run at (0,40) width 375: "in order to ensure that there is space for the list-item marker." RenderBlock {P} at (0,335) size 769x20 - RenderText {#text} at (0,0) size 429x19 - text run at (0,0) width 429: "The next paragraph should be invisible (if it's visible, you'll see red text)." + RenderText {#text} at (0,0) size 456x19 + text run at (0,0) width 456: "The next paragraph should be invisible (if it's visible, you'll see red text)." RenderBlock {P} at (0,371) size 769x20 - RenderText {#text} at (0,0) size 235x19 - text run at (0,0) width 235: "There should be no text after the colon:" + RenderText {#text} at (0,0) size 247x19 + text run at (0,0) width 247: "There should be no text after the colon:" RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,407) size 769x60 RenderBlock (anonymous) at (0,0) size 769x20 - RenderText {#text} at (0,0) size 104x19 - text run at (0,0) width 104: "The italicized text" + RenderText {#text} at (0,0) size 112x19 + text run at (0,0) width 112: "The italicized text" RenderBlock {I} at (0,20) size 769x20 - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "in this paragraph" + RenderText {#text} at (0,0) size 110x19 + text run at (0,0) width 110: "in this paragraph" RenderBlock (anonymous) at (0,40) size 769x20 - RenderText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "should be a block-level element." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "should be a block-level element." RenderTable {TABLE} at (0,483) size 769x374 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x372 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x344 RenderTableCell {TD} at (0,186) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x344 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 279x19 - text run at (0,0) width 279: "This sentence should be a block-level element." + RenderText {#text} at (0,0) size 293x19 + text run at (0,0) width 293: "This sentence should be a block-level element." RenderBlock (anonymous) at (4,40) size 747x60 - RenderInline {P} at (0,0) size 426x19 - RenderText {#text} at (0,0) size 426x19 - text run at (0,0) width 426: "This sentence should be part of an inline element, as are the next three. " - RenderInline {P} at (0,0) size 742x59 - RenderText {#text} at (426,0) size 742x59 - text run at (426,0) width 310: "This sentence and the next two are part of a second" - text run at (0,20) width 88: "inline element. " - text run at (88,20) width 654: "They should therefore appear, along with the sentence above, to be all one paragraph which is four sentences" - text run at (0,40) width 33: "long. " - text run at (33,40) width 239: "If this is not the case, then the keyword " + RenderInline {P} at (0,0) size 448x19 + RenderText {#text} at (0,0) size 448x19 + text run at (0,0) width 448: "This sentence should be part of an inline element, as are the next three. " + RenderInline {P} at (0,0) size 736x59 + RenderText {#text} at (448,0) size 736x59 + text run at (448,0) width 274: "This sentence and the next two are part of a" + text run at (0,20) width 144: "second inline element. " + text run at (144,20) width 592: "They should therefore appear, along with the sentence above, to be all one paragraph which is" + text run at (0,40) width 130: "four sentences long. " + text run at (130,40) width 250: "If this is not the case, then the keyword " RenderInline {CODE} at (0,0) size 48x16 - RenderText {#text} at (272,43) size 48x16 - text run at (272,43) width 48: "inline" - RenderText {#text} at (320,40) size 102x19 - text run at (320,40) width 102: " is being ignored." + RenderText {#text} at (380,43) size 48x16 + text run at (380,43) width 48: "inline" + RenderText {#text} at (428,40) size 109x19 + text run at (428,40) width 109: " is being ignored." RenderText {#text} at (0,0) size 0x0 RenderListItem {P} at (52,116) size 699x60 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 685x39 - text run at (0,0) width 685: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list items" - text run at (0,20) width 16: "(if " + RenderText {#text} at (0,0) size 678x39 + text run at (0,0) width 678: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list" + text run at (0,20) width 55: "items (if " RenderInline {CODE} at (0,0) size 120x16 - RenderText {#text} at (16,23) size 120x16 - text run at (16,23) width 120: "list-style-type" - RenderText {#text} at (136,20) size 694x39 - text run at (136,20) width 346: " is supported, there will be a square for the item marker). " - text run at (482,20) width 212: "A 3em left margin has been applied" - text run at (0,40) width 363: "in order to ensure that there is space for the list-item marker." + RenderText {#text} at (55,23) size 120x16 + text run at (55,23) width 120: "list-style-type" + RenderText {#text} at (175,20) size 673x39 + text run at (175,20) width 359: " is supported, there will be a square for the item marker). " + text run at (534,20) width 139: "A 3em left margin has" + text run at (0,40) width 459: "been applied in order to ensure that there is space for the list-item marker." RenderBlock {P} at (4,192) size 747x20 - RenderText {#text} at (0,0) size 429x19 - text run at (0,0) width 429: "The next paragraph should be invisible (if it's visible, you'll see red text)." + RenderText {#text} at (0,0) size 456x19 + text run at (0,0) width 456: "The next paragraph should be invisible (if it's visible, you'll see red text)." RenderBlock {P} at (4,228) size 747x20 - RenderText {#text} at (0,0) size 235x19 - text run at (0,0) width 235: "There should be no text after the colon:" + RenderText {#text} at (0,0) size 247x19 + text run at (0,0) width 247: "There should be no text after the colon:" RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,264) size 747x60 RenderBlock (anonymous) at (0,0) size 747x20 - RenderText {#text} at (0,0) size 104x19 - text run at (0,0) width 104: "The italicized text" + RenderText {#text} at (0,0) size 112x19 + text run at (0,0) width 112: "The italicized text" RenderBlock {I} at (0,20) size 747x20 - RenderText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "in this paragraph" + RenderText {#text} at (0,0) size 110x19 + text run at (0,0) width 110: "in this paragraph" RenderBlock (anonymous) at (0,40) size 747x20 - RenderText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "should be a block-level element." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "should be a block-level element." layer at (8,137) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,129) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/classification/list_style-expected.txt b/LayoutTests/platform/wincairo/css1/classification/list_style-expected.txt index 2a67cfb05153..37ba17a54e7e 100644 --- a/LayoutTests/platform/wincairo/css1/classification/list_style-expected.txt +++ b/LayoutTests/platform/wincairo/css1/classification/list_style-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x32 RenderText {#text} at (0,0) size 496x32 text run at (0,0) width 304: ".one {list-style: upper-alpha inside;}" @@ -14,24 +14,24 @@ layer at (0,0) size 800x600 text run at (496,16) width 0: " " RenderBlock {UL} at (0,99) size 784x40 RenderListItem {LI} at (40,0) size 744x40 - RenderListMarker at (0,0) size 19x19: "A" - RenderText {#text} at (19,0) size 735x39 - text run at (19,0) width 716: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left margin, leaving" - text run at (0,20) width 228: "no blank space beneath the capital-A." + RenderListMarker at (0,0) size 20x19: "A" + RenderText {#text} at (20,0) size 730x39 + text run at (20,0) width 710: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left margin," + text run at (0,20) width 286: "leaving no blank space beneath the capital-A." RenderBlock {UL} at (0,155) size 784x40 RenderListItem {LI} at (40,0) size 744x40 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,0) size 737x39 - text run at (0,0) width 448: "The text in this item have an orange square for its bullet; failing that, a disc. " - text run at (448,0) width 289: "Also, the bullet should be outside the text block," - text run at (0,20) width 206: "as the list has been set to 'outside'." + RenderText {#text} at (0,0) size 736x39 + text run at (0,0) width 476: "The text in this item have an orange square for its bullet; failing that, a disc. " + text run at (476,0) width 260: "Also, the bullet should be outside the text" + text run at (0,20) width 256: "block, as the list has been set to 'outside'." RenderTable {TABLE} at (0,211) size 784x150 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x148 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x120 RenderTableCell {TD} at (0,74) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 @@ -39,16 +39,16 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (12,28) size 770x120 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {UL} at (4,4) size 762x40 RenderListItem {LI} at (40,0) size 722x40 - RenderListMarker at (0,0) size 19x19: "A" - RenderText {#text} at (19,0) size 690x39 - text run at (19,0) width 671: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left margin," - text run at (0,20) width 273: "leaving no blank space beneath the capital-A." + RenderListMarker at (0,0) size 20x19: "A" + RenderText {#text} at (20,0) size 678x39 + text run at (20,0) width 658: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left" + text run at (0,20) width 338: "margin, leaving no blank space beneath the capital-A." RenderBlock {UL} at (4,60) size 762x40 RenderListItem {LI} at (40,0) size 722x40 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,0) size 695x39 - text run at (0,0) width 448: "The text in this item have an orange square for its bullet; failing that, a disc. " - text run at (448,0) width 247: "Also, the bullet should be outside the text" - text run at (0,20) width 248: "block, as the list has been set to 'outside'." + RenderText {#text} at (0,0) size 709x39 + text run at (0,0) width 476: "The text in this item have an orange square for its bullet; failing that, a disc. " + text run at (476,0) width 233: "Also, the bullet should be outside the" + text run at (0,20) width 283: "text block, as the list has been set to 'outside'." layer at (8,89) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,81) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/classification/list_style_image-expected.txt b/LayoutTests/platform/wincairo/css1/classification/list_style_image-expected.txt index 5ab17fc14afd..c8388d49d05a 100644 --- a/LayoutTests/platform/wincairo/css1/classification/list_style_image-expected.txt +++ b/LayoutTests/platform/wincairo/css1/classification/list_style_image-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 440x48 text run at (0,0) width 440: ".one {list-style-image: url(../resources/oransqr.gif);}" @@ -16,66 +16,66 @@ layer at (0,0) size 800x600 RenderBlock {UL} at (0,115) size 784x60 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 744x20 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,0) size 139x19 - text run at (0,0) width 139: "...images for each item." + RenderText {#text} at (0,0) size 146x19 + text run at (0,0) width 146: "...images for each item." RenderBlock {UL} at (0,191) size 784x60 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 223x19 - text run at (0,0) width 223: "...standard list markers for each item." - RenderTable {TABLE} at (0,267) size 285x190 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 283x188 - RenderTableRow {TR} at (0,0) size 283x28 - RenderTableCell {TD} at (0,0) size 283x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 283x160 + RenderText {#text} at (0,0) size 231x19 + text run at (0,0) width 231: "...standard list markers for each item." + RenderTable {TABLE} at (0,267) size 293x190 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 291x188 + RenderTableRow {TR} at (0,0) size 291x28 + RenderTableCell {TD} at (0,0) size 291x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 291x160 RenderTableCell {TD} at (0,94) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 271x160 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {UL} at (4,4) size 263x60 - RenderListItem {LI} at (40,0) size 223x20 + RenderTableCell {TD} at (12,28) size 279x160 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {UL} at (4,4) size 271x60 + RenderListItem {LI} at (40,0) size 231x20 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 223x20 + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 231x20 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 223x20 + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 231x20 RenderListMarker at (-22,0) size 15x15 - RenderText {#text} at (0,0) size 139x19 - text run at (0,0) width 139: "...images for each item." - RenderBlock {UL} at (4,80) size 263x60 - RenderListItem {LI} at (40,0) size 223x20 + RenderText {#text} at (0,0) size 146x19 + text run at (0,0) width 146: "...images for each item." + RenderBlock {UL} at (4,80) size 271x60 + RenderListItem {LI} at (40,0) size 231x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 223x20 + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 231x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 223x20 + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 231x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 223x19 - text run at (0,0) width 223: "...standard list markers for each item." + RenderText {#text} at (0,0) size 231x19 + text run at (0,0) width 231: "...standard list markers for each item." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/classification/list_style_position-expected.txt b/LayoutTests/platform/wincairo/css1/classification/list_style_position-expected.txt index 63d26e20cb4b..1132915cf716 100644 --- a/LayoutTests/platform/wincairo/css1/classification/list_style_position-expected.txt +++ b/LayoutTests/platform/wincairo/css1/classification/list_style_position-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 288x48 text run at (0,0) width 288: ".one {list-style-position: outside;}" @@ -16,22 +16,22 @@ layer at (0,0) size 800x600 RenderBlock {UL} at (0,115) size 784x40 RenderListItem {LI} at (40,0) size 744x40 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 718x39 - text run at (0,0) width 718: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving blank space" - text run at (0,20) width 109: "beneath the bullet." + RenderText {#text} at (0,0) size 725x39 + text run at (0,0) width 725: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving blank" + text run at (0,20) width 154: "space beneath the bullet." RenderBlock {UL} at (0,171) size 784x40 RenderListItem {LI} at (40,0) size 744x40 RenderListMarker at (-1,0) size 7x19: bullet - RenderText {#text} at (15,0) size 726x39 - text run at (15,0) width 711: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin, leaving no" - text run at (0,20) width 185: "blank space beneath the bullet." + RenderText {#text} at (15,0) size 703x39 + text run at (15,0) width 688: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin," + text run at (0,20) width 263: "leaving no blank space beneath the bullet." RenderTable {TABLE} at (0,227) size 784x150 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x148 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x120 RenderTableCell {TD} at (0,74) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 @@ -40,14 +40,14 @@ layer at (0,0) size 800x600 RenderBlock {UL} at (4,4) size 762x40 RenderListItem {LI} at (40,0) size 722x40 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 718x39 - text run at (0,0) width 718: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving blank space" - text run at (0,20) width 109: "beneath the bullet." + RenderText {#text} at (0,0) size 686x39 + text run at (0,0) width 686: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving" + text run at (0,20) width 193: "blank space beneath the bullet." RenderBlock {UL} at (4,60) size 762x40 RenderListItem {LI} at (40,0) size 722x40 RenderListMarker at (-1,0) size 7x19: bullet - RenderText {#text} at (15,0) size 707x39 - text run at (15,0) width 692: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin, leaving" - text run at (0,20) width 204: "no blank space beneath the bullet." + RenderText {#text} at (15,0) size 703x39 + text run at (15,0) width 688: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin," + text run at (0,20) width 263: "leaving no blank space beneath the bullet." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/classification/list_style_type-expected.txt b/LayoutTests/platform/wincairo/css1/classification/list_style_type-expected.txt index a532bdb08adb..8a14779963d7 100644 --- a/LayoutTests/platform/wincairo/css1/classification/list_style_type-expected.txt +++ b/LayoutTests/platform/wincairo/css1/classification/list_style_type-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1649 RenderBlock {HTML} at (0,0) size 785x1649 RenderBody {BODY} at (8,8) size 769x1633 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x160 RenderText {#text} at (0,0) size 304x160 text run at (0,0) width 232: ".one {list-style-type: disc;}" @@ -30,242 +30,242 @@ layer at (0,0) size 785x1649 RenderBlock {UL} at (0,227) size 769x60 RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "...discs for each item." + RenderText {#text} at (0,0) size 133x19 + text run at (0,0) width 133: "...discs for each item." RenderBlock {UL} at (0,303) size 769x60 RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 729x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 729x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 136x19 - text run at (0,0) width 136: "...circles for each item." + RenderText {#text} at (0,0) size 142x19 + text run at (0,0) width 142: "...circles for each item." RenderBlock {UL} at (0,379) size 769x60 RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 729x20 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 729x20 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 144x19 - text run at (0,0) width 144: "...squares for each item." + RenderText {#text} at (0,0) size 149x19 + text run at (0,0) width 149: "...squares for each item." RenderBlock {OL} at (0,455) size 769x60 RenderListItem {LI} at (40,0) size 729x20 - RenderListMarker at (-16,0) size 11x19: "i" - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderListMarker at (-17,0) size 12x19: "i" + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 729x20 - RenderListMarker at (-19,0) size 14x19: "ii" - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderListMarker at (-21,0) size 16x19: "ii" + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 729x20 - RenderListMarker at (-22,0) size 17x19: "iii" - RenderText {#text} at (0,0) size 263x19 - text run at (0,0) width 263: "...lowercase Roman numerals for each item." + RenderListMarker at (-25,0) size 20x19: "iii" + RenderText {#text} at (0,0) size 276x19 + text run at (0,0) width 276: "...lowercase Roman numerals for each item." RenderBlock {OL} at (0,531) size 769x60 RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-18,0) size 13x19: "I" - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 729x20 RenderListMarker at (-23,0) size 18x19: "II" - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 729x20 RenderListMarker at (-28,0) size 23x19: "III" - RenderText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "...uppercase Roman numerals for each item." + RenderText {#text} at (0,0) size 276x19 + text run at (0,0) width 276: "...uppercase Roman numerals for each item." RenderBlock {OL} at (0,607) size 769x60 RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-20,0) size 15x19: "a" - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 729x20 RenderListMarker at (-21,0) size 16x19: "b" - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 729x20 RenderListMarker at (-20,0) size 15x19: "c" - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "...lowercase letters for each item." + RenderText {#text} at (0,0) size 206x19 + text run at (0,0) width 206: "...lowercase letters for each item." RenderBlock {OL} at (0,683) size 769x60 RenderListItem {LI} at (40,0) size 729x20 - RenderListMarker at (-24,0) size 19x19: "A" - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderListMarker at (-25,0) size 20x19: "A" + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 729x20 - RenderListMarker at (-23,0) size 18x19: "B" - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderListMarker at (-24,0) size 19x19: "B" + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 729x20 RenderListMarker at (-24,0) size 19x19: "C" - RenderText {#text} at (0,0) size 200x19 - text run at (0,0) width 200: "...uppercase letters for each item." + RenderText {#text} at (0,0) size 206x19 + text run at (0,0) width 206: "...uppercase letters for each item." RenderBlock {OL} at (0,759) size 769x60 RenderListItem {LI} at (40,0) size 729x20 - RenderListMarker at (-24,0) size 19x19: "A" - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "This list should feature..." + RenderListMarker at (-25,0) size 20x19: "A" + RenderText {#text} at (0,0) size 155x19 + text run at (0,0) width 155: "This list should feature..." RenderListItem {LI} at (40,20) size 729x20 - RenderListMarker at (-23,0) size 18x19: "B" - RenderText {#text} at (0,0) size 142x19 - text run at (0,0) width 142: "...letters for each item..." + RenderListMarker at (-24,0) size 19x19: "B" + RenderText {#text} at (0,0) size 147x19 + text run at (0,0) width 147: "...letters for each item..." RenderListItem {LI} at (40,40) size 729x20 RenderListMarker at (-21,0) size 16x19: "3" - RenderText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "...except this one." + RenderText {#text} at (0,0) size 110x19 + text run at (0,0) width 110: "...except this one." RenderBlock {UL} at (0,835) size 769x60 RenderListItem {LI} at (40,0) size 729x20 - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." RenderListItem {LI} at (40,20) size 729x20 - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." RenderListItem {LI} at (40,40) size 729x20 - RenderText {#text} at (0,0) size 141x19 - text run at (0,0) width 141: "...nothing for each item." - RenderTable {TABLE} at (0,911) size 326x722 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 324x720 - RenderTableRow {TR} at (0,0) size 324x28 - RenderTableCell {TD} at (0,0) size 324x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 324x692 + RenderText {#text} at (0,0) size 150x19 + text run at (0,0) width 150: "...nothing for each item." + RenderTable {TABLE} at (0,911) size 338x722 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 336x720 + RenderTableRow {TR} at (0,0) size 336x28 + RenderTableCell {TD} at (0,0) size 336x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 336x692 RenderTableCell {TD} at (0,360) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 312x692 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {UL} at (4,4) size 304x60 - RenderListItem {LI} at (40,0) size 264x20 + RenderTableCell {TD} at (12,28) size 324x692 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {UL} at (4,4) size 316x60 + RenderListItem {LI} at (40,0) size 276x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 264x20 + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 276x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 264x20 + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 276x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "...discs for each item." - RenderBlock {UL} at (4,80) size 304x60 - RenderListItem {LI} at (40,0) size 264x20 + RenderText {#text} at (0,0) size 133x19 + text run at (0,0) width 133: "...discs for each item." + RenderBlock {UL} at (4,80) size 316x60 + RenderListItem {LI} at (40,0) size 276x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 264x20 + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 276x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 264x20 + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 276x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 136x19 - text run at (0,0) width 136: "...circles for each item." - RenderBlock {UL} at (4,156) size 304x60 - RenderListItem {LI} at (40,0) size 264x20 + RenderText {#text} at (0,0) size 142x19 + text run at (0,0) width 142: "...circles for each item." + RenderBlock {UL} at (4,156) size 316x60 + RenderListItem {LI} at (40,0) size 276x20 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 264x20 + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 276x20 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 264x20 + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 276x20 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 144x19 - text run at (0,0) width 144: "...squares for each item." - RenderBlock {OL} at (4,232) size 304x60 - RenderListItem {LI} at (40,0) size 264x20 - RenderListMarker at (-16,0) size 11x19: "i" - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 264x20 - RenderListMarker at (-19,0) size 14x19: "ii" - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 264x20 - RenderListMarker at (-22,0) size 17x19: "iii" - RenderText {#text} at (0,0) size 263x19 - text run at (0,0) width 263: "...lowercase Roman numerals for each item." - RenderBlock {OL} at (4,308) size 304x60 - RenderListItem {LI} at (40,0) size 264x20 + RenderText {#text} at (0,0) size 149x19 + text run at (0,0) width 149: "...squares for each item." + RenderBlock {OL} at (4,232) size 316x60 + RenderListItem {LI} at (40,0) size 276x20 + RenderListMarker at (-17,0) size 12x19: "i" + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 276x20 + RenderListMarker at (-21,0) size 16x19: "ii" + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 276x20 + RenderListMarker at (-25,0) size 20x19: "iii" + RenderText {#text} at (0,0) size 276x19 + text run at (0,0) width 276: "...lowercase Roman numerals for each item." + RenderBlock {OL} at (4,308) size 316x60 + RenderListItem {LI} at (40,0) size 276x20 RenderListMarker at (-18,0) size 13x19: "I" - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 264x20 + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 276x20 RenderListMarker at (-23,0) size 18x19: "II" - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 264x20 + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 276x20 RenderListMarker at (-28,0) size 23x19: "III" - RenderText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "...uppercase Roman numerals for each item." - RenderBlock {OL} at (4,384) size 304x60 - RenderListItem {LI} at (40,0) size 264x20 + RenderText {#text} at (0,0) size 276x19 + text run at (0,0) width 276: "...uppercase Roman numerals for each item." + RenderBlock {OL} at (4,384) size 316x60 + RenderListItem {LI} at (40,0) size 276x20 RenderListMarker at (-20,0) size 15x19: "a" - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 264x20 + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 276x20 RenderListMarker at (-21,0) size 16x19: "b" - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 264x20 + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 276x20 RenderListMarker at (-20,0) size 15x19: "c" - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "...lowercase letters for each item." - RenderBlock {OL} at (4,460) size 304x60 - RenderListItem {LI} at (40,0) size 264x20 - RenderListMarker at (-24,0) size 19x19: "A" - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 264x20 - RenderListMarker at (-23,0) size 18x19: "B" - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 264x20 + RenderText {#text} at (0,0) size 206x19 + text run at (0,0) width 206: "...lowercase letters for each item." + RenderBlock {OL} at (4,460) size 316x60 + RenderListItem {LI} at (40,0) size 276x20 + RenderListMarker at (-25,0) size 20x19: "A" + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 276x20 + RenderListMarker at (-24,0) size 19x19: "B" + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 276x20 RenderListMarker at (-24,0) size 19x19: "C" - RenderText {#text} at (0,0) size 200x19 - text run at (0,0) width 200: "...uppercase letters for each item." - RenderBlock {OL} at (4,536) size 304x60 - RenderListItem {LI} at (40,0) size 264x20 - RenderListMarker at (-24,0) size 19x19: "A" - RenderText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "This list should feature..." - RenderListItem {LI} at (40,20) size 264x20 - RenderListMarker at (-23,0) size 18x19: "B" - RenderText {#text} at (0,0) size 142x19 - text run at (0,0) width 142: "...letters for each item..." - RenderListItem {LI} at (40,40) size 264x20 + RenderText {#text} at (0,0) size 206x19 + text run at (0,0) width 206: "...uppercase letters for each item." + RenderBlock {OL} at (4,536) size 316x60 + RenderListItem {LI} at (40,0) size 276x20 + RenderListMarker at (-25,0) size 20x19: "A" + RenderText {#text} at (0,0) size 155x19 + text run at (0,0) width 155: "This list should feature..." + RenderListItem {LI} at (40,20) size 276x20 + RenderListMarker at (-24,0) size 19x19: "B" + RenderText {#text} at (0,0) size 147x19 + text run at (0,0) width 147: "...letters for each item..." + RenderListItem {LI} at (40,40) size 276x20 RenderListMarker at (-21,0) size 16x19: "3" - RenderText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "...except this one." - RenderBlock {UL} at (4,612) size 304x60 - RenderListItem {LI} at (40,0) size 264x20 - RenderText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - RenderListItem {LI} at (40,20) size 264x20 - RenderText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - RenderListItem {LI} at (40,40) size 264x20 - RenderText {#text} at (0,0) size 141x19 - text run at (0,0) width 141: "...nothing for each item." + RenderText {#text} at (0,0) size 110x19 + text run at (0,0) width 110: "...except this one." + RenderBlock {UL} at (4,612) size 316x60 + RenderListItem {LI} at (40,0) size 276x20 + RenderText {#text} at (0,0) size 62x19 + text run at (0,0) width 62: "This list..." + RenderListItem {LI} at (40,20) size 276x20 + RenderText {#text} at (0,0) size 113x19 + text run at (0,0) width 113: "...should feature..." + RenderListItem {LI} at (40,40) size 276x20 + RenderText {#text} at (0,0) size 150x19 + text run at (0,0) width 150: "...nothing for each item." layer at (8,217) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,209) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/classification/white_space-expected.txt b/LayoutTests/platform/wincairo/css1/classification/white_space-expected.txt index ce8b8cf65c3d..41ce60ad2222 100644 --- a/LayoutTests/platform/wincairo/css1/classification/white_space-expected.txt +++ b/LayoutTests/platform/wincairo/css1/classification/white_space-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 882x585 +layer at (0,0) size 921x585 RenderView at (0,0) size 800x585 layer at (0,0) size 800x585 RenderBlock {HTML} at (0,0) size 800x585 RenderBody {BODY} at (8,8) size 784x569 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x64 RenderText {#text} at (0,0) size 232x64 text run at (0,0) width 192: ".one {white-space: pre;}" @@ -16,66 +16,66 @@ layer at (0,0) size 800x585 text run at (232,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 784x100 - RenderText {#text} at (0,0) size 544x99 + RenderText {#text} at (0,0) size 568x99 text run at (0,0) width 0: " " - text run at (0,20) width 544: "This sentence should show extra space where there would ordinarily not be any." - text run at (544,20) width 0: " " - text run at (0,40) width 284: " There should also be preservation of returns" - text run at (284,40) width 0: " " - text run at (0,60) width 93: "as this sentence" - text run at (93,60) width 0: " " - text run at (0,80) width 177: " very clearly demonstrates." - text run at (177,80) width 0: " " + text run at (0,20) width 568: "This sentence should show extra space where there would ordinarily not be any." + text run at (568,20) width 0: " " + text run at (0,40) width 296: " There should also be preservation of returns" + text run at (296,40) width 0: " " + text run at (0,60) width 97: "as this sentence" + text run at (97,60) width 0: " " + text run at (0,80) width 184: " very clearly demonstrates." + text run at (184,80) width 0: " " RenderBlock {P} at (0,247) size 784x20 - RenderText {#text} at (0,0) size 852x19 - text run at (0,0) width 852: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." + RenderText {#text} at (0,0) size 891x19 + text run at (0,0) width 891: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." RenderBlock {P} at (0,283) size 784x40 - RenderText {#text} at (0,0) size 285x39 + RenderText {#text} at (0,0) size 296x39 text run at (0,0) width 0: " " - text run at (0,20) width 285: "This sentence should show extra space, " - RenderInline {SPAN} at (0,0) size 148x19 - RenderText {#text} at (285,20) size 148x19 - text run at (285,20) width 80: "except in the " - text run at (365,20) width 68: "second half" - RenderText {#text} at (433,20) size 4x19 - text run at (433,20) width 4: "." - text run at (437,20) width 0: " " - RenderTable {TABLE} at (0,339) size 874x230 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 872x228 - RenderTableRow {TR} at (0,0) size 872x28 - RenderTableCell {TD} at (0,0) size 872x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 872x200 + text run at (0,20) width 296: "This sentence should show extra space, " + RenderInline {SPAN} at (0,0) size 156x19 + RenderText {#text} at (296,20) size 156x19 + text run at (296,20) width 84: "except in the " + text run at (380,20) width 72: "second half" + RenderText {#text} at (452,20) size 4x19 + text run at (452,20) width 4: "." + text run at (456,20) width 0: " " + RenderTable {TABLE} at (0,339) size 913x230 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 911x228 + RenderTableRow {TR} at (0,0) size 911x28 + RenderTableCell {TD} at (0,0) size 911x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 911x200 RenderTableCell {TD} at (0,114) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 860x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 852x100 - RenderText {#text} at (0,0) size 544x99 + RenderTableCell {TD} at (12,28) size 899x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 891x100 + RenderText {#text} at (0,0) size 568x99 text run at (0,0) width 0: " " - text run at (0,20) width 544: "This sentence should show extra space where there would ordinarily not be any." - text run at (544,20) width 0: " " - text run at (0,40) width 284: " There should also be preservation of returns" - text run at (284,40) width 0: " " - text run at (0,60) width 93: "as this sentence" - text run at (93,60) width 0: " " - text run at (0,80) width 177: " very clearly demonstrates." - text run at (177,80) width 0: " " - RenderBlock {P} at (4,120) size 852x20 - RenderText {#text} at (0,0) size 852x19 - text run at (0,0) width 852: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." - RenderBlock {P} at (4,156) size 852x40 - RenderText {#text} at (0,0) size 285x39 + text run at (0,20) width 568: "This sentence should show extra space where there would ordinarily not be any." + text run at (568,20) width 0: " " + text run at (0,40) width 296: " There should also be preservation of returns" + text run at (296,40) width 0: " " + text run at (0,60) width 97: "as this sentence" + text run at (97,60) width 0: " " + text run at (0,80) width 184: " very clearly demonstrates." + text run at (184,80) width 0: " " + RenderBlock {P} at (4,120) size 891x20 + RenderText {#text} at (0,0) size 891x19 + text run at (0,0) width 891: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." + RenderBlock {P} at (4,156) size 891x40 + RenderText {#text} at (0,0) size 296x39 text run at (0,0) width 0: " " - text run at (0,20) width 285: "This sentence should show extra space, " - RenderInline {SPAN} at (0,0) size 148x19 - RenderText {#text} at (285,20) size 148x19 - text run at (285,20) width 80: "except in the " - text run at (365,20) width 68: "second half" - RenderText {#text} at (433,20) size 4x19 - text run at (433,20) width 4: "." - text run at (437,20) width 0: " " + text run at (0,20) width 296: "This sentence should show extra space, " + RenderInline {SPAN} at (0,0) size 156x19 + RenderText {#text} at (296,20) size 156x19 + text run at (296,20) width 84: "except in the " + text run at (380,20) width 72: "second half" + RenderText {#text} at (452,20) size 4x19 + text run at (452,20) width 4: "." + text run at (456,20) width 0: " " layer at (8,121) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/color_and_background/background-expected.txt b/LayoutTests/platform/wincairo/css1/color_and_background/background-expected.txt index 8f91d203b25c..32c0e921e3b5 100644 --- a/LayoutTests/platform/wincairo/css1/color_and_background/background-expected.txt +++ b/LayoutTests/platform/wincairo/css1/color_and_background/background-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x777 RenderBlock {HTML} at (0,0) size 785x777 RenderBody {BODY} at (8,8) size 769x761 [bgcolor=#008000] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x64 RenderText {#text} at (0,0) size 648x64 text run at (0,0) width 648: "BODY {background: green url(../resources/oransqr.gif) repeat-x center top fixed;}" @@ -17,74 +17,75 @@ layer at (0,0) size 785x777 text run at (0,48) width 592: ".three {background: lime url(../resources/oransqr.gif) repeat-x left top;}" text run at (592,48) width 0: " " RenderBlock {P} at (0,131) size 769x60 - RenderText {#text} at (0,0) size 695x19 - text run at (0,0) width 695: "This document should have a green background with an orange strip running across the entire top of the page, since " + RenderText {#text} at (0,0) size 728x19 + text run at (0,0) width 728: "This document should have a green background with an orange strip running across the entire top of the page, since" RenderInline {CODE} at (0,0) size 64x16 - RenderText {#text} at (695,3) size 64x16 - text run at (695,3) width 64: "repeat-x" - RenderText {#text} at (0,20) size 746x39 - text run at (0,20) width 276: "indicates tiling in both directions of the x-axis. " - text run at (276,20) width 284: "Furthermore, the strip should be fixed in place. " - text run at (560,20) width 186: "I'll have to add extra text at the" - text run at (0,40) width 369: "end of this page to make it long enough to scroll conveniently." + RenderText {#text} at (0,23) size 64x16 + text run at (0,23) width 64: "repeat-x" + RenderText {#text} at (64,20) size 753x39 + text run at (64,20) width 298: " indicates tiling in both directions of the x-axis. " + text run at (362,20) width 298: "Furthermore, the strip should be fixed in place. " + text run at (660,20) width 93: "I'll have to add" + text run at (0,40) width 491: "extra text at the end of this page to make it long enough to scroll conveniently." RenderBlock {P} at (0,207) size 769x60 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 756x59 - text run at (0,0) width 709: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." - text run at (0,20) width 756: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling these" - text run at (0,40) width 80: "declarations. " - text run at (80,40) width 296: "Hey, I didn't say the page would be pretty, did I?" + RenderText {#text} at (0,0) size 762x59 + text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." + text run at (0,20) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" + text run at (0,40) width 119: "these declarations. " + text run at (119,40) width 306: "Hey, I didn't say the page would be pretty, did I?" RenderBlock {P} at (0,283) size 769x60 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 756x59 - text run at (0,0) width 720: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the bottom." - text run at (0,20) width 756: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling these" - text run at (0,40) width 80: "declarations. " - text run at (80,40) width 296: "Hey, I didn't say the page would be pretty, did I?" + RenderText {#text} at (0,0) size 762x59 + text run at (0,0) width 752: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the bottom." + text run at (0,20) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" + text run at (0,40) width 119: "these declarations. " + text run at (119,40) width 306: "Hey, I didn't say the page would be pretty, did I?" RenderBlock {P} at (0,359) size 769x60 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 756x59 - text run at (0,0) width 708: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." - text run at (0,20) width 756: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling these" - text run at (0,40) width 80: "declarations. " - text run at (80,40) width 296: "Hey, I didn't say the page would be pretty, did I?" + RenderText {#text} at (0,0) size 762x59 + text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." + text run at (0,20) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" + text run at (0,40) width 119: "these declarations. " + text run at (119,40) width 306: "Hey, I didn't say the page would be pretty, did I?" RenderTable {TABLE} at (0,435) size 769x326 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x324 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x296 RenderTableCell {TD} at (0,162) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x296 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x60 - RenderText {#text} at (0,0) size 691x19 - text run at (0,0) width 691: "This document should have a green background with an orange strip running across the entire top of the page, since" + RenderText {#text} at (0,0) size 728x19 + text run at (0,0) width 728: "This document should have a green background with an orange strip running across the entire top of the page, since" RenderInline {CODE} at (0,0) size 64x16 RenderText {#text} at (0,23) size 64x16 text run at (0,23) width 64: "repeat-x" - RenderText {#text} at (64,20) size 717x39 - text run at (64,20) width 280: " indicates tiling in both directions of the x-axis. " - text run at (344,20) width 284: "Furthermore, the strip should be fixed in place. " - text run at (628,20) width 89: "I'll have to add" - text run at (0,40) width 466: "extra text at the end of this page to make it long enough to scroll conveniently." + RenderText {#text} at (64,20) size 726x39 + text run at (64,20) width 298: " indicates tiling in both directions of the x-axis. " + text run at (362,20) width 298: "Furthermore, the strip should be fixed in place. " + text run at (660,20) width 66: "I'll have to" + text run at (0,40) width 518: "add extra text at the end of this page to make it long enough to scroll conveniently." RenderBlock {P} at (4,80) size 747x60 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 721x59 - text run at (0,0) width 709: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." - text run at (0,20) width 721: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,40) width 115: "these declarations. " - text run at (115,40) width 296: "Hey, I didn't say the page would be pretty, did I?" + RenderText {#text} at (0,0) size 743x59 + text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." + text run at (0,20) width 703: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" + text run at (0,40) width 178: "handling these declarations. " + text run at (178,40) width 306: "Hey, I didn't say the page would be pretty, did I?" RenderBlock {P} at (4,156) size 747x60 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 721x59 - text run at (0,0) width 720: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the bottom." - text run at (0,20) width 721: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,40) width 115: "these declarations. " - text run at (115,40) width 296: "Hey, I didn't say the page would be pretty, did I?" + RenderText {#text} at (0,0) size 739x59 + text run at (0,0) width 700: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the" + text run at (0,20) width 52: "bottom. " + text run at (52,20) width 687: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser" + text run at (0,40) width 194: "in handling these declarations. " + text run at (194,40) width 306: "Hey, I didn't say the page would be pretty, did I?" RenderBlock {P} at (4,232) size 747x60 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 721x59 - text run at (0,0) width 708: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." - text run at (0,20) width 721: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,40) width 115: "these declarations. " - text run at (115,40) width 296: "Hey, I didn't say the page would be pretty, did I?" + RenderText {#text} at (0,0) size 743x59 + text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." + text run at (0,20) width 703: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" + text run at (0,40) width 178: "handling these declarations. " + text run at (178,40) width 306: "Hey, I didn't say the page would be pretty, did I?" layer at (8,121) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/color_and_background/background_attachment-expected.txt b/LayoutTests/platform/wincairo/css1/color_and_background/background_attachment-expected.txt index 65d43e44290d..52768e711cb8 100644 --- a/LayoutTests/platform/wincairo/css1/color_and_background/background_attachment-expected.txt +++ b/LayoutTests/platform/wincairo/css1/color_and_background/background_attachment-expected.txt @@ -1,71 +1,71 @@ -layer at (0,0) size 880x1258 +layer at (0,0) size 880x1278 RenderView at (0,0) size 785x585 -layer at (0,0) size 785x1258 - RenderBlock {HTML} at (0,0) size 785x1259 - RenderBody {BODY} at (8,8) size 769x1243 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1278 + RenderBlock {HTML} at (0,0) size 785x1279 + RenderBody {BODY} at (8,8) size 769x1263 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x32 RenderText {#text} at (0,0) size 872x32 text run at (0,0) width 872: "BODY {background-image: url(../resources/bg.gif); background-repeat: repeat-x; background-attachment: fixed;}" text run at (872,0) width 0: " " text run at (0,16) width 0: " " RenderBlock {P} at (0,99) size 769x100 - RenderText {#text} at (0,0) size 769x99 - text run at (0,0) width 768: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which does NOT" - text run at (0,20) width 154: "scroll with the document. " - text run at (154,20) width 615: "It should, instead, appear to be a fixed pattern past which the content scrolls, even when the end of the" - text run at (0,40) width 102: "page is reached. " - text run at (102,40) width 664: "In addition, the default Test Suite background should NOT appear, as it's been overridden by the styles shown" - text run at (0,60) width 45: "above. " - text run at (45,60) width 619: "I'll have to add a lot of extra text to the page in order to make all this something we can actually check. " - text run at (664,60) width 95: "Don't worry, I'll" - text run at (0,80) width 113: "think of something." + RenderText {#text} at (0,0) size 763x99 + text run at (0,0) width 763: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which does" + text run at (0,20) width 201: "NOT scroll with the document. " + text run at (201,20) width 552: "It should, instead, appear to be a fixed pattern past which the content scrolls, even when" + text run at (0,40) width 195: "the end of the page is reached. " + text run at (195,40) width 565: "In addition, the default Test Suite background should NOT appear, as it's been overridden" + text run at (0,60) width 174: "by the styles shown above. " + text run at (174,60) width 546: "I'll have to add a lot of extra text to the page in order to make all this something we can" + text run at (0,80) width 98: "actually check. " + text run at (98,80) width 226: "Don't worry, I'll think of something." RenderBlock {P} at (0,215) size 769x20 - RenderText {#text} at (0,0) size 484x19 - text run at (0,0) width 397: "In fact, why not the relevant section from the CSS1 specification? " - text run at (397,0) width 87: "A capital idea." + RenderText {#text} at (0,0) size 507x19 + text run at (0,0) width 417: "In fact, why not the relevant section from the CSS1 specification? " + text run at (417,0) width 90: "A capital idea." RenderBlock {H4} at (0,284) size 769x21 - RenderInline {A} at (0,0) size 213x19 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "5.3.5 'background-attachment'" + RenderInline {A} at (0,0) size 220x19 + RenderText {#text} at (0,0) size 220x19 + text run at (0,0) width 220: "5.3.5 'background-attachment'" RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,325) size 769x101 + RenderInline {EM} at (0,0) size 40x19 + RenderText {#text} at (0,0) size 40x19 + text run at (0,0) width 40: "Value:" + RenderText {#text} at (40,0) size 81x19 + text run at (40,0) width 81: " scroll | fixed" + RenderBR {BR} at (121,0) size 0x19 RenderInline {EM} at (0,0) size 42x19 - RenderText {#text} at (0,0) size 42x19 - text run at (0,0) width 42: "Value:" - RenderText {#text} at (42,0) size 76x19 - text run at (42,0) width 76: " scroll | fixed" - RenderBR {BR} at (118,0) size 0x19 - RenderInline {EM} at (0,0) size 43x19 - RenderText {#text} at (0,20) size 43x19 - text run at (0,20) width 43: "Initial:" - RenderText {#text} at (43,20) size 36x19 - text run at (43,20) width 36: " scroll" - RenderBR {BR} at (79,20) size 0x19 - RenderInline {EM} at (0,0) size 69x19 - RenderText {#text} at (0,40) size 69x19 - text run at (0,40) width 69: "Applies to:" - RenderText {#text} at (69,40) size 73x19 - text run at (69,40) width 73: " all elements" - RenderBR {BR} at (142,40) size 0x19 - RenderInline {EM} at (0,0) size 63x19 - RenderText {#text} at (0,60) size 63x19 - text run at (0,60) width 63: "Inherited:" - RenderText {#text} at (63,60) size 19x19 - text run at (63,60) width 19: " no" + RenderText {#text} at (0,20) size 42x19 + text run at (0,20) width 42: "Initial:" + RenderText {#text} at (42,20) size 38x19 + text run at (42,20) width 38: " scroll" + RenderBR {BR} at (80,20) size 0x19 + RenderInline {EM} at (0,0) size 68x19 + RenderText {#text} at (0,40) size 68x19 + text run at (0,40) width 68: "Applies to:" + RenderText {#text} at (68,40) size 78x19 + text run at (68,40) width 78: " all elements" + RenderBR {BR} at (146,40) size 0x19 + RenderInline {EM} at (0,0) size 62x19 + RenderText {#text} at (0,60) size 62x19 + text run at (0,60) width 62: "Inherited:" + RenderText {#text} at (62,60) size 20x19 + text run at (62,60) width 20: " no" RenderBR {BR} at (82,60) size 0x19 - RenderInline {EM} at (0,0) size 123x19 - RenderText {#text} at (0,80) size 123x19 - text run at (0,80) width 123: "Percentage values:" - RenderText {#text} at (123,80) size 31x19 - text run at (123,80) width 31: " N/A" - RenderBR {BR} at (154,80) size 0x19 + RenderInline {EM} at (0,0) size 121x19 + RenderText {#text} at (0,80) size 121x19 + text run at (0,80) width 121: "Percentage values:" + RenderText {#text} at (121,80) size 32x19 + text run at (121,80) width 32: " N/A" + RenderBR {BR} at (153,80) size 0x19 RenderBlock {P} at (0,441) size 769x41 - RenderText {#text} at (0,0) size 766x39 - text run at (0,0) width 766: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the canvas or if it" - text run at (0,20) width 177: "scrolls along with the content." + RenderText {#text} at (0,0) size 765x39 + text run at (0,0) width 765: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the canvas" + text run at (0,20) width 230: "or if it scrolls along with the content." RenderBlock {PRE} at (0,497) size 769x81 RenderText {#text} at (0,0) size 296x80 text run at (0,0) width 72: " BODY { " @@ -78,80 +78,81 @@ layer at (0,0) size 785x1258 text run at (264,48) width 0: " " text run at (0,64) width 24: " }" text run at (24,64) width 0: " " - RenderBlock {P} at (0,593) size 769x41 + RenderBlock {P} at (0,593) size 769x61 RenderInline {EM} at (0,0) size 72x19 RenderText {#text} at (0,0) size 72x19 text run at (0,0) width 72: "CSS1 core:" - RenderText {#text} at (72,0) size 761x39 - text run at (72,0) width 689: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the HTML" - text run at (0,20) width 728: "and BODY elements, since there is no way for an author to provide an image only for those browsers that support 'fixed'." - RenderTable {TABLE} at (0,649) size 769x594 [border: (1px outset #808080)] + RenderText {#text} at (72,0) size 765x59 + text run at (72,0) width 670: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the" + text run at (0,20) width 765: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that support" + text run at (0,40) width 42: "'fixed'." + RenderTable {TABLE} at (0,669) size 769x594 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x591 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x563 RenderTableCell {TD} at (0,295) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x563 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x100 - RenderText {#text} at (0,0) size 742x99 - text run at (0,0) width 731: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which does" - text run at (0,20) width 191: "NOT scroll with the document. " - text run at (191,20) width 551: "It should, instead, appear to be a fixed pattern past which the content scrolls, even when the" - text run at (0,40) width 166: "end of the page is reached. " - text run at (166,40) width 562: "In addition, the default Test Suite background should NOT appear, as it's been overridden by" - text run at (0,60) width 147: "the styles shown above. " - text run at (147,60) width 571: "I'll have to add a lot of extra text to the page in order to make all this something we can actually" - text run at (0,80) width 44: "check. " - text run at (44,80) width 212: "Don't worry, I'll think of something." + RenderText {#text} at (0,0) size 747x99 + text run at (0,0) width 730: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which" + text run at (0,20) width 234: "does NOT scroll with the document. " + text run at (234,20) width 513: "It should, instead, appear to be a fixed pattern past which the content scrolls, even" + text run at (0,40) width 234: "when the end of the page is reached. " + text run at (234,40) width 493: "In addition, the default Test Suite background should NOT appear, as it's been" + text run at (0,60) width 246: "overridden by the styles shown above. " + text run at (246,60) width 497: "I'll have to add a lot of extra text to the page in order to make all this something" + text run at (0,80) width 147: "we can actually check. " + text run at (147,80) width 226: "Don't worry, I'll think of something." RenderBlock {P} at (4,120) size 747x20 - RenderText {#text} at (0,0) size 484x19 - text run at (0,0) width 397: "In fact, why not the relevant section from the CSS1 specification? " - text run at (397,0) width 87: "A capital idea." + RenderText {#text} at (0,0) size 507x19 + text run at (0,0) width 417: "In fact, why not the relevant section from the CSS1 specification? " + text run at (417,0) width 90: "A capital idea." RenderBlock {H4} at (4,189) size 747x21 - RenderInline {A} at (0,0) size 213x19 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "5.3.5 'background-attachment'" + RenderInline {A} at (0,0) size 220x19 + RenderText {#text} at (0,0) size 220x19 + text run at (0,0) width 220: "5.3.5 'background-attachment'" RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,230) size 747x101 + RenderInline {EM} at (0,0) size 40x19 + RenderText {#text} at (0,0) size 40x19 + text run at (0,0) width 40: "Value:" + RenderText {#text} at (40,0) size 81x19 + text run at (40,0) width 81: " scroll | fixed" + RenderBR {BR} at (121,0) size 0x19 RenderInline {EM} at (0,0) size 42x19 - RenderText {#text} at (0,0) size 42x19 - text run at (0,0) width 42: "Value:" - RenderText {#text} at (42,0) size 76x19 - text run at (42,0) width 76: " scroll | fixed" - RenderBR {BR} at (118,0) size 0x19 - RenderInline {EM} at (0,0) size 43x19 - RenderText {#text} at (0,20) size 43x19 - text run at (0,20) width 43: "Initial:" - RenderText {#text} at (43,20) size 36x19 - text run at (43,20) width 36: " scroll" - RenderBR {BR} at (79,20) size 0x19 - RenderInline {EM} at (0,0) size 69x19 - RenderText {#text} at (0,40) size 69x19 - text run at (0,40) width 69: "Applies to:" - RenderText {#text} at (69,40) size 73x19 - text run at (69,40) width 73: " all elements" - RenderBR {BR} at (142,40) size 0x19 - RenderInline {EM} at (0,0) size 63x19 - RenderText {#text} at (0,60) size 63x19 - text run at (0,60) width 63: "Inherited:" - RenderText {#text} at (63,60) size 19x19 - text run at (63,60) width 19: " no" + RenderText {#text} at (0,20) size 42x19 + text run at (0,20) width 42: "Initial:" + RenderText {#text} at (42,20) size 38x19 + text run at (42,20) width 38: " scroll" + RenderBR {BR} at (80,20) size 0x19 + RenderInline {EM} at (0,0) size 68x19 + RenderText {#text} at (0,40) size 68x19 + text run at (0,40) width 68: "Applies to:" + RenderText {#text} at (68,40) size 78x19 + text run at (68,40) width 78: " all elements" + RenderBR {BR} at (146,40) size 0x19 + RenderInline {EM} at (0,0) size 62x19 + RenderText {#text} at (0,60) size 62x19 + text run at (0,60) width 62: "Inherited:" + RenderText {#text} at (62,60) size 20x19 + text run at (62,60) width 20: " no" RenderBR {BR} at (82,60) size 0x19 - RenderInline {EM} at (0,0) size 123x19 - RenderText {#text} at (0,80) size 123x19 - text run at (0,80) width 123: "Percentage values:" - RenderText {#text} at (123,80) size 31x19 - text run at (123,80) width 31: " N/A" - RenderBR {BR} at (154,80) size 0x19 + RenderInline {EM} at (0,0) size 121x19 + RenderText {#text} at (0,80) size 121x19 + text run at (0,80) width 121: "Percentage values:" + RenderText {#text} at (121,80) size 32x19 + text run at (121,80) width 32: " N/A" + RenderBR {BR} at (153,80) size 0x19 RenderBlock {P} at (4,346) size 747x41 - RenderText {#text} at (0,0) size 744x39 - text run at (0,0) width 744: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the canvas or" - text run at (0,20) width 199: "if it scrolls along with the content." + RenderText {#text} at (0,0) size 718x39 + text run at (0,0) width 718: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the" + text run at (0,20) width 277: "canvas or if it scrolls along with the content." RenderBlock {PRE} at (4,402) size 747x81 RenderText {#text} at (0,0) size 296x80 text run at (0,0) width 72: " BODY { " @@ -168,17 +169,17 @@ layer at (0,0) size 785x1258 RenderInline {EM} at (0,0) size 72x19 RenderText {#text} at (0,0) size 72x19 text run at (0,0) width 72: "CSS1 core:" - RenderText {#text} at (72,0) size 732x59 - text run at (72,0) width 642: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the" - text run at (0,20) width 732: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that support" - text run at (0,40) width 39: "'fixed'." + RenderText {#text} at (72,0) size 742x59 + text run at (72,0) width 670: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the" + text run at (0,20) width 714: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that" + text run at (0,40) width 93: "support 'fixed'." layer at (8,89) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,81) size 769x2 [border: (1px inset #000000)] layer at (8,259) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,251) size 769x2 [border: (1px inset #000000)] layer at (8,269) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,261) size 769x2 [border: (1px inset #000000)] -layer at (25,843) size 747x2 clip at (0,0) size 0x0 +layer at (25,863) size 747x2 clip at (0,0) size 0x0 RenderBlock {HR} at (4,156) size 747x2 [border: (1px inset #000000)] -layer at (25,853) size 747x2 clip at (0,0) size 0x0 +layer at (25,873) size 747x2 clip at (0,0) size 0x0 RenderBlock {HR} at (4,166) size 747x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/color_and_background/background_color-expected.txt b/LayoutTests/platform/wincairo/css1/color_and_background/background_color-expected.txt index b493439ca4d7..67182573b1c7 100644 --- a/LayoutTests/platform/wincairo/css1/color_and_background/background_color-expected.txt +++ b/LayoutTests/platform/wincairo/css1/color_and_background/background_color-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 [bgcolor=#008000] - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x64 RenderText {#text} at (0,0) size 296x64 text run at (0,0) width 224: "P {background-color: green;}" @@ -16,70 +16,69 @@ layer at (0,0) size 800x600 text run at (296,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 784x20 [bgcolor=#008000] - RenderText {#text} at (0,0) size 263x19 - text run at (0,0) width 263: "This element's background should be green." + RenderText {#text} at (0,0) size 277x19 + text run at (0,0) width 277: "This element's background should be green." RenderBlock {P} at (0,167) size 784x20 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 329x19 - text run at (0,0) width 329: "This element's background should be lime (light green)." + RenderText {#text} at (0,0) size 350x19 + text run at (0,0) width 350: "This element's background should be lime (light green)." RenderBlock {P} at (0,203) size 784x60 [bgcolor=#008000] - RenderText {#text} at (0,0) size 620x19 - text run at (0,0) width 620: "This element's background should be green, and the last word in this sentence should also have a green " - RenderInline {SPAN} at (0,0) size 72x19 - RenderText {#text} at (620,0) size 72x19 - text run at (620,0) width 72: "background" - RenderText {#text} at (692,0) size 779x59 - text run at (692,0) width 8: ". " - text run at (700,0) width 38: "This is" - text run at (0,20) width 779: "because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word \"sentence,\" which" - text run at (0,40) width 65: "was set to " + RenderText {#text} at (0,0) size 652x19 + text run at (0,0) width 652: "This element's background should be green, and the last word in this sentence should also have a green " + RenderInline {SPAN} at (0,0) size 75x19 + RenderText {#text} at (652,0) size 75x19 + text run at (652,0) width 75: "background" + RenderText {#text} at (727,0) size 777x59 + text run at (727,0) width 8: ". " + text run at (735,0) width 42: "This is" + text run at (0,20) width 777: "because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word \"sentence,\"" + text run at (0,40) width 109: "which was set to " RenderInline {CODE} at (0,0) size 88x16 - RenderText {#text} at (65,43) size 88x16 - text run at (65,43) width 88: "transparent" - RenderText {#text} at (153,40) size 377x19 - text run at (153,40) width 8: ". " - text run at (161,40) width 369: "If the document background is visible, the browser is in error." + RenderText {#text} at (109,43) size 88x16 + text run at (109,43) width 88: "transparent" + RenderText {#text} at (197,40) size 394x19 + text run at (197,40) width 8: ". " + text run at (205,40) width 386: "If the document background is visible, the browser is in error." RenderBlock {P} at (0,279) size 784x20 - RenderText {#text} at (0,0) size 702x19 - text run at (0,0) width 432: "This element should allow the document background to \"shine through.\" " - text run at (432,0) width 270: "There should be no green backgrounds here!" + RenderText {#text} at (0,0) size 744x19 + text run at (0,0) width 462: "This element should allow the document background to \"shine through.\" " + text run at (462,0) width 282: "There should be no green backgrounds here!" RenderTable {TABLE} at (0,315) size 784x206 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x204 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x176 RenderTableCell {TD} at (0,102) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x176 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x20 [bgcolor=#008000] - RenderText {#text} at (0,0) size 263x19 - text run at (0,0) width 263: "This element's background should be green." + RenderText {#text} at (0,0) size 277x19 + text run at (0,0) width 277: "This element's background should be green." RenderBlock {P} at (4,40) size 762x20 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 329x19 - text run at (0,0) width 329: "This element's background should be lime (light green)." + RenderText {#text} at (0,0) size 350x19 + text run at (0,0) width 350: "This element's background should be lime (light green)." RenderBlock {P} at (4,76) size 762x60 [bgcolor=#008000] - RenderText {#text} at (0,0) size 620x19 - text run at (0,0) width 620: "This element's background should be green, and the last word in this sentence should also have a green " - RenderInline {SPAN} at (0,0) size 72x19 - RenderText {#text} at (620,0) size 72x19 - text run at (620,0) width 72: "background" - RenderText {#text} at (692,0) size 740x59 - text run at (692,0) width 8: ". " - text run at (700,0) width 38: "This is" - text run at (0,20) width 740: "because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word \"sentence,\"" - text run at (0,40) width 104: "which was set to " + RenderText {#text} at (0,0) size 652x19 + text run at (0,0) width 652: "This element's background should be green, and the last word in this sentence should also have a green " + RenderInline {SPAN} at (0,0) size 75x19 + RenderText {#text} at (652,0) size 75x19 + text run at (652,0) width 75: "background" + RenderText {#text} at (727,0) size 747x59 + text run at (727,0) width 4: "." + text run at (0,20) width 747: "This is because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word" + text run at (0,40) width 185: "\"sentence,\" which was set to " RenderInline {CODE} at (0,0) size 88x16 - RenderText {#text} at (104,43) size 88x16 - text run at (104,43) width 88: "transparent" - RenderText {#text} at (192,40) size 377x19 - text run at (192,40) width 8: ". " - text run at (200,40) width 369: "If the document background is visible, the browser is in error." + RenderText {#text} at (185,43) size 88x16 + text run at (185,43) width 88: "transparent" + RenderText {#text} at (273,40) size 394x19 + text run at (273,40) width 8: ". " + text run at (281,40) width 386: "If the document background is visible, the browser is in error." RenderBlock {P} at (4,152) size 762x20 - RenderText {#text} at (0,0) size 702x19 - text run at (0,0) width 432: "This element should allow the document background to \"shine through.\" " - text run at (432,0) width 270: "There should be no green backgrounds here!" + RenderText {#text} at (0,0) size 744x19 + text run at (0,0) width 462: "This element should allow the document background to \"shine through.\" " + text run at (462,0) width 282: "There should be no green backgrounds here!" layer at (8,121) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/color_and_background/background_image-expected.txt b/LayoutTests/platform/wincairo/css1/color_and_background/background_image-expected.txt index 8f9a53b3dc47..0c623ce34314 100644 --- a/LayoutTests/platform/wincairo/css1/color_and_background/background_image-expected.txt +++ b/LayoutTests/platform/wincairo/css1/color_and_background/background_image-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 376x48 text run at (0,0) width 376: "P {background-image: url(../resources/bg.gif);}" @@ -14,79 +14,82 @@ layer at (0,0) size 800x600 text run at (240,16) width 0: " " text run at (0,32) width 0: " " RenderBlock {P} at (0,115) size 784x40 - RenderText {#text} at (0,0) size 779x39 - text run at (0,0) width 482: "This sentence should be backed by an image-- a green grid pattern, in this case. " - text run at (482,0) width 297: "The background image should also tile along both" - text run at (0,20) width 570: "axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." - RenderBlock {P} at (0,171) size 784x60 - RenderText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This sentence should be backed by a repeated green-grid image, as should the last three words " - RenderInline {STRONG} at (0,0) size 103x19 - RenderInline {SPAN} at (0,0) size 103x19 - RenderText {#text} at (574,0) size 103x19 - text run at (574,0) width 103: "in this sentence" - RenderText {#text} at (677,0) size 97x19 - text run at (677,0) width 8: ". " - text run at (685,0) width 89: "If it is not, then" + RenderText {#text} at (0,0) size 746x39 + text run at (0,0) width 502: "This sentence should be backed by an image-- a green grid pattern, in this case. " + text run at (502,0) width 244: "The background image should also tile" + text run at (0,20) width 664: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." + RenderBlock {P} at (0,171) size 784x80 + RenderText {#text} at (0,0) size 596x19 + text run at (0,0) width 596: "This sentence should be backed by a repeated green-grid image, as should the last three words " + RenderInline {STRONG} at (0,0) size 102x19 + RenderInline {SPAN} at (0,0) size 102x19 + RenderText {#text} at (596,0) size 102x19 + text run at (596,0) width 102: "in this sentence" + RenderText {#text} at (698,0) size 770x39 + text run at (698,0) width 8: ". " + text run at (706,0) width 64: "If it is not," + text run at (0,20) width 31: "then " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (0,23) size 32x16 - text run at (0,23) width 32: "none" - RenderText {#text} at (32,20) size 162x19 - text run at (32,20) width 157: " is interpreted incorrectly. " - text run at (189,20) width 5: "(" + RenderText {#text} at (31,23) size 32x16 + text run at (31,23) width 32: "none" + RenderText {#text} at (63,20) size 168x19 + text run at (63,20) width 163: " is interpreted incorrectly. " + text run at (226,20) width 5: "(" RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (194,23) size 32x16 - text run at (194,23) width 32: "none" - RenderText {#text} at (226,20) size 773x39 - text run at (226,20) width 547: " means that the element has no background image, allowing the parent to \"shine through\" by" - text run at (0,40) width 706: "default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image should be visible.)" - RenderBlock {P} at (0,247) size 784x20 - RenderText {#text} at (0,0) size 777x19 - text run at (0,0) width 777: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine through\" instead." - RenderTable {TABLE} at (0,283) size 784x230 [border: (1px outset #808080)] + RenderText {#text} at (231,23) size 32x16 + text run at (231,23) width 32: "none" + RenderText {#text} at (263,20) size 771x59 + text run at (263,20) width 502: " means that the element has no background image, allowing the parent to \"shine" + text run at (0,40) width 771: "through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image should be" + text run at (0,60) width 50: "visible.)" + RenderBlock {P} at (0,267) size 784x40 + RenderText {#text} at (0,0) size 765x39 + text run at (0,0) width 765: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine through\"" + text run at (0,20) width 48: "instead." + RenderTable {TABLE} at (0,323) size 784x230 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x228 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x200 RenderTableCell {TD} at (0,114) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x40 - RenderText {#text} at (0,0) size 748x39 - text run at (0,0) width 482: "This sentence should be backed by an image-- a green grid pattern, in this case. " - text run at (482,0) width 266: "The background image should also tile along" - text run at (0,20) width 601: "both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." + RenderText {#text} at (0,0) size 746x39 + text run at (0,0) width 502: "This sentence should be backed by an image-- a green grid pattern, in this case. " + text run at (502,0) width 244: "The background image should also tile" + text run at (0,20) width 664: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." RenderBlock {P} at (4,60) size 762x80 - RenderText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This sentence should be backed by a repeated green-grid image, as should the last three words " - RenderInline {STRONG} at (0,0) size 103x19 - RenderInline {SPAN} at (0,0) size 103x19 - RenderText {#text} at (574,0) size 103x19 - text run at (574,0) width 103: "in this sentence" - RenderText {#text} at (677,0) size 745x39 - text run at (677,0) width 8: ". " - text run at (685,0) width 60: "If it is not," - text run at (0,20) width 29: "then " + RenderText {#text} at (0,0) size 596x19 + text run at (0,0) width 596: "This sentence should be backed by a repeated green-grid image, as should the last three words " + RenderInline {STRONG} at (0,0) size 102x19 + RenderInline {SPAN} at (0,0) size 102x19 + RenderText {#text} at (596,0) size 102x19 + text run at (596,0) width 102: "in this sentence" + RenderText {#text} at (698,0) size 742x39 + text run at (698,0) width 8: ". " + text run at (706,0) width 36: "If it is" + text run at (0,20) width 59: "not, then " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (29,23) size 32x16 - text run at (29,23) width 32: "none" - RenderText {#text} at (61,20) size 162x19 - text run at (61,20) width 157: " is interpreted incorrectly. " - text run at (218,20) width 5: "(" + RenderText {#text} at (59,23) size 32x16 + text run at (59,23) width 32: "none" + RenderText {#text} at (91,20) size 168x19 + text run at (91,20) width 163: " is interpreted incorrectly. " + text run at (254,20) width 5: "(" RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (223,23) size 32x16 - text run at (223,23) width 32: "none" - RenderText {#text} at (255,20) size 729x59 - text run at (255,20) width 474: " means that the element has no background image, allowing the parent to \"shine" - text run at (0,40) width 729: "through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image should be" - text run at (0,60) width 46: "visible.)" + RenderText {#text} at (259,23) size 32x16 + text run at (259,23) width 32: "none" + RenderText {#text} at (291,20) size 750x59 + text run at (291,20) width 458: " means that the element has no background image, allowing the parent to" + text run at (0,40) width 750: "\"shine through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image" + text run at (0,60) width 115: "should be visible.)" RenderBlock {P} at (4,156) size 762x40 - RenderText {#text} at (0,0) size 727x39 - text run at (0,0) width 727: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine through\"" - text run at (0,20) width 46: "instead." + RenderText {#text} at (0,0) size 705x39 + text run at (0,0) width 705: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine" + text run at (0,20) width 108: "through\" instead." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/color_and_background/background_position-expected.txt b/LayoutTests/platform/wincairo/css1/color_and_background/background_position-expected.txt index 09f6b455fe1c..13fa5c5b2661 100644 --- a/LayoutTests/platform/wincairo/css1/color_and_background/background_position-expected.txt +++ b/LayoutTests/platform/wincairo/css1/color_and_background/background_position-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1533 +layer at (0,0) size 785x1573 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1533 - RenderBlock {HTML} at (0,0) size 785x1533 - RenderBody {BODY} at (8,8) size 769x1517 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1573 + RenderBlock {HTML} at (0,0) size 785x1573 + RenderBody {BODY} at (8,8) size 769x1557 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x272 RenderText {#text} at (0,0) size 688x272 text run at (0,0) width 648: "BODY {background-image: url(../resources/bg.gif); background-position: right top;" @@ -42,106 +42,108 @@ layer at (0,0) size 785x1533 text run at (488,240) width 0: " " text run at (0,256) width 0: " " RenderBlock {P} at (0,339) size 769x20 - RenderText {#text} at (0,0) size 472x19 - text run at (0,0) width 472: "This document should have a single, small green image in its upper right corner." + RenderText {#text} at (0,0) size 502x19 + text run at (0,0) width 502: "This document should have a single, small green image in its upper right corner." RenderBlock {P} at (0,375) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 764x59 - text run at (0,0) width 764: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be fixed at the" - text run at (0,20) width 148: "center of the paragraph. " - text run at (148,20) width 612: "The background color will make it easier to determine the edges of the paragraph, and therefore allow" - text run at (0,40) width 156: "you to calculate its center." + RenderText {#text} at (0,0) size 768x59 + text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" + text run at (0,20) width 227: "fixed at the center of the paragraph. " + text run at (227,20) width 541: "The background color will make it easier to determine the edges of the paragraph, and" + text run at (0,40) width 261: "therefore allow you to calculate its center." RenderBlock {P} at (0,451) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 764x59 - text run at (0,0) width 764: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be fixed at the" - text run at (0,20) width 148: "center of the paragraph. " - text run at (148,20) width 612: "The background color will make it easier to determine the edges of the paragraph, and therefore allow" - text run at (0,40) width 156: "you to calculate its center." + RenderText {#text} at (0,0) size 768x59 + text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" + text run at (0,20) width 227: "fixed at the center of the paragraph. " + text run at (227,20) width 541: "The background color will make it easier to determine the edges of the paragraph, and" + text run at (0,40) width 261: "therefore allow you to calculate its center." RenderBlock {P} at (0,527) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 751x59 - text run at (0,0) width 728: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the image" - text run at (0,20) width 350: "should be fixed at the lower right corner of the paragraph. " - text run at (350,20) width 401: "The background color will make it easier to determine the edges of" - text run at (0,40) width 343: "the paragraph, and therefore allow you to see its corners." + RenderText {#text} at (0,0) size 749x59 + text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" + text run at (0,20) width 409: "image should be fixed at the lower right corner of the paragraph. " + text run at (409,20) width 340: "The background color will make it easier to determine" + text run at (0,40) width 436: "the edges of the paragraph, and therefore allow you to see its corners." RenderBlock {P} at (0,603) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 751x59 - text run at (0,0) width 728: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the image" - text run at (0,20) width 350: "should be fixed at the lower right corner of the paragraph. " - text run at (350,20) width 401: "The background color will make it easier to determine the edges of" - text run at (0,40) width 343: "the paragraph, and therefore allow you to see its corners." + RenderText {#text} at (0,0) size 749x59 + text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" + text run at (0,20) width 409: "image should be fixed at the lower right corner of the paragraph. " + text run at (409,20) width 340: "The background color will make it easier to determine" + text run at (0,40) width 436: "the edges of the paragraph, and therefore allow you to see its corners." RenderBlock {P} at (0,679) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 758x59 - text run at (0,0) width 744: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image should be" - text run at (0,20) width 240: "fixed at the left center of the paragraph. " - text run at (240,20) width 518: "The background color will make it easier to determine the edges of the paragraph, and" - text run at (0,40) width 250: "therefore allow you to calculate its center." + RenderText {#text} at (0,0) size 768x59 + text run at (0,0) width 768: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image should" + text run at (0,20) width 270: "be fixed at the left center of the paragraph. " + text run at (270,20) width 443: "The background color will make it easier to determine the edges of the" + text run at (0,40) width 359: "paragraph, and therefore allow you to calculate its center." RenderBlock {P} at (0,755) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 750x59 - text run at (0,0) width 717: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25% down. " - text run at (717,0) width 23: "The" - text run at (0,20) width 750: "background color will make it easier to determine the edges of the paragraph, which should help in determining if all this is so," - text run at (0,40) width 557: "and the extra text should make the element long enough for this test to be simpler to evaluate." - RenderBlock {P} at (0,831) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 757x59 - text run at (0,0) width 756: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-hand corner;" - text run at (0,20) width 757: "that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left corner of the element." - text run at (0,40) width 740: "The background color will make it easier to determine the edges of the paragraph, which should assist in evaluating this test." - RenderTable {TABLE} at (0,907) size 769x610 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x608 + RenderText {#text} at (0,0) size 761x59 + text run at (0,0) width 749: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25% down." + text run at (0,20) width 761: "The background color will make it easier to determine the edges of the paragraph, which should help in determining if all" + text run at (0,40) width 647: "this is so, and the extra text should make the element long enough for this test to be simpler to evaluate." + RenderBlock {P} at (0,831) size 769x80 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 760x79 + text run at (0,0) width 749: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-hand" + text run at (0,20) width 760: "corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left corner of" + text run at (0,40) width 80: "the element. " + text run at (80,40) width 656: "The background color will make it easier to determine the edges of the paragraph, which should assist in" + text run at (0,60) width 120: "evaluating this test." + RenderTable {TABLE} at (0,927) size 769x630 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x628 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x580 - RenderTableCell {TD} at (0,304) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x600 + RenderTableCell {TD} at (0,314) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x580 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x600 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 472x19 - text run at (0,0) width 472: "This document should have a single, small green image in its upper right corner." + RenderText {#text} at (0,0) size 502x19 + text run at (0,0) width 502: "This document should have a single, small green image in its upper right corner." RenderBlock {P} at (4,40) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 746x59 - text run at (0,0) width 742: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be fixed at" - text run at (0,20) width 170: "the center of the paragraph. " - text run at (170,20) width 576: "The background color will make it easier to determine the edges of the paragraph, and therefore" - text run at (0,40) width 192: "allow you to calculate its center." + RenderText {#text} at (0,0) size 741x59 + text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" + text run at (0,20) width 227: "fixed at the center of the paragraph. " + text run at (227,20) width 514: "The background color will make it easier to determine the edges of the paragraph," + text run at (0,40) width 288: "and therefore allow you to calculate its center." RenderBlock {P} at (4,116) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 746x59 - text run at (0,0) width 742: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be fixed at" - text run at (0,20) width 170: "the center of the paragraph. " - text run at (170,20) width 576: "The background color will make it easier to determine the edges of the paragraph, and therefore" - text run at (0,40) width 192: "allow you to calculate its center." + RenderText {#text} at (0,0) size 741x59 + text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" + text run at (0,20) width 227: "fixed at the center of the paragraph. " + text run at (227,20) width 514: "The background color will make it easier to determine the edges of the paragraph," + text run at (0,40) width 288: "and therefore allow you to calculate its center." RenderBlock {P} at (4,192) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 735x59 - text run at (0,0) width 728: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the image" - text run at (0,20) width 350: "should be fixed at the lower right corner of the paragraph. " - text run at (350,20) width 385: "The background color will make it easier to determine the edges" - text run at (0,40) width 359: "of the paragraph, and therefore allow you to see its corners." + RenderText {#text} at (0,0) size 730x59 + text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" + text run at (0,20) width 409: "image should be fixed at the lower right corner of the paragraph. " + text run at (409,20) width 274: "The background color will make it easier to" + text run at (0,40) width 502: "determine the edges of the paragraph, and therefore allow you to see its corners." RenderBlock {P} at (4,268) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 735x59 - text run at (0,0) width 728: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the image" - text run at (0,20) width 350: "should be fixed at the lower right corner of the paragraph. " - text run at (350,20) width 385: "The background color will make it easier to determine the edges" - text run at (0,40) width 359: "of the paragraph, and therefore allow you to see its corners." + RenderText {#text} at (0,0) size 730x59 + text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" + text run at (0,20) width 409: "image should be fixed at the lower right corner of the paragraph. " + text run at (409,20) width 274: "The background color will make it easier to" + text run at (0,40) width 502: "determine the edges of the paragraph, and therefore allow you to see its corners." RenderBlock {P} at (4,344) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 744x59 - text run at (0,0) width 744: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image should be" - text run at (0,20) width 240: "fixed at the left center of the paragraph. " - text run at (240,20) width 492: "The background color will make it easier to determine the edges of the paragraph," - text run at (0,40) width 276: "and therefore allow you to calculate its center." - RenderBlock {P} at (4,420) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 740x59 - text run at (0,0) width 717: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25% down. " - text run at (717,0) width 23: "The" - text run at (0,20) width 728: "background color will make it easier to determine the edges of the paragraph, which should help in determining if all this is" - text run at (0,40) width 579: "so, and the extra text should make the element long enough for this test to be simpler to evaluate." - RenderBlock {P} at (4,496) size 747x80 [bgcolor=#00FFFF] - RenderText {#text} at (0,0) size 728x79 - text run at (0,0) width 709: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-hand" - text run at (0,20) width 728: "corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left corner of" - text run at (0,40) width 76: "the element. " - text run at (76,40) width 624: "The background color will make it easier to determine the edges of the paragraph, which should assist in" - text run at (0,60) width 112: "evaluating this test." + RenderText {#text} at (0,0) size 736x59 + text run at (0,0) width 722: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image" + text run at (0,20) width 316: "should be fixed at the left center of the paragraph. " + text run at (316,20) width 420: "The background color will make it easier to determine the edges of" + text run at (0,40) width 382: "the paragraph, and therefore allow you to calculate its center." + RenderBlock {P} at (4,420) size 747x80 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 705x79 + text run at (0,0) width 705: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25%" + text run at (0,20) width 44: "down. " + text run at (44,20) width 650: "The background color will make it easier to determine the edges of the paragraph, which should help in" + text run at (0,40) width 698: "determining if all this is so, and the extra text should make the element long enough for this test to be simpler to" + text run at (0,60) width 56: "evaluate." + RenderBlock {P} at (4,516) size 747x80 [bgcolor=#00FFFF] + RenderText {#text} at (0,0) size 744x79 + text run at (0,0) width 718: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-" + text run at (0,20) width 734: "hand corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left" + text run at (0,40) width 141: "corner of the element. " + text run at (141,40) width 603: "The background color will make it easier to determine the edges of the paragraph, which should" + text run at (0,60) width 173: "assist in evaluating this test." layer at (8,329) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,321) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/color_and_background/background_repeat-expected.txt b/LayoutTests/platform/wincairo/css1/color_and_background/background_repeat-expected.txt index d5bb94a19251..c3245d608bbb 100644 --- a/LayoutTests/platform/wincairo/css1/color_and_background/background_repeat-expected.txt +++ b/LayoutTests/platform/wincairo/css1/color_and_background/background_repeat-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1993 RenderBlock {HTML} at (0,0) size 785x1993 RenderBody {BODY} at (8,8) size 769x1977 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x240 RenderText {#text} at (0,0) size 880x240 text run at (0,0) width 672: ".one {background-image: url(../resources/oransqr.gif); background-repeat: repeat-y;}" @@ -38,271 +38,274 @@ layer at (0,0) size 785x1993 text run at (240,208) width 0: " " text run at (0,224) width 0: " " RenderBlock {P} at (0,307) size 769x60 - RenderText {#text} at (0,0) size 744x19 - text run at (0,0) width 744: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the default for" + RenderText {#text} at (0,0) size 762x39 + text run at (0,0) width 762: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the default" + text run at (0,20) width 22: "for " RenderInline {CODE} at (0,0) size 152x16 - RenderText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - RenderText {#text} at (152,20) size 756x39 - text run at (152,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (464,20) width 292: "This is extra text included for the sole purpose of" - text run at (0,40) width 179: "making the paragraph longer. " - text run at (179,40) width 207: "Thank you for your understanding." + RenderText {#text} at (22,23) size 152x16 + text run at (22,23) width 152: "background-position" + RenderText {#text} at (174,20) size 730x39 + text run at (174,20) width 320: " is '0% 0%' and that property is not declared here). " + text run at (494,20) width 236: "This is extra text included for the sole" + text run at (0,40) width 259: "purpose of making the paragraph longer. " + text run at (259,40) width 221: "Thank you for your understanding." RenderBlock {P} at (0,383) size 769x60 - RenderText {#text} at (0,0) size 744x19 - text run at (0,0) width 744: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the default for" + RenderText {#text} at (0,0) size 762x39 + text run at (0,0) width 762: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the default" + text run at (0,20) width 22: "for " + RenderInline {CODE} at (0,0) size 152x16 + RenderText {#text} at (22,23) size 152x16 + text run at (22,23) width 152: "background-position" + RenderText {#text} at (174,20) size 730x39 + text run at (174,20) width 320: " is '0% 0%' and that property is not declared here). " + text run at (494,20) width 236: "This is extra text included for the sole" + text run at (0,40) width 259: "purpose of making the paragraph longer. " + text run at (259,40) width 221: "Thank you for your understanding." + RenderBlock {P} at (0,459) size 769x60 + RenderText {#text} at (0,0) size 697x19 + text run at (0,0) width 697: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for" RenderInline {CODE} at (0,0) size 152x16 RenderText {#text} at (0,23) size 152x16 text run at (0,23) width 152: "background-position" - RenderText {#text} at (152,20) size 756x39 - text run at (152,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (464,20) width 292: "This is extra text included for the sole purpose of" - text run at (0,40) width 179: "making the paragraph longer. " - text run at (179,40) width 207: "Thank you for your understanding." - RenderBlock {P} at (0,459) size 769x60 - RenderText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for " - RenderInline {CODE} at (0,0) size 755x36 - RenderText {#text} at (667,3) size 755x36 - text run at (667,3) width 88: "background-" - text run at (0,23) width 64: "position" - RenderText {#text} at (64,20) size 737x39 - text run at (64,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (376,20) width 361: "This is extra text included for the sole purpose of making the" - text run at (0,40) width 110: "paragraph longer. " - text run at (110,40) width 207: "Thank you for your understanding." + RenderText {#text} at (152,20) size 762x39 + text run at (152,20) width 320: " is '0% 0%' and that property is not declared here). " + text run at (472,20) width 290: "This is extra text included for the sole purpose" + text run at (0,40) width 205: "of making the paragraph longer. " + text run at (205,40) width 221: "Thank you for your understanding." RenderBlock {P} at (0,535) size 769x80 - RenderText {#text} at (0,0) size 764x39 - text run at (0,0) width 764: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin image exactly" - text run at (0,20) width 161: "centered in the paragraph. " - text run at (161,20) width 95: "This is because " + RenderText {#text} at (0,0) size 762x39 + text run at (0,0) width 762: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin image" + text run at (0,20) width 216: "exactly centered in the paragraph. " + text run at (216,20) width 100: "This is because " RenderInline {CODE} at (0,0) size 64x16 - RenderText {#text} at (256,23) size 64x16 - text run at (256,23) width 64: "repeat-y" - RenderText {#text} at (320,20) size 104x19 - text run at (320,20) width 104: " specifies tiling in " - RenderInline {EM} at (0,0) size 29x19 - RenderText {#text} at (424,20) size 29x19 - text run at (424,20) width 29: "both" - RenderText {#text} at (453,20) size 752x39 - text run at (453,20) width 151: " directions on the y-axis. " - text run at (604,20) width 148: "Note that this test is only" - text run at (0,40) width 186: "valid if the user agent supports " + RenderText {#text} at (316,23) size 64x16 + text run at (316,23) width 64: "repeat-y" + RenderText {#text} at (380,20) size 114x19 + text run at (380,20) width 114: " specifies tiling in " + RenderInline {EM} at (0,0) size 28x19 + RenderText {#text} at (494,20) size 28x19 + text run at (494,20) width 28: "both" + RenderText {#text} at (522,20) size 764x39 + text run at (522,20) width 158: " directions on the y-axis. " + text run at (680,20) width 84: "Note that this" + text run at (0,40) width 267: "test is only valid if the user agent supports " RenderInline {CODE} at (0,0) size 152x16 - RenderText {#text} at (186,43) size 152x16 - text run at (186,43) width 152: "background-position" - RenderText {#text} at (338,40) size 33x19 - text run at (338,40) width 33: " (see " + RenderText {#text} at (267,43) size 152x16 + text run at (267,43) width 152: "background-position" + RenderText {#text} at (419,40) size 33x19 + text run at (419,40) width 33: " (see " RenderInline {A} at (0,0) size 57x19 [color=#0000FF] - RenderText {#text} at (371,40) size 57x19 - text run at (371,40) width 57: "test 5.3.6" - RenderText {#text} at (428,40) size 723x39 - text run at (428,40) width 13: "). " - text run at (441,40) width 282: "I'll fill the paragraph with extra text to make the" - text run at (0,60) width 270: "conformance (or lack thereof) more obvious." + RenderText {#text} at (452,40) size 57x19 + text run at (452,40) width 57: "test 5.3.6" + RenderText {#text} at (509,40) size 759x39 + text run at (509,40) width 13: "). " + text run at (522,40) width 237: "I'll fill the paragraph with extra text to" + text run at (0,60) width 342: "make the conformance (or lack thereof) more obvious." RenderBlock {P} at (0,631) size 769x100 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 714x19 - text run at (0,0) width 623: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " - text run at (623,0) width 91: "This is because" + RenderText {#text} at (0,0) size 754x19 + text run at (0,0) width 658: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " + text run at (658,0) width 96: "This is because" RenderInline {CODE} at (0,0) size 136x16 RenderText {#text} at (0,23) size 136x16 text run at (0,23) width 136: "background-repeat" - RenderText {#text} at (136,20) size 104x19 - text run at (136,20) width 104: " specifies tiling in " + RenderText {#text} at (136,20) size 114x19 + text run at (136,20) width 114: " specifies tiling in " RenderInline {EM} at (0,0) size 16x19 - RenderText {#text} at (240,20) size 16x19 - text run at (240,20) width 16: "all" - RenderText {#text} at (256,20) size 746x39 - text run at (256,20) width 342: " directions, regardless of the position of the origin image. " - text run at (598,20) width 148: "Note that this test is only" - text run at (0,40) width 186: "valid if the user agent supports " + RenderText {#text} at (250,20) size 16x19 + text run at (250,20) width 16: "all" + RenderText {#text} at (266,20) size 750x39 + text run at (266,20) width 361: " directions, regardless of the position of the origin image. " + text run at (627,20) width 123: "Note that this test is" + text run at (0,40) width 228: "only valid if the user agent supports " RenderInline {CODE} at (0,0) size 152x16 - RenderText {#text} at (186,43) size 152x16 - text run at (186,43) width 152: "background-position" - RenderText {#text} at (338,40) size 33x19 - text run at (338,40) width 33: " (see " + RenderText {#text} at (228,43) size 152x16 + text run at (228,43) width 152: "background-position" + RenderText {#text} at (380,40) size 33x19 + text run at (380,40) width 33: " (see " RenderInline {A} at (0,0) size 57x19 [color=#0000FF] - RenderText {#text} at (371,40) size 57x19 - text run at (371,40) width 57: "test 5.3.6" - RenderText {#text} at (428,40) size 754x59 - text run at (428,40) width 13: "). " - text run at (441,40) width 282: "I'll fill the paragraph with extra text to make the" - text run at (0,60) width 274: "conformance (or lack thereof) more obvious. " - text run at (274,60) width 480: "A background color is present, although if it is visible then the image has not bee" - text run at (0,80) width 86: "correctly tiled." + RenderText {#text} at (413,40) size 57x19 + text run at (413,40) width 57: "test 5.3.6" + RenderText {#text} at (470,40) size 765x59 + text run at (470,40) width 13: "). " + text run at (483,40) width 275: "I'll fill the paragraph with extra text to make" + text run at (0,60) width 308: "the conformance (or lack thereof) more obvious. " + text run at (308,60) width 457: "A background color is present, although if it is visible then the image has" + text run at (0,80) width 140: "not bee correctly tiled." RenderBlock {P} at (0,747) size 769x60 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 747x59 - text run at (0,0) width 747: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should be the" - text run at (0,20) width 246: "exact center of the top of the paragraph. " - text run at (246,20) width 484: "I'll fill it with extra text to make the conformance (or lack thereof) more obvious. " - text run at (730,20) width 11: "A" - text run at (0,40) width 603: "background color is present, although if it is visible, then the image may not have been tiled correctly." + RenderText {#text} at (0,0) size 764x59 + text run at (0,0) width 764: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should be" + text run at (0,20) width 277: "the exact center of the top of the paragraph. " + text run at (277,20) width 447: "I'll fill it with extra text to make the conformance (or lack thereof) more" + text run at (0,40) width 58: "obvious. " + text run at (58,40) width 652: "A background color is present, although if it is visible, then the image may not have been tiled correctly." RenderBlock {P} at (0,823) size 769x60 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 749x59 - text run at (0,0) width 461: "This sentence should have a fully tiled background which starts at its top left. " - text run at (461,0) width 288: "I'll fill it with extra text to make the conformance" - text run at (0,20) width 192: "(or lack thereof) more obvious. " - text run at (192,20) width 557: "A background color is present, although if it is visible, then the image may not have been tiled" - text run at (0,40) width 57: "correctly." + RenderText {#text} at (0,0) size 752x59 + text run at (0,0) width 488: "This sentence should have a fully tiled background which starts at its top left. " + text run at (488,0) width 220: "I'll fill it with extra text to make the" + text run at (0,20) width 285: "conformance (or lack thereof) more obvious. " + text run at (285,20) width 467: "A background color is present, although if it is visible, then the image may" + text run at (0,40) width 181: "not have been tiled correctly." RenderBlock {P} at (0,899) size 769x80 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 762x79 - text run at (0,0) width 743: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance of the" - text run at (0,20) width 631: "image should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (631,20) width 131: "I'll fill it with extra text" - text run at (0,40) width 349: "to make the conformance (or lack thereof) more obvious. " - text run at (349,40) width 411: "A background color is present, although if it is visible, then the image" - text run at (0,60) width 203: "may not have been tiled correctly." + RenderText {#text} at (0,0) size 769x79 + text run at (0,0) width 760: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance of" + text run at (0,20) width 688: "the image should be anchored in the bottom right corner, with the tiled background extending out from there. " + text run at (688,20) width 81: "I'll fill it with" + text run at (0,40) width 424: "extra text to make the conformance (or lack thereof) more obvious. " + text run at (424,40) width 340: "A background color is present, although if it is visible," + text run at (0,60) width 308: "then the image may not have been tiled correctly." RenderBlock {P} at (0,995) size 769x120 [bgcolor=#FF0000] RenderText {#text} at (0,0) size 769x119 - text run at (0,0) width 763: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the background's" - text run at (0,20) width 305: "origin should be the exact center of the paragraph. " - text run at (305,20) width 425: "I'll fill it with extra text to make the conformance (or lack thereof) more" - text run at (0,40) width 55: "obvious. " - text run at (55,40) width 422: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (477,40) width 292: "This is true because I am not able to increase the" - text run at (0,60) width 724: "text size without resorting to either headings or other CSS properties, neither of which I want to use in this circumstance. " - text run at (724,60) width 25: "This" - text run at (0,80) width 197: "ought to be enough text, though. " - text run at (197,80) width 557: "A background color is present, although if it is visible, then the image may not have been tiled" - text run at (0,100) width 57: "correctly." + text run at (0,0) width 718: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" + text run at (0,20) width 407: "background's origin should be the exact center of the paragraph. " + text run at (407,20) width 358: "I'll fill it with extra text to make the conformance (or lack" + text run at (0,40) width 147: "thereof) more obvious. " + text run at (147,40) width 442: "In fact, a lot of extra text will be necessary to make this at all obvious. " + text run at (589,40) width 180: "This is true because I am not" + text run at (0,60) width 765: "able to increase the text size without resorting to either headings or other CSS properties, neither of which I want to use in" + text run at (0,80) width 116: "this circumstance. " + text run at (116,80) width 241: "This ought to be enough text, though. " + text run at (357,80) width 394: "A background color is present, although if it is visible, then the" + text run at (0,100) width 254: "image may not have been tiled correctly." RenderTable {TABLE} at (0,1131) size 769x846 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x844 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x816 RenderTableCell {TD} at (0,422) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x816 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x60 - RenderText {#text} at (0,0) size 744x19 - text run at (0,0) width 744: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the default for" + RenderText {#text} at (0,0) size 715x39 + text run at (0,0) width 715: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the" + text run at (0,20) width 69: "default for " RenderInline {CODE} at (0,0) size 152x16 - RenderText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - RenderText {#text} at (152,20) size 740x39 - text run at (152,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (464,20) width 276: "This is extra text included for the sole purpose" - text run at (0,40) width 195: "of making the paragraph longer. " - text run at (195,40) width 207: "Thank you for your understanding." + RenderText {#text} at (69,23) size 152x16 + text run at (69,23) width 152: "background-position" + RenderText {#text} at (221,20) size 725x39 + text run at (221,20) width 320: " is '0% 0%' and that property is not declared here). " + text run at (541,20) width 184: "This is extra text included for" + text run at (0,40) width 311: "the sole purpose of making the paragraph longer. " + text run at (311,40) width 221: "Thank you for your understanding." RenderBlock {P} at (4,80) size 747x60 - RenderText {#text} at (0,0) size 744x19 - text run at (0,0) width 744: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the default for" + RenderText {#text} at (0,0) size 715x39 + text run at (0,0) width 715: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the" + text run at (0,20) width 69: "default for " RenderInline {CODE} at (0,0) size 152x16 - RenderText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - RenderText {#text} at (152,20) size 740x39 - text run at (152,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (464,20) width 276: "This is extra text included for the sole purpose" - text run at (0,40) width 195: "of making the paragraph longer. " - text run at (195,40) width 207: "Thank you for your understanding." + RenderText {#text} at (69,23) size 152x16 + text run at (69,23) width 152: "background-position" + RenderText {#text} at (221,20) size 725x39 + text run at (221,20) width 320: " is '0% 0%' and that property is not declared here). " + text run at (541,20) width 184: "This is extra text included for" + text run at (0,40) width 311: "the sole purpose of making the paragraph longer. " + text run at (311,40) width 221: "Thank you for your understanding." RenderBlock {P} at (4,156) size 747x60 - RenderText {#text} at (0,0) size 663x19 - text run at (0,0) width 663: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for" + RenderText {#text} at (0,0) size 697x19 + text run at (0,0) width 697: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for" RenderInline {CODE} at (0,0) size 152x16 RenderText {#text} at (0,23) size 152x16 text run at (0,23) width 152: "background-position" - RenderText {#text} at (152,20) size 740x39 - text run at (152,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (464,20) width 276: "This is extra text included for the sole purpose" - text run at (0,40) width 195: "of making the paragraph longer. " - text run at (195,40) width 207: "Thank you for your understanding." + RenderText {#text} at (152,20) size 708x39 + text run at (152,20) width 320: " is '0% 0%' and that property is not declared here). " + text run at (472,20) width 236: "This is extra text included for the sole" + text run at (0,40) width 259: "purpose of making the paragraph longer. " + text run at (259,40) width 221: "Thank you for your understanding." RenderBlock {P} at (4,232) size 747x80 - RenderText {#text} at (0,0) size 718x39 - text run at (0,0) width 718: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin image" - text run at (0,20) width 207: "exactly centered in the paragraph. " - text run at (207,20) width 95: "This is because " + RenderText {#text} at (0,0) size 720x39 + text run at (0,0) width 720: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin" + text run at (0,20) width 258: "image exactly centered in the paragraph. " + text run at (258,20) width 100: "This is because " RenderInline {CODE} at (0,0) size 64x16 - RenderText {#text} at (302,23) size 64x16 - text run at (302,23) width 64: "repeat-y" - RenderText {#text} at (366,20) size 104x19 - text run at (366,20) width 104: " specifies tiling in " - RenderInline {EM} at (0,0) size 29x19 - RenderText {#text} at (470,20) size 29x19 - text run at (470,20) width 29: "both" - RenderText {#text} at (499,20) size 731x39 - text run at (499,20) width 151: " directions on the y-axis. " - text run at (650,20) width 81: "Note that this" - text run at (0,40) width 253: "test is only valid if the user agent supports " + RenderText {#text} at (358,23) size 64x16 + text run at (358,23) width 64: "repeat-y" + RenderText {#text} at (422,20) size 114x19 + text run at (422,20) width 114: " specifies tiling in " + RenderInline {EM} at (0,0) size 28x19 + RenderText {#text} at (536,20) size 28x19 + text run at (536,20) width 28: "both" + RenderText {#text} at (564,20) size 718x39 + text run at (564,20) width 154: " directions on the y-axis." + text run at (0,40) width 355: "Note that this test is only valid if the user agent supports " RenderInline {CODE} at (0,0) size 152x16 - RenderText {#text} at (253,43) size 152x16 - text run at (253,43) width 152: "background-position" - RenderText {#text} at (405,40) size 33x19 - text run at (405,40) width 33: " (see " + RenderText {#text} at (355,43) size 152x16 + text run at (355,43) width 152: "background-position" + RenderText {#text} at (507,40) size 33x19 + text run at (507,40) width 33: " (see " RenderInline {A} at (0,0) size 57x19 [color=#0000FF] - RenderText {#text} at (438,40) size 57x19 - text run at (438,40) width 57: "test 5.3.6" - RenderText {#text} at (495,40) size 731x39 - text run at (495,40) width 13: "). " - text run at (508,40) width 223: "I'll fill the paragraph with extra text to" - text run at (0,60) width 329: "make the conformance (or lack thereof) more obvious." + RenderText {#text} at (540,40) size 57x19 + text run at (540,40) width 57: "test 5.3.6" + RenderText {#text} at (597,40) size 737x39 + text run at (597,40) width 13: "). " + text run at (610,40) width 127: "I'll fill the paragraph" + text run at (0,60) width 452: "with extra text to make the conformance (or lack thereof) more obvious." RenderBlock {P} at (4,328) size 747x100 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 714x19 - text run at (0,0) width 623: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " - text run at (623,0) width 91: "This is because" + RenderText {#text} at (0,0) size 700x39 + text run at (0,0) width 658: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " + text run at (658,0) width 42: "This is" + text run at (0,20) width 54: "because " RenderInline {CODE} at (0,0) size 136x16 - RenderText {#text} at (0,23) size 136x16 - text run at (0,23) width 136: "background-repeat" - RenderText {#text} at (136,20) size 104x19 - text run at (136,20) width 104: " specifies tiling in " + RenderText {#text} at (54,23) size 136x16 + text run at (54,23) width 136: "background-repeat" + RenderText {#text} at (190,20) size 114x19 + text run at (190,20) width 114: " specifies tiling in " RenderInline {EM} at (0,0) size 16x19 - RenderText {#text} at (240,20) size 16x19 - text run at (240,20) width 16: "all" - RenderText {#text} at (256,20) size 746x39 - text run at (256,20) width 342: " directions, regardless of the position of the origin image. " - text run at (598,20) width 148: "Note that this test is only" - text run at (0,40) width 186: "valid if the user agent supports " + RenderText {#text} at (304,20) size 16x19 + text run at (304,20) width 16: "all" + RenderText {#text} at (320,20) size 739x39 + text run at (320,20) width 361: " directions, regardless of the position of the origin image. " + text run at (681,20) width 58: "Note that" + text run at (0,40) width 293: "this test is only valid if the user agent supports " RenderInline {CODE} at (0,0) size 152x16 - RenderText {#text} at (186,43) size 152x16 - text run at (186,43) width 152: "background-position" - RenderText {#text} at (338,40) size 33x19 - text run at (338,40) width 33: " (see " + RenderText {#text} at (293,43) size 152x16 + text run at (293,43) width 152: "background-position" + RenderText {#text} at (445,40) size 33x19 + text run at (445,40) width 33: " (see " RenderInline {A} at (0,0) size 57x19 [color=#0000FF] - RenderText {#text} at (371,40) size 57x19 - text run at (371,40) width 57: "test 5.3.6" - RenderText {#text} at (428,40) size 728x59 - text run at (428,40) width 13: "). " - text run at (441,40) width 282: "I'll fill the paragraph with extra text to make the" - text run at (0,60) width 274: "conformance (or lack thereof) more obvious. " - text run at (274,60) width 454: "A background color is present, although if it is visible then the image has not" - text run at (0,80) width 112: "bee correctly tiled." + RenderText {#text} at (478,40) size 57x19 + text run at (478,40) width 57: "test 5.3.6" + RenderText {#text} at (535,40) size 742x59 + text run at (535,40) width 13: "). " + text run at (548,40) width 194: "I'll fill the paragraph with extra" + text run at (0,60) width 389: "text to make the conformance (or lack thereof) more obvious. " + text run at (389,60) width 336: "A background color is present, although if it is visible" + text run at (0,80) width 261: "then the image has not bee correctly tiled." RenderBlock {P} at (4,444) size 747x60 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 747x59 - text run at (0,0) width 747: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should be the" - text run at (0,20) width 246: "exact center of the top of the paragraph. " - text run at (246,20) width 484: "I'll fill it with extra text to make the conformance (or lack thereof) more obvious. " - text run at (730,20) width 11: "A" - text run at (0,40) width 603: "background color is present, although if it is visible, then the image may not have been tiled correctly." + RenderText {#text} at (0,0) size 745x59 + text run at (0,0) width 745: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should" + text run at (0,20) width 296: "be the exact center of the top of the paragraph. " + text run at (296,20) width 447: "I'll fill it with extra text to make the conformance (or lack thereof) more" + text run at (0,40) width 58: "obvious. " + text run at (58,40) width 652: "A background color is present, although if it is visible, then the image may not have been tiled correctly." RenderBlock {P} at (4,520) size 747x60 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 737x59 - text run at (0,0) width 461: "This sentence should have a fully tiled background which starts at its top left. " - text run at (461,0) width 206: "I'll fill it with extra text to make the" - text run at (0,20) width 274: "conformance (or lack thereof) more obvious. " - text run at (274,20) width 463: "A background color is present, although if it is visible, then the image may not" - text run at (0,40) width 151: "have been tiled correctly." + RenderText {#text} at (0,0) size 721x59 + text run at (0,0) width 488: "This sentence should have a fully tiled background which starts at its top left. " + text run at (488,0) width 220: "I'll fill it with extra text to make the" + text run at (0,20) width 285: "conformance (or lack thereof) more obvious. " + text run at (285,20) width 436: "A background color is present, although if it is visible, then the image" + text run at (0,40) width 212: "may not have been tiled correctly." RenderBlock {P} at (4,596) size 747x80 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 747x79 - text run at (0,0) width 743: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance of the" - text run at (0,20) width 631: "image should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (631,20) width 105: "I'll fill it with extra" - text run at (0,40) width 375: "text to make the conformance (or lack thereof) more obvious. " - text run at (375,40) width 372: "A background color is present, although if it is visible, then the" - text run at (0,60) width 242: "image may not have been tiled correctly." + RenderText {#text} at (0,0) size 745x79 + text run at (0,0) width 743: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance" + text run at (0,20) width 705: "of the image should be anchored in the bottom right corner, with the tiled background extending out from there. " + text run at (705,20) width 37: "I'll fill" + text run at (0,40) width 468: "it with extra text to make the conformance (or lack thereof) more obvious. " + text run at (468,40) width 277: "A background color is present, although if it" + text run at (0,60) width 371: "is visible, then the image may not have been tiled correctly." RenderBlock {P} at (4,692) size 747x120 [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 747x119 - text run at (0,0) width 678: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" - text run at (0,20) width 390: "background's origin should be the exact center of the paragraph. " - text run at (390,20) width 339: "I'll fill it with extra text to make the conformance (or lack" - text run at (0,40) width 141: "thereof) more obvious. " - text run at (141,40) width 422: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (563,40) width 172: "This is true because I am not" - text run at (0,60) width 730: "able to increase the text size without resorting to either headings or other CSS properties, neither of which I want to use in" - text run at (0,80) width 110: "this circumstance. " - text run at (110,80) width 226: "This ought to be enough text, though. " - text run at (336,80) width 411: "A background color is present, although if it is visible, then the image" - text run at (0,100) width 203: "may not have been tiled correctly." + RenderText {#text} at (0,0) size 743x119 + text run at (0,0) width 718: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" + text run at (0,20) width 407: "background's origin should be the exact center of the paragraph. " + text run at (407,20) width 328: "I'll fill it with extra text to make the conformance (or" + text run at (0,40) width 177: "lack thereof) more obvious. " + text run at (177,40) width 442: "In fact, a lot of extra text will be necessary to make this at all obvious. " + text run at (619,40) width 124: "This is true because" + text run at (0,60) width 729: "I am not able to increase the text size without resorting to either headings or other CSS properties, neither of which I" + text run at (0,80) width 208: "want to use in this circumstance. " + text run at (208,80) width 241: "This ought to be enough text, though. " + text run at (449,80) width 291: "A background color is present, although if it is" + text run at (0,100) width 357: "visible, then the image may not have been tiled correctly." layer at (8,297) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,289) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/color_and_background/color-expected.txt b/LayoutTests/platform/wincairo/css1/color_and_background/color-expected.txt index 1096c18f2a56..d92eba8edb2e 100644 --- a/LayoutTests/platform/wincairo/css1/color_and_background/color-expected.txt +++ b/LayoutTests/platform/wincairo/css1/color_and_background/color-expected.txt @@ -4,36 +4,36 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x32 RenderText {#text} at (0,0) size 160x32 text run at (0,0) width 160: ".one {color: green;}" text run at (160,0) width 0: " " text run at (0,16) width 0: " " RenderBlock {P} at (0,99) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,135) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - RenderTable {TABLE} at (0,171) size 206x94 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 204x92 - RenderTableRow {TR} at (0,0) size 204x28 - RenderTableCell {TD} at (0,0) size 204x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 204x64 + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." + RenderTable {TABLE} at (0,171) size 216x94 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 214x92 + RenderTableRow {TR} at (0,0) size 214x28 + RenderTableCell {TD} at (0,0) size 214x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 214x64 RenderTableCell {TD} at (0,46) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 192x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 184x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - RenderBlock {P} at (4,40) size 184x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderTableCell {TD} at (12,28) size 202x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 194x20 [color=#008000] + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." + RenderBlock {P} at (4,40) size 194x20 [color=#008000] + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." layer at (8,89) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,81) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/conformance/forward_compatible_parsing-expected.txt b/LayoutTests/platform/wincairo/css1/conformance/forward_compatible_parsing-expected.txt index 1762fdd88fd0..956c92e37d90 100644 --- a/LayoutTests/platform/wincairo/css1/conformance/forward_compatible_parsing-expected.txt +++ b/LayoutTests/platform/wincairo/css1/conformance/forward_compatible_parsing-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x4321 RenderBlock {HTML} at (0,0) size 785x4321 RenderBody {BODY} at (8,8) size 769x4305 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x864 RenderText {#text} at (0,0) size 568x864 text run at (0,0) width 304: "P.one {color: green; rotation: 70deg;}" @@ -114,430 +114,433 @@ layer at (0,0) size 785x4321 text run at (208,832) width 0: " " text run at (0,848) width 0: " " RenderBlock {P} at (0,931) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 462x19 - text run at (0,0) width 462: "This paragraph should be green, because only the rotation should be ignored." + RenderText {#text} at (0,0) size 485x19 + text run at (0,0) width 485: "This paragraph should be green, because only the rotation should be ignored." RenderBlock {P} at (0,967) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 592x19 - text run at (0,0) width 592: "This paragraph should be green, since error-checking should be done before calculating specificity." + RenderText {#text} at (0,0) size 622x19 + text run at (0,0) width 622: "This paragraph should be green, since error-checking should be done before calculating specificity." RenderBlock {P} at (0,1003) size 769x40 - RenderText {#text} at (0,0) size 535x19 - text run at (0,0) width 535: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " + RenderText {#text} at (0,0) size 560x19 + text run at (0,0) width 560: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " RenderInline {CODE} at (0,0) size 56x16 - RenderText {#text} at (535,3) size 56x16 - text run at (535,3) width 56: "inherit" - RenderText {#text} at (591,0) size 766x39 - text run at (591,0) width 175: " is an invalid keyword, and in" - text run at (0,20) width 454: "CSS2, it will cause the gray background (not the white grid) to be inherited." + RenderText {#text} at (560,3) size 56x16 + text run at (560,3) width 56: "inherit" + RenderText {#text} at (616,0) size 760x39 + text run at (616,0) width 144: " is an invalid keyword," + text run at (0,20) width 520: "and in CSS2, it will cause the gray background (not the white grid) to be inherited." RenderBlock {P} at (0,1059) size 769x20 - RenderText {#text} at (0,0) size 611x19 - text run at (0,0) width 611: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." + RenderText {#text} at (0,0) size 638x19 + text run at (0,0) width 638: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." RenderBlock {P} at (0,1095) size 769x20 - RenderText {#text} at (0,0) size 611x19 - text run at (0,0) width 611: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." + RenderText {#text} at (0,0) size 638x19 + text run at (0,0) width 638: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." RenderBlock {P} at (0,1131) size 769x20 - RenderText {#text} at (0,0) size 503x19 - text run at (0,0) width 503: "This paragraph should have a white background, since keywords cannot be quoted." + RenderText {#text} at (0,0) size 526x19 + text run at (0,0) width 526: "This paragraph should have a white background, since keywords cannot be quoted." RenderBlock {P} at (0,1167) size 769x46 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 744x39 - text run at (3,3) width 616: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " - text run at (619,3) width 128: "This should cause the" - text run at (3,23) width 279: "user agent to use the default value of 'medium'." + RenderText {#text} at (3,3) size 756x39 + text run at (3,3) width 643: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " + text run at (646,3) width 113: "This should cause" + text run at (3,23) width 318: "the user agent to use the default value of 'medium'." RenderBlock {P} at (0,1229) size 769x46 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 761x39 - text run at (3,3) width 761: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs), because" - text run at (3,23) width 165: "the border-width is invalid. " - text run at (168,23) width 411: "This should cause the user agent to use the default value of 'medium'." + RenderText {#text} at (3,3) size 740x39 + text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs)," + text run at (3,23) width 228: "because the border-width is invalid. " + text run at (231,23) width 435: "This should cause the user agent to use the default value of 'medium'." RenderBlock {P} at (0,1291) size 769x66 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 761x59 - text run at (3,3) width 761: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs), because" - text run at (3,23) width 511: "the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (514,23) width 233: "This should cause the user agent to use" - text run at (3,43) width 174: "the default value of 'medium'." + RenderText {#text} at (3,3) size 754x59 + text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs)," + text run at (3,23) width 588: "because the border-width units are invalid, and therefore the border-width should be ignored. " + text run at (591,23) width 166: "This should cause the user" + text run at (3,43) width 265: "agent to use the default value of 'medium'." RenderBlock {P} at (0,1373) size 769x66 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 750x59 - text run at (3,3) width 713: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because the" - text run at (3,23) width 517: "border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (520,23) width 233: "This should cause the user agent to use" - text run at (3,43) width 174: "the default value of 'medium'." + RenderText {#text} at (3,3) size 751x59 + text run at (3,3) width 743: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because the" + text run at (3,23) width 547: "border-width does not have any value to go with its pixel unit, and is therefore invalid. " + text run at (550,23) width 204: "This should cause the user agent" + text run at (3,43) width 227: "to use the default value of 'medium'." RenderBlock {P} at (0,1455) size 769x20 - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." + RenderText {#text} at (0,0) size 660x19 + text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." RenderBlock {P} at (0,1491) size 769x40 [color=#008000] - RenderText {#text} at (0,0) size 726x39 - text run at (0,0) width 197: "This paragraph should be green. " - text run at (197,0) width 529: "CSS is case-insensitive, unless required to be case sensitive due to interaction with other" - text run at (0,20) width 228: "standards (e.g., font names or URLs.)" + RenderText {#text} at (0,0) size 760x39 + text run at (0,0) width 207: "This paragraph should be green. " + text run at (207,0) width 553: "CSS is case-insensitive, unless required to be case sensitive due to interaction with other" + text run at (0,20) width 237: "standards (e.g., font names or URLs.)" RenderBlock {OL} at (0,1547) size 769x20 RenderListItem {LI} at (40,0) size 729x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 596x19 - text run at (0,0) width 596: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." + RenderText {#text} at (0,0) size 620x19 + text run at (0,0) width 620: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." RenderBlock {P} at (0,1583) size 769x40 - RenderText {#text} at (0,0) size 764x39 - text run at (0,0) width 764: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph is not the" - text run at (0,20) width 58: "first child." + RenderText {#text} at (0,0) size 752x39 + text run at (0,0) width 752: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph is" + text run at (0,20) width 110: "not the first child." RenderBlock {UL} at (0,1639) size 769x40 RenderListItem {LI} at (40,0) size 729x40 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 728x39 - text run at (0,0) width 728: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,20) width 154: "selector should not apply." + RenderText {#text} at (0,0) size 690x39 + text run at (0,0) width 690: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to" + text run at (0,20) width 228: "CSS2, the selector should not apply." RenderBlock {BLOCKQUOTE} at (40,1695) size 689x40 - RenderText {#text} at (0,0) size 685x39 - text run at (0,0) width 685: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,20) width 154: "selector should not apply." + RenderText {#text} at (0,0) size 688x39 + text run at (0,0) width 688: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to CSS2," + text run at (0,20) width 183: "the selector should not apply." RenderBlock {P} at (0,1751) size 769x40 - RenderInline {ACRONYM} at (0,0) size 763x39 - RenderText {#text} at (0,0) size 763x39 - text run at (0,0) width 763: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector should" - text run at (0,20) width 60: "not apply." + RenderInline {ACRONYM} at (0,0) size 748x39 + RenderText {#text} at (0,0) size 748x39 + text run at (0,0) width 748: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" + text run at (0,20) width 108: "should not apply." RenderBlock {ADDRESS} at (0,1807) size 769x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,20) width 110: "should not apply." + RenderText {#text} at (0,0) size 745x39 + text run at (0,0) width 745: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" + text run at (0,20) width 108: "should not apply." RenderBlock {P} at (0,1863) size 769x40 - RenderInline {SPAN} at (0,0) size 762x39 - RenderText {#text} at (0,0) size 762x39 - text run at (0,0) width 762: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector should not" - text run at (0,20) width 37: "apply." + RenderInline {SPAN} at (0,0) size 768x39 + RenderText {#text} at (0,0) size 768x39 + text run at (0,0) width 768: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector should" + text run at (0,20) width 62: "not apply." RenderBlock {P} at (0,1919) size 769x40 - RenderText {#text} at (0,0) size 761x39 - text run at (0,0) width 631: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " - text run at (631,0) width 130: "However, it is valid in" - text run at (0,20) width 521: "CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." + RenderText {#text} at (0,0) size 753x39 + text run at (0,0) width 664: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " + text run at (664,0) width 89: "However, it is" + text run at (0,20) width 592: "valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." RenderBlock {P} at (0,1975) size 769x20 - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." + RenderText {#text} at (0,0) size 660x19 + text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." RenderBlock {P} at (0,2011) size 769x80 - RenderText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" + RenderText {#text} at (0,0) size 737x19 + text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" RenderInline {CODE} at (0,0) size 64x16 RenderText {#text} at (0,23) size 64x16 text run at (0,23) width 64: "diagonal" - RenderText {#text} at (64,20) size 214x19 - text run at (64,20) width 214: " is not a valid keyword, making the " + RenderText {#text} at (64,20) size 226x19 + text run at (64,20) width 226: " is not a valid keyword, making the " RenderInline {CODE} at (0,0) size 120x16 - RenderText {#text} at (278,23) size 120x16 - text run at (278,23) width 120: "text-decoration" - RenderText {#text} at (398,20) size 122x19 - text run at (398,20) width 50: " invalid. " - text run at (448,20) width 72: "In addition, " + RenderText {#text} at (290,23) size 120x16 + text run at (290,23) width 120: "text-decoration" + RenderText {#text} at (410,20) size 131x19 + text run at (410,20) width 55: " invalid. " + text run at (465,20) width 76: "In addition, " RenderInline {CODE} at (0,0) size 88x16 - RenderText {#text} at (520,23) size 88x16 - text run at (520,23) width 88: "highlighted" - RenderText {#text} at (608,20) size 145x19 - text run at (608,20) width 145: " is not a valid part of the" + RenderText {#text} at (541,23) size 88x16 + text run at (541,23) width 88: "highlighted" + RenderText {#text} at (629,20) size 758x39 + text run at (629,20) width 129: " is not a valid part of" + text run at (0,40) width 23: "the " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (0,43) size 32x16 - text run at (0,43) width 32: "font" - RenderText {#text} at (32,40) size 769x39 - text run at (32,40) width 168: " property, making it invalid. " - text run at (200,40) width 536: "Therefore, this paragraph's font should be the UA default, and match the next paragraph. " - text run at (736,40) width 33: "If this" - text run at (0,60) width 144: "is not the case, then the " + RenderText {#text} at (23,43) size 32x16 + text run at (23,43) width 32: "font" + RenderText {#text} at (55,40) size 719x39 + text run at (55,40) width 178: " property, making it invalid. " + text run at (233,40) width 486: "Therefore, this paragraph's font should be the UA default, and match the next" + text run at (0,60) width 71: "paragraph. " + text run at (71,60) width 190: "If this is not the case, then the " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (144,63) size 32x16 - text run at (144,63) width 32: "font" - RenderText {#text} at (176,60) size 237x19 - text run at (176,60) width 237: " declaration is being improperly parsed." + RenderText {#text} at (261,63) size 32x16 + text run at (261,63) width 32: "font" + RenderText {#text} at (293,60) size 248x19 + text run at (293,60) width 248: " declaration is being improperly parsed." RenderBlock {P} at (0,2107) size 769x80 - RenderText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" + RenderText {#text} at (0,0) size 737x19 + text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" RenderInline {CODE} at (0,0) size 64x16 RenderText {#text} at (0,23) size 64x16 text run at (0,23) width 64: "diagonal" - RenderText {#text} at (64,20) size 214x19 - text run at (64,20) width 214: " is not a valid keyword, making the " + RenderText {#text} at (64,20) size 226x19 + text run at (64,20) width 226: " is not a valid keyword, making the " RenderInline {CODE} at (0,0) size 120x16 - RenderText {#text} at (278,23) size 120x16 - text run at (278,23) width 120: "text-decoration" - RenderText {#text} at (398,20) size 122x19 - text run at (398,20) width 50: " invalid. " - text run at (448,20) width 72: "In addition, " + RenderText {#text} at (290,23) size 120x16 + text run at (290,23) width 120: "text-decoration" + RenderText {#text} at (410,20) size 131x19 + text run at (410,20) width 55: " invalid. " + text run at (465,20) width 76: "In addition, " RenderInline {CODE} at (0,0) size 88x16 - RenderText {#text} at (520,23) size 88x16 - text run at (520,23) width 88: "highlighted" - RenderText {#text} at (608,20) size 145x19 - text run at (608,20) width 145: " is not a valid part of the" + RenderText {#text} at (541,23) size 88x16 + text run at (541,23) width 88: "highlighted" + RenderText {#text} at (629,20) size 758x39 + text run at (629,20) width 129: " is not a valid part of" + text run at (0,40) width 23: "the " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (0,43) size 32x16 - text run at (0,43) width 32: "font" - RenderText {#text} at (32,40) size 758x39 - text run at (32,40) width 168: " property, making it invalid. " - text run at (200,40) width 558: "Therefore, this paragraph's font should be the UA default, and match the previous paragraph." - text run at (0,60) width 181: "If this is not the case, then the " + RenderText {#text} at (23,43) size 32x16 + text run at (23,43) width 32: "font" + RenderText {#text} at (55,40) size 746x39 + text run at (55,40) width 178: " property, making it invalid. " + text run at (233,40) width 513: "Therefore, this paragraph's font should be the UA default, and match the previous" + text run at (0,60) width 71: "paragraph. " + text run at (71,60) width 190: "If this is not the case, then the " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (181,63) size 32x16 - text run at (181,63) width 32: "font" - RenderText {#text} at (213,60) size 237x19 - text run at (213,60) width 237: " declaration is being improperly parsed." + RenderText {#text} at (261,63) size 32x16 + text run at (261,63) width 32: "font" + RenderText {#text} at (293,60) size 248x19 + text run at (293,60) width 248: " declaration is being improperly parsed." RenderBlock {P} at (0,2203) size 769x60 - RenderText {#text} at (0,0) size 503x19 - text run at (0,0) width 476: "The text of this paragraph should be normal size because the selector is invalid. " - text run at (476,0) width 27: "The " - RenderInline {EM} at (0,0) size 103x19 - RenderText {#text} at (503,0) size 103x19 - text run at (503,0) width 103: "emphasized text" - RenderText {#text} at (606,0) size 52x19 - text run at (606,0) width 52: " and the " + RenderText {#text} at (0,0) size 530x19 + text run at (0,0) width 501: "The text of this paragraph should be normal size because the selector is invalid. " + text run at (501,0) width 29: "The " + RenderInline {EM} at (0,0) size 100x19 + RenderText {#text} at (530,0) size 100x19 + text run at (530,0) width 100: "emphasized text" + RenderText {#text} at (630,0) size 54x19 + text run at (630,0) width 54: " and the " RenderInline {STRONG} at (0,0) size 72x19 - RenderText {#text} at (658,0) size 72x19 - text run at (658,0) width 72: "strong text" - RenderText {#text} at (730,0) size 769x59 - text run at (730,0) width 39: " within" - text run at (0,20) width 757: "it should also be normal size, since the entire ruleset should be skipped (since in some future version of CSS, there could be an" - text run at (0,40) width 425: "operator within the selector that has higher precedence than a comma)." + RenderText {#text} at (684,0) size 72x19 + text run at (684,0) width 72: "strong text" + RenderText {#text} at (0,20) size 761x39 + text run at (0,20) width 761: "within it should also be normal size, since the entire ruleset should be skipped (since in some future version of CSS, there" + text run at (0,40) width 520: "could be an operator within the selector that has higher precedence than a comma)." RenderBlock {P} at (0,2279) size 769x40 - RenderText {#text} at (0,0) size 444x19 - text run at (0,0) width 444: "This paragraph should be black, because the line before the declaration is " - RenderInline {STRONG} at (0,0) size 21x19 - RenderText {#text} at (444,0) size 21x19 - text run at (444,0) width 21: "not" - RenderText {#text} at (465,0) size 713x39 - text run at (465,0) width 248: " a comment and therefore the selector for" - text run at (0,20) width 129: "P.nineteenb is invalid." + RenderText {#text} at (0,0) size 464x19 + text run at (0,0) width 464: "This paragraph should be black, because the line before the declaration is " + RenderInline {STRONG} at (0,0) size 22x19 + RenderText {#text} at (464,0) size 22x19 + text run at (464,0) width 22: "not" + RenderText {#text} at (486,0) size 743x39 + text run at (486,0) width 257: " a comment and therefore the selector for" + text run at (0,20) width 137: "P.nineteenb is invalid." RenderBlock {P} at (0,2335) size 769x20 [color=#0000FF] - RenderText {#text} at (0,0) size 444x19 - text run at (0,0) width 444: "This paragraph should be blue, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 470x19 + text run at (0,0) width 470: "This paragraph should be blue, because only the first declaration is invalid." RenderBlock {P} at (0,2371) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 478x19 + text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." RenderBlock {P} at (0,2407) size 769x20 [color=#800080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 457: "This paragraph should be purple, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 483x19 + text run at (0,0) width 483: "This paragraph should be purple, because only the first declaration is invalid." RenderBlock {P} at (0,2443) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 478x19 + text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." RenderBlock {P} at (0,2479) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 478x19 + text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." RenderBlock {P} at (0,2515) size 769x20 - RenderText {#text} at (48,0) size 571x19 - text run at (48,0) width 459: "This paragraph should be indented half an inch, but it should not be maroon. " - text run at (507,0) width 112: "It should be black." + RenderText {#text} at (48,0) size 601x19 + text run at (48,0) width 485: "This paragraph should be indented half an inch, but it should not be maroon. " + text run at (533,0) width 116: "It should be black." RenderBlock {P} at (0,2551) size 769x40 - RenderText {#text} at (0,0) size 722x39 - text run at (0,0) width 722: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of the" - text run at (0,20) width 588: "selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." + RenderText {#text} at (0,0) size 751x39 + text run at (0,0) width 751: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of the" + text run at (0,20) width 616: "selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." RenderTable {TABLE} at (0,2607) size 769x1698 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x1696 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x1668 RenderTableCell {TD} at (0,848) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x1668 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 462x19 - text run at (0,0) width 462: "This paragraph should be green, because only the rotation should be ignored." + RenderText {#text} at (0,0) size 485x19 + text run at (0,0) width 485: "This paragraph should be green, because only the rotation should be ignored." RenderBlock {P} at (4,40) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 592x19 - text run at (0,0) width 592: "This paragraph should be green, since error-checking should be done before calculating specificity." + RenderText {#text} at (0,0) size 622x19 + text run at (0,0) width 622: "This paragraph should be green, since error-checking should be done before calculating specificity." RenderBlock {P} at (4,76) size 747x40 - RenderText {#text} at (0,0) size 535x19 - text run at (0,0) width 535: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " + RenderText {#text} at (0,0) size 560x19 + text run at (0,0) width 560: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " RenderInline {CODE} at (0,0) size 56x16 - RenderText {#text} at (535,3) size 56x16 - text run at (535,3) width 56: "inherit" - RenderText {#text} at (591,0) size 726x39 - text run at (591,0) width 135: " is an invalid keyword," - text run at (0,20) width 494: "and in CSS2, it will cause the gray background (not the white grid) to be inherited." + RenderText {#text} at (560,3) size 56x16 + text run at (560,3) width 56: "inherit" + RenderText {#text} at (616,0) size 696x39 + text run at (616,0) width 80: " is an invalid" + text run at (0,20) width 584: "keyword, and in CSS2, it will cause the gray background (not the white grid) to be inherited." RenderBlock {P} at (4,132) size 747x20 - RenderText {#text} at (0,0) size 611x19 - text run at (0,0) width 611: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." + RenderText {#text} at (0,0) size 638x19 + text run at (0,0) width 638: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." RenderBlock {P} at (4,168) size 747x20 - RenderText {#text} at (0,0) size 611x19 - text run at (0,0) width 611: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." + RenderText {#text} at (0,0) size 638x19 + text run at (0,0) width 638: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." RenderBlock {P} at (4,204) size 747x20 - RenderText {#text} at (0,0) size 503x19 - text run at (0,0) width 503: "This paragraph should have a white background, since keywords cannot be quoted." + RenderText {#text} at (0,0) size 526x19 + text run at (0,0) width 526: "This paragraph should have a white background, since keywords cannot be quoted." RenderBlock {P} at (4,240) size 747x46 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 722x39 - text run at (3,3) width 616: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " - text run at (619,3) width 106: "This should cause" - text run at (3,23) width 301: "the user agent to use the default value of 'medium'." + RenderText {#text} at (3,3) size 717x39 + text run at (3,3) width 643: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " + text run at (646,3) width 74: "This should" + text run at (3,23) width 357: "cause the user agent to use the default value of 'medium'." RenderBlock {P} at (4,302) size 747x46 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 708x39 - text run at (3,3) width 708: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs)," - text run at (3,23) width 218: "because the border-width is invalid. " - text run at (221,23) width 411: "This should cause the user agent to use the default value of 'medium'." + RenderText {#text} at (3,3) size 740x39 + text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs)," + text run at (3,23) width 228: "because the border-width is invalid. " + text run at (231,23) width 435: "This should cause the user agent to use the default value of 'medium'." RenderBlock {P} at (4,364) size 747x66 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 721x59 - text run at (3,3) width 708: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs)," - text run at (3,23) width 564: "because the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (567,23) width 157: "This should cause the user" - text run at (3,43) width 250: "agent to use the default value of 'medium'." + RenderText {#text} at (3,3) size 740x59 + text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs)," + text run at (3,23) width 588: "because the border-width units are invalid, and therefore the border-width should be ignored. " + text run at (591,23) width 136: "This should cause the" + text run at (3,43) width 295: "user agent to use the default value of 'medium'." RenderBlock {P} at (4,446) size 747x66 [border: (3px solid #000000)] - RenderText {#text} at (3,3) size 726x59 - text run at (3,3) width 713: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because the" - text run at (3,23) width 517: "border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (520,23) width 209: "This should cause the user agent to" - text run at (3,43) width 198: "use the default value of 'medium'." + RenderText {#text} at (3,3) size 736x59 + text run at (3,3) width 720: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because" + text run at (3,23) width 570: "the border-width does not have any value to go with its pixel unit, and is therefore invalid. " + text run at (573,23) width 166: "This should cause the user" + text run at (3,43) width 265: "agent to use the default value of 'medium'." RenderBlock {P} at (4,528) size 747x20 - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." + RenderText {#text} at (0,0) size 660x19 + text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." RenderBlock {P} at (4,564) size 747x40 [color=#008000] - RenderText {#text} at (0,0) size 726x39 - text run at (0,0) width 197: "This paragraph should be green. " - text run at (197,0) width 529: "CSS is case-insensitive, unless required to be case sensitive due to interaction with other" - text run at (0,20) width 228: "standards (e.g., font names or URLs.)" + RenderText {#text} at (0,0) size 724x39 + text run at (0,0) width 207: "This paragraph should be green. " + text run at (207,0) width 517: "CSS is case-insensitive, unless required to be case sensitive due to interaction with" + text run at (0,20) width 273: "other standards (e.g., font names or URLs.)" RenderBlock {OL} at (4,620) size 747x20 RenderListItem {LI} at (40,0) size 707x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 596x19 - text run at (0,0) width 596: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." + RenderText {#text} at (0,0) size 620x19 + text run at (0,0) width 620: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." RenderBlock {P} at (4,656) size 747x40 - RenderText {#text} at (0,0) size 742x39 - text run at (0,0) width 742: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph is not" - text run at (0,20) width 80: "the first child." + RenderText {#text} at (0,0) size 738x39 + text run at (0,0) width 738: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph" + text run at (0,20) width 124: "is not the first child." RenderBlock {UL} at (4,712) size 747x40 RenderListItem {LI} at (40,0) size 707x40 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 706x39 - text run at (0,0) width 706: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to CSS2," - text run at (0,20) width 176: "the selector should not apply." + RenderText {#text} at (0,0) size 690x39 + text run at (0,0) width 690: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to" + text run at (0,20) width 228: "CSS2, the selector should not apply." RenderBlock {BLOCKQUOTE} at (44,768) size 667x40 - RenderText {#text} at (0,0) size 663x39 - text run at (0,0) width 663: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to CSS2," - text run at (0,20) width 176: "the selector should not apply." + RenderText {#text} at (0,0) size 643x39 + text run at (0,0) width 643: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to" + text run at (0,20) width 228: "CSS2, the selector should not apply." RenderBlock {P} at (4,824) size 747x40 - RenderInline {ACRONYM} at (0,0) size 720x39 - RenderText {#text} at (0,0) size 720x39 - text run at (0,0) width 720: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,20) width 103: "should not apply." + RenderInline {ACRONYM} at (0,0) size 696x39 + RenderText {#text} at (0,0) size 696x39 + text run at (0,0) width 696: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" + text run at (0,20) width 160: "selector should not apply." RenderBlock {ADDRESS} at (4,880) size 747x40 - RenderText {#text} at (0,0) size 699x39 - text run at (0,0) width 699: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,20) width 164: "selector should not apply." + RenderText {#text} at (0,0) size 745x39 + text run at (0,0) width 745: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" + text run at (0,20) width 108: "should not apply." RenderBlock {P} at (4,936) size 747x40 - RenderInline {SPAN} at (0,0) size 739x39 - RenderText {#text} at (0,0) size 739x39 - text run at (0,0) width 739: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector should" - text run at (0,20) width 60: "not apply." + RenderInline {SPAN} at (0,0) size 722x39 + RenderText {#text} at (0,0) size 722x39 + text run at (0,0) width 722: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" + text run at (0,20) width 108: "should not apply." RenderBlock {P} at (4,992) size 747x40 - RenderText {#text} at (0,0) size 747x39 - text run at (0,0) width 631: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " - text run at (631,0) width 116: "However, it is valid" - text run at (0,20) width 535: "in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." + RenderText {#text} at (0,0) size 739x39 + text run at (0,0) width 664: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " + text run at (664,0) width 75: "However, it" + text run at (0,20) width 606: "is valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." RenderBlock {P} at (4,1048) size 747x20 - RenderText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." + RenderText {#text} at (0,0) size 660x19 + text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." RenderBlock {P} at (4,1084) size 747x80 - RenderText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" + RenderText {#text} at (0,0) size 737x19 + text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" RenderInline {CODE} at (0,0) size 64x16 RenderText {#text} at (0,23) size 64x16 text run at (0,23) width 64: "diagonal" - RenderText {#text} at (64,20) size 214x19 - text run at (64,20) width 214: " is not a valid keyword, making the " + RenderText {#text} at (64,20) size 226x19 + text run at (64,20) width 226: " is not a valid keyword, making the " RenderInline {CODE} at (0,0) size 120x16 - RenderText {#text} at (278,23) size 120x16 - text run at (278,23) width 120: "text-decoration" - RenderText {#text} at (398,20) size 122x19 - text run at (398,20) width 50: " invalid. " - text run at (448,20) width 72: "In addition, " + RenderText {#text} at (290,23) size 120x16 + text run at (290,23) width 120: "text-decoration" + RenderText {#text} at (410,20) size 131x19 + text run at (410,20) width 55: " invalid. " + text run at (465,20) width 76: "In addition, " RenderInline {CODE} at (0,0) size 88x16 - RenderText {#text} at (520,23) size 88x16 - text run at (520,23) width 88: "highlighted" - RenderText {#text} at (608,20) size 731x39 - text run at (608,20) width 123: " is not a valid part of" - text run at (0,40) width 22: "the " + RenderText {#text} at (541,23) size 88x16 + text run at (541,23) width 88: "highlighted" + RenderText {#text} at (629,20) size 741x39 + text run at (629,20) width 112: " is not a valid part" + text run at (0,40) width 40: "of the " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (22,43) size 32x16 - text run at (22,43) width 32: "font" - RenderText {#text} at (54,40) size 685x39 - text run at (54,40) width 168: " property, making it invalid. " - text run at (222,40) width 463: "Therefore, this paragraph's font should be the UA default, and match the next" - text run at (0,60) width 69: "paragraph. " - text run at (69,60) width 181: "If this is not the case, then the " + RenderText {#text} at (40,43) size 32x16 + text run at (40,43) width 32: "font" + RenderText {#text} at (72,40) size 736x39 + text run at (72,40) width 178: " property, making it invalid. " + text run at (250,40) width 486: "Therefore, this paragraph's font should be the UA default, and match the next" + text run at (0,60) width 71: "paragraph. " + text run at (71,60) width 190: "If this is not the case, then the " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (250,63) size 32x16 - text run at (250,63) width 32: "font" - RenderText {#text} at (282,60) size 237x19 - text run at (282,60) width 237: " declaration is being improperly parsed." + RenderText {#text} at (261,63) size 32x16 + text run at (261,63) width 32: "font" + RenderText {#text} at (293,60) size 248x19 + text run at (293,60) width 248: " declaration is being improperly parsed." RenderBlock {P} at (4,1180) size 747x80 - RenderText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" + RenderText {#text} at (0,0) size 737x19 + text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" RenderInline {CODE} at (0,0) size 64x16 RenderText {#text} at (0,23) size 64x16 text run at (0,23) width 64: "diagonal" - RenderText {#text} at (64,20) size 214x19 - text run at (64,20) width 214: " is not a valid keyword, making the " + RenderText {#text} at (64,20) size 226x19 + text run at (64,20) width 226: " is not a valid keyword, making the " RenderInline {CODE} at (0,0) size 120x16 - RenderText {#text} at (278,23) size 120x16 - text run at (278,23) width 120: "text-decoration" - RenderText {#text} at (398,20) size 122x19 - text run at (398,20) width 50: " invalid. " - text run at (448,20) width 72: "In addition, " + RenderText {#text} at (290,23) size 120x16 + text run at (290,23) width 120: "text-decoration" + RenderText {#text} at (410,20) size 131x19 + text run at (410,20) width 55: " invalid. " + text run at (465,20) width 76: "In addition, " RenderInline {CODE} at (0,0) size 88x16 - RenderText {#text} at (520,23) size 88x16 - text run at (520,23) width 88: "highlighted" - RenderText {#text} at (608,20) size 731x39 - text run at (608,20) width 123: " is not a valid part of" - text run at (0,40) width 22: "the " + RenderText {#text} at (541,23) size 88x16 + text run at (541,23) width 88: "highlighted" + RenderText {#text} at (629,20) size 741x39 + text run at (629,20) width 112: " is not a valid part" + text run at (0,40) width 40: "of the " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (22,43) size 32x16 - text run at (22,43) width 32: "font" - RenderText {#text} at (54,40) size 711x39 - text run at (54,40) width 168: " property, making it invalid. " - text run at (222,40) width 489: "Therefore, this paragraph's font should be the UA default, and match the previous" - text run at (0,60) width 69: "paragraph. " - text run at (69,60) width 181: "If this is not the case, then the " + RenderText {#text} at (40,43) size 32x16 + text run at (40,43) width 32: "font" + RenderText {#text} at (72,40) size 705x39 + text run at (72,40) width 178: " property, making it invalid. " + text run at (250,40) width 455: "Therefore, this paragraph's font should be the UA default, and match the" + text run at (0,60) width 129: "previous paragraph. " + text run at (129,60) width 190: "If this is not the case, then the " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (250,63) size 32x16 - text run at (250,63) width 32: "font" - RenderText {#text} at (282,60) size 237x19 - text run at (282,60) width 237: " declaration is being improperly parsed." + RenderText {#text} at (319,63) size 32x16 + text run at (319,63) width 32: "font" + RenderText {#text} at (351,60) size 248x19 + text run at (351,60) width 248: " declaration is being improperly parsed." RenderBlock {P} at (4,1276) size 747x60 - RenderText {#text} at (0,0) size 503x19 - text run at (0,0) width 476: "The text of this paragraph should be normal size because the selector is invalid. " - text run at (476,0) width 27: "The " - RenderInline {EM} at (0,0) size 103x19 - RenderText {#text} at (503,0) size 103x19 - text run at (503,0) width 103: "emphasized text" - RenderText {#text} at (606,0) size 52x19 - text run at (606,0) width 52: " and the " - RenderInline {STRONG} at (0,0) size 72x19 - RenderText {#text} at (658,0) size 72x19 - text run at (658,0) width 72: "strong text" - RenderText {#text} at (0,20) size 722x39 - text run at (0,20) width 722: "within it should also be normal size, since the entire ruleset should be skipped (since in some future version of CSS, there" - text run at (0,40) width 499: "could be an operator within the selector that has higher precedence than a comma)." + RenderText {#text} at (0,0) size 530x19 + text run at (0,0) width 501: "The text of this paragraph should be normal size because the selector is invalid. " + text run at (501,0) width 29: "The " + RenderInline {EM} at (0,0) size 100x19 + RenderText {#text} at (530,0) size 100x19 + text run at (530,0) width 100: "emphasized text" + RenderText {#text} at (630,0) size 54x19 + text run at (630,0) width 54: " and the " + RenderInline {STRONG} at (0,0) size 727x39 + RenderText {#text} at (684,0) size 727x39 + text run at (684,0) width 43: "strong" + text run at (0,20) width 25: "text" + RenderText {#text} at (25,20) size 718x39 + text run at (25,20) width 693: " within it should also be normal size, since the entire ruleset should be skipped (since in some future version of" + text run at (0,40) width 592: "CSS, there could be an operator within the selector that has higher precedence than a comma)." RenderBlock {P} at (4,1352) size 747x40 - RenderText {#text} at (0,0) size 444x19 - text run at (0,0) width 444: "This paragraph should be black, because the line before the declaration is " - RenderInline {STRONG} at (0,0) size 21x19 - RenderText {#text} at (444,0) size 21x19 - text run at (444,0) width 21: "not" - RenderText {#text} at (465,0) size 713x39 - text run at (465,0) width 248: " a comment and therefore the selector for" - text run at (0,20) width 129: "P.nineteenb is invalid." + RenderText {#text} at (0,0) size 464x19 + text run at (0,0) width 464: "This paragraph should be black, because the line before the declaration is " + RenderInline {STRONG} at (0,0) size 22x19 + RenderText {#text} at (464,0) size 22x19 + text run at (464,0) width 22: "not" + RenderText {#text} at (486,0) size 743x39 + text run at (486,0) width 257: " a comment and therefore the selector for" + text run at (0,20) width 137: "P.nineteenb is invalid." RenderBlock {P} at (4,1408) size 747x20 [color=#0000FF] - RenderText {#text} at (0,0) size 444x19 - text run at (0,0) width 444: "This paragraph should be blue, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 470x19 + text run at (0,0) width 470: "This paragraph should be blue, because only the first declaration is invalid." RenderBlock {P} at (4,1444) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 478x19 + text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." RenderBlock {P} at (4,1480) size 747x20 [color=#800080] - RenderText {#text} at (0,0) size 457x19 - text run at (0,0) width 457: "This paragraph should be purple, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 483x19 + text run at (0,0) width 483: "This paragraph should be purple, because only the first declaration is invalid." RenderBlock {P} at (4,1516) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 478x19 + text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." RenderBlock {P} at (4,1552) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." + RenderText {#text} at (0,0) size 478x19 + text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." RenderBlock {P} at (4,1588) size 747x20 - RenderText {#text} at (48,0) size 571x19 - text run at (48,0) width 459: "This paragraph should be indented half an inch, but it should not be maroon. " - text run at (507,0) width 112: "It should be black." + RenderText {#text} at (48,0) size 601x19 + text run at (48,0) width 485: "This paragraph should be indented half an inch, but it should not be maroon. " + text run at (533,0) width 116: "It should be black." RenderBlock {P} at (4,1624) size 747x40 - RenderText {#text} at (0,0) size 722x39 - text run at (0,0) width 722: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of the" - text run at (0,20) width 588: "selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." + RenderText {#text} at (0,0) size 728x39 + text run at (0,0) width 728: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of" + text run at (0,20) width 639: "the selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." layer at (8,921) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,913) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/font_properties/font-expected.txt b/LayoutTests/platform/wincairo/css1/font_properties/font-expected.txt index 5d3ff8702f31..2eac9700cde5 100644 --- a/LayoutTests/platform/wincairo/css1/font_properties/font-expected.txt +++ b/LayoutTests/platform/wincairo/css1/font_properties/font-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x4401 +layer at (0,0) size 785x4293 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x4401 - RenderBlock {HTML} at (0,0) size 785x4401 - RenderBody {BODY} at (8,8) size 769x4385 [bgcolor=#CCCCCC] +layer at (0,0) size 785x4293 + RenderBlock {HTML} at (0,0) size 785x4293 + RenderBody {BODY} at (8,8) size 769x4277 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x16 - RenderText {#text} at (0,0) size 274x15 - text run at (0,0) width 274: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 264x15 + text run at (0,0) width 264: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,28) size 769x180 RenderText {#text} at (0,0) size 399x180 text run at (0,0) width 161: "BODY {font-size: 12px;}" @@ -33,56 +33,55 @@ layer at (0,0) size 785x4401 text run at (0,165) width 266: "SPAN.color {background-color: silver;}" text run at (266,165) width 0: " " RenderBlock {P} at (0,234) size 769x16 - RenderText {#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." + RenderText {#text} at (0,0) size 705x15 + text run at (0,0) width 422: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " + text run at (422,0) width 283: "This is the \"base font size\" referred to in the following tests." RenderBlock {P} at (0,267) size 769x22 - RenderText {#text} at (0,0) size 502x20 - text run at (0,0) width 502: "This element should be 13pt. Helvetica which is in small-cap italics." + RenderText {#text} at (0,0) size 495x20 + text run at (0,0) width 495: "This element should be 13pt. Helvetica which is in small-cap italics." RenderBlock {P} at (0,306) size 769x82 - RenderText {#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 152: "this more effectively." + RenderText {#text} at (0,3) size 762x74 + text run at (0,3) width 282: "This element should be in a serif font. " + text run at (282,3) width 480: "Its font-size should be 150% the base font size, and its line-height" + text run at (0,30) width 423: "should 150% of that value (18px and 27px, respectively). " + text run at (423,30) width 297: "Extra text is included for the purposes of" + text run at (0,57) width 207: "testing this more effectively." RenderBlock {P} at (0,405) size 769x82 - RenderText {#text} at (0,3) size 757x75 + RenderText {#text} at (0,3) size 760x75 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 (348,3) width 412: "Its font-size should be 150% the base font size, and" + text run at (0,30) width 568: "its line-height should 150% of that value (18px and 27px, respectively). " + text run at (568,30) width 192: "Extra text is included for" text run at (0,57) width 350: "the purposes of testing this more effectively." RenderBlock {P} at (0,504) size 769x80 - RenderText {#text} at (0,5) size 746x41 - text run at (0,5) width 601: "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 (601,5) width 145: "For example, if the font-size" - text run at (0,31) width 32: "value " + RenderText {#text} at (0,5) size 749x41 + text run at (0,5) width 619: "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 (619,5) width 130: "For example, if the font-" + text run at (0,31) width 57: "size value " RenderInline {CODE} at (0,0) size 30x12 - RenderText {#text} at (32,34) size 30x12 - text run at (32,34) width 30: "small" - RenderText {#text} at (62,31) size 769x42 - text run at (62,31) width 308: " is calculated at 10px, then the line-height should be 20px. " - text run at (370,31) width 272: "The actual value of the font-size is UA-dependent. " - text run at (642,31) width 127: "Extra text is included for" - text run at (0,58) width 238: "the purposes of testing this more effectively." + RenderText {#text} at (57,34) size 30x12 + text run at (57,34) width 30: "small" + RenderText {#text} at (87,31) size 747x42 + text run at (87,31) width 321: " is calculated at 10px, then the line-height should be 20px. " + text run at (408,31) width 274: "The actual value of the font-size is UA-dependent. " + text run at (682,31) width 65: "Extra text is" + text run at (0,58) width 307: "included for the purposes of testing this more effectively." RenderBlock {P} at (0,601) size 769x109 - RenderText {#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 (731,3) width 22: "Its" - text run at (0,30) width 749: "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 (244,57) width 476: "Extra text is included for the purposes of testing this more" - text run at (0,84) width 94: "effectively." - RenderBlock {P} at (0,727) size 769x217 - RenderText {#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 (723,16) width 22: "Its" - text run at (0,70) width 744: "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 245: "(18px and 54px, respectively). " - text run at (245,124) width 478: "Extra text is included for the purposes of testing this more" - text run at (0,178) width 94: "effectively." - RenderBlock {P} at (0,961) size 769x145 + RenderText {#text} at (0,3) size 733x102 + text run at (0,3) width 712: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900. " + text run at (712,3) width 21: "Its" + text run at (0,30) width 730: "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 234: "(18px and 27px, respectively). " + text run at (234,57) width 465: "Extra text is included for the purposes of testing this more" + text run at (0,84) width 89: "effectively." + RenderBlock {P} at (0,727) size 769x163 + RenderText {#text} at (0,16) size 766x130 + 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. " + text run at (699,16) width 67: "Its font-" + text run at (0,70) width 757: "size should be 150% the base font size, and its line-height should be 300% of that value (18px and" + text run at (0,124) width 154: "54px, respectively). " + text run at (154,124) width 556: "Extra text is included for the purposes of testing this more effectively." + RenderBlock {P} at (0,907) size 769x145 RenderText {#text} at (0,8) size 750x128 text run at (0,8) width 750: "This element should be in a monospace font, italicized and small caps, with a weight of" text run at (0,44) width 55: "900. " @@ -90,103 +89,102 @@ layer at (0,0) size 785x4401 text run at (0,80) width 618: "2em, or twice the element's font size (18px and 36px, respectively). " text run at (618,80) width 113: "Extra text is" text run at (0,116) width 499: "included for the purposes of testing this more effectively." - RenderBlock {P} at (0,1123) size 769x289 - RenderText {#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 (723,37) width 22: "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 525: "text is included for the purposes of testing this more effectively." - RenderBlock {P} at (0,1429) size 769x145 + RenderBlock {P} at (0,1069) size 769x289 + RenderText {#text} at (0,37) size 766x214 + text run at (0,37) width 699: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. " + text run at (699,37) width 67: "Its font-" + text run at (0,133) width 631: "size should be 150% the base font size, or 18px, and its line-height should be 1in. " + text run at (631,133) width 99: "Extra text is" + text run at (0,229) width 452: "included for the purposes of testing this more effectively." + RenderBlock {P} at (0,1375) size 769x145 RenderText {#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 (40,43) width 665: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" + text run at (0,79) width 176: "element's font size). " + text run at (176,79) width 500: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." - RenderBlock {P} at (0,1591) size 769x51 - RenderText {#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." - RenderBlock {P} at (0,1659) size 769x271 - RenderInline {SPAN} at (0,0) size 761x238 [bgcolor=#C0C0C0] - RenderText {#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. " - text run at (723,16) width 22: "Its" - text run at (0,70) width 744: "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 761: "(18px and 54px, respectively). The text should have a silver background. The background color" - 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." + RenderBlock {P} at (0,1537) size 769x51 + RenderText {#text} at (0,6) size 754x38 + text run at (0,6) width 301: "This element should be in a sans-serif font, with a weight of 400. " + text run at (301,6) width 453: "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 317: "Extra text is included for the purposes of testing this more effectively." + RenderBlock {P} at (0,1605) size 769x217 + RenderInline {SPAN} at (0,0) size 766x184 [bgcolor=#C0C0C0] + RenderText {#text} at (0,16) size 766x184 + 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. " + text run at (699,16) width 67: "Its font-" + text run at (0,70) width 757: "size should be 150% the base font size, and its line-height should be 300% of that value (18px and" + text run at (0,124) width 748: "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." RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,1947) size 769x2438 [border: (1px outset #808080)] + RenderTable {TABLE} at (0,1839) size 769x2438 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x2436 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x2408 RenderTableCell {TD} at (0,1217) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x2408 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x40 - RenderText {#text} at (0,0) size 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." + RenderText {#text} at (0,0) size 731x39 + text run at (0,0) width 563: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " + text run at (563,0) width 168: "This is the \"base font size\"" + text run at (0,20) width 204: "referred to in the following tests." RenderBlock {P} at (4,61) size 747x22 - RenderText {#text} at (0,0) size 502x20 - text run at (0,0) width 502: "This element should be 13pt. Helvetica which is in small-cap italics." + RenderText {#text} at (0,0) size 495x20 + text run at (0,0) width 495: "This element should be 13pt. Helvetica which is in small-cap italics." RenderBlock {P} at (4,106) size 747x145 - RenderText {#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" + RenderText {#text} at (0,4) size 735x135 + text run at (0,4) width 374: "This element should be in a serif font. " + text run at (374,4) width 361: "Its font-size should be 150% the base" + text run at (0,40) width 694: "font size, and its line-height should 150% of that value (18px and 27px," + text run at (0,76) width 138: "respectively). " + text run at (138,76) width 563: "Extra text is included for the purposes of testing this more" text run at (0,112) width 109: "effectively." RenderBlock {P} at (4,274) size 747x145 - RenderText {#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 432: "purposes of testing this more effectively." + RenderText {#text} at (0,4) size 733x135 + text run at (0,4) width 461: "This element should be in a sans-serif font. " + text run at (461,4) width 232: "Its font-size should be" + text run at (0,40) width 733: "150% the base font size, and its line-height should 150% of that value" + text run at (0,76) width 324: "(18px and 27px, respectively). " + text run at (324,76) width 399: "Extra text is included for the purposes" + text run at (0,112) width 319: "of testing this more effectively." RenderBlock {P} at (4,442) size 747x80 - RenderText {#text} at (0,5) size 746x41 - text run at (0,5) width 601: "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 (601,5) width 145: "For example, if the font-size" - text run at (0,31) width 32: "value " + RenderText {#text} at (0,5) size 720x41 + text run at (0,5) width 619: "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 (619,5) width 101: "For example, if the" + text run at (0,31) width 83: "font-size value " RenderInline {CODE} at (0,0) size 30x12 - RenderText {#text} at (32,34) size 30x12 - text run at (32,34) width 30: "small" - RenderText {#text} at (62,31) size 702x42 - text run at (62,31) width 308: " is calculated at 10px, then the line-height should be 20px. " - text run at (370,31) width 272: "The actual value of the font-size is UA-dependent. " - text run at (642,31) width 60: "Extra text is" - text run at (0,58) width 305: "included for the purposes of testing this more effectively." + RenderText {#text} at (83,34) size 30x12 + text run at (83,34) width 30: "small" + RenderText {#text} at (113,31) size 737x42 + text run at (113,31) width 321: " is calculated at 10px, then the line-height should be 20px. " + text run at (434,31) width 274: "The actual value of the font-size is UA-dependent. " + text run at (708,31) width 29: "Extra" + text run at (0,58) width 343: "text is included for the purposes of testing this more effectively." RenderBlock {P} at (4,545) size 747x181 - RenderText {#text} at (0,4) size 719x172 - text run at (0,4) width 716: "This element should be in a sans-serif font, italicized and small caps," + RenderText {#text} at (0,4) size 721x172 + text run at (0,4) width 713: "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 670: "and its line-height should be 150% of that value (18px and 27px," - text run at (0,112) width 148: "respectively). " - text run at (148,112) width 561: "Extra text is included for the purposes of testing this" - text run at (0,148) width 177: "more effectively." + text run at (226,40) width 495: "Its font-size should be 150% the base font size," + text run at (0,76) width 669: "and its line-height should be 150% of that value (18px and 27px," + text run at (0,112) width 147: "respectively). " + text run at (147,112) width 561: "Extra text is included for the purposes of testing this" + text run at (0,148) width 175: "more effectively." RenderBlock {P} at (4,749) size 747x361 - RenderText {#text} at (0,22) size 717x316 - text run at (0,22) width 702: "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 663: "and its line-height should be 300% of that value (18px and 54px," - text run at (0,238) width 147: "respectively). " - text run at (147,238) width 559: "Extra text is included for the purposes of testing this" - text run at (0,310) width 175: "more effectively." + RenderText {#text} at (0,22) size 716x316 + 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 225: "with a weight of 100. " + text run at (225,94) width 491: "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 (146,238) width 559: "Extra text is included for the purposes of testing this" + text run at (0,310) width 174: "more effectively." RenderBlock {P} at (4,1133) size 747x157 RenderText {#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" @@ -196,36 +194,36 @@ layer at (0,0) size 785x4401 text run at (0,125) width 636: "Extra text is included for the purposes of testing this more effectively." RenderBlock {P} at (4,1313) size 747x385 RenderText {#text} at (0,34) size 739x316 - text run at (0,34) width 702: "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,34) width 701: "This element should be in a sans-serif font, italicized and small caps," + text run at (0,130) width 225: "with a weight of 500. " + text run at (225,130) width 491: "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 428: "purposes of testing this more effectively." + text run at (0,322) width 427: "purposes of testing this more effectively." RenderBlock {P} at (4,1721) size 747x145 RenderText {#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 (62,43) width 665: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" + text run at (0,79) width 176: "element's font size). " + text run at (176,79) width 500: "Extra text is included for the purposes of testing this more" text run at (0,115) width 92: "effectively." RenderBlock {P} at (4,1883) size 747x65 - RenderText {#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." + RenderText {#text} at (0,8) size 714x48 + text run at (0,8) width 378: "This element should be in a sans-serif font, with a weight of 400. " + text run at (378,8) width 336: "Its font-size should be 80% of 12px, or 9.6px, and its line-" + text run at (0,40) width 235: "height shoud be 2.5 times that, or 24px. " + text run at (235,40) width 403: "Extra text is included for the purposes of testing this more effectively." RenderBlock {P} at (4,1971) size 747x433 - RenderInline {SPAN} at (0,0) size 717x388 [bgcolor=#C0C0C0] - RenderText {#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," - 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 663: "and its line-height should be 300% of that value (18px and 54px," - text run at (0,238) width 624: "respectively). The text should have a silver background. The" - text run at (0,310) width 643: "background color has been set on an inline element and should" - text run at (0,382) width 581: "therefore only cover the text, not the interline spacing." + RenderInline {SPAN} at (0,0) size 747x388 [bgcolor=#C0C0C0] + RenderText {#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 225: "with a weight of 100. " + text run at (225,94) width 491: "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." RenderText {#text} at (0,0) size 0x0 layer at (8,228) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,220) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/font_properties/font_size-expected.txt b/LayoutTests/platform/wincairo/css1/font_properties/font_size-expected.txt index 1757a099fe72..f9c6bebd229d 100644 --- a/LayoutTests/platform/wincairo/css1/font_properties/font_size-expected.txt +++ b/LayoutTests/platform/wincairo/css1/font_properties/font_size-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x2821 +layer at (0,0) size 785x2878 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2821 - RenderBlock {HTML} at (0,0) size 785x2821 - RenderBody {BODY} at (8,8) size 769x2805 [bgcolor=#CCCCCC] +layer at (0,0) size 785x2878 + RenderBlock {HTML} at (0,0) size 785x2878 + RenderBody {BODY} at (8,8) size 769x2862 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x320 RenderText {#text} at (0,0) size 224x320 text run at (0,0) width 200: ".one {font-size: medium;}" @@ -48,210 +48,212 @@ layer at (0,0) size 785x2821 text run at (184,288) width 0: " " text run at (0,304) width 0: " " RenderBlock {P} at (0,387) size 769x20 - RenderText {#text} at (0,0) size 648x19 - text run at (0,0) width 648: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." + RenderText {#text} at (0,0) size 688x19 + text run at (0,0) width 688: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." RenderBlock {P} at (0,423) size 769x20 - RenderText {#text} at (0,0) size 179x19 - text run at (0,0) width 179: "This sentence has been set to " + RenderText {#text} at (0,0) size 186x19 + text run at (0,0) width 186: "This sentence has been set to " RenderInline {CODE} at (0,0) size 48x16 - RenderText {#text} at (179,3) size 48x16 - text run at (179,3) width 48: "medium" - RenderText {#text} at (227,0) size 343x19 - text run at (227,0) width 343: ", which may or may not be the same size as unstyled text." + RenderText {#text} at (186,3) size 48x16 + text run at (186,3) width 48: "medium" + RenderText {#text} at (234,0) size 361x19 + text run at (234,0) width 361: ", which may or may not be the same size as unstyled text." RenderBlock {P} at (0,462) size 769x23 - RenderText {#text} at (0,0) size 366x21 - text run at (0,0) width 366: "This sentence should be larger than unstyled text." + RenderText {#text} at (0,0) size 377x21 + text run at (0,0) width 377: "This sentence should be larger than unstyled text." RenderBlock {P} at (0,503) size 769x17 - RenderText {#text} at (0,0) size 273x15 - text run at (0,0) width 273: "This sentence should be smaller than unstyled text." + RenderText {#text} at (0,0) size 276x15 + text run at (0,0) width 276: "This sentence should be smaller than unstyled text." RenderBlock {P} at (0,532) size 769x21 - RenderText {#text} at (0,5) size 303x12 - text run at (0,5) width 303: "This sentence should be very small, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (303,0) size 47x19 - text run at (303,0) width 47: "medium" - RenderText {#text} at (350,5) size 2x12 - text run at (350,5) width 2: "." + RenderText {#text} at (0,5) size 305x12 + text run at (0,5) width 305: "This sentence should be very small, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (305,0) size 51x19 + text run at (305,0) width 51: "medium" + RenderText {#text} at (356,5) size 2x12 + text run at (356,5) width 2: "." RenderBlock {P} at (0,562) size 769x21 - RenderText {#text} at (0,5) size 328x12 - text run at (0,5) width 328: "This sentence should be rather small, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (328,0) size 47x19 - text run at (328,0) width 47: "medium" - RenderText {#text} at (375,5) size 3x12 - text run at (375,5) width 3: "." + RenderText {#text} at (0,5) size 327x12 + text run at (0,5) width 327: "This sentence should be rather small, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (327,0) size 51x19 + text run at (327,0) width 51: "medium" + RenderText {#text} at (378,5) size 3x12 + text run at (378,5) width 3: "." RenderBlock {P} at (0,595) size 769x21 - RenderText {#text} at (0,3) size 400x15 - text run at (0,3) width 400: "This sentence should be small, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (400,0) size 47x19 - text run at (400,0) width 47: "medium" - RenderText {#text} at (447,3) size 3x15 - text run at (447,3) width 3: "." + RenderText {#text} at (0,3) size 401x15 + text run at (0,3) width 401: "This sentence should be small, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (401,0) size 51x19 + text run at (401,0) width 51: "medium" + RenderText {#text} at (452,3) size 3x15 + text run at (452,3) width 3: "." RenderBlock {P} at (0,633) size 769x22 - RenderText {#text} at (0,0) size 534x20 - text run at (0,0) width 534: "This sentence should be large, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (534,1) size 47x19 - text run at (534,1) width 47: "medium" - RenderText {#text} at (581,0) size 5x20 - text run at (581,0) width 5: "." + RenderText {#text} at (0,0) size 540x20 + text run at (0,0) width 540: "This sentence should be large, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (540,1) size 51x19 + text run at (540,1) width 51: "medium" + RenderText {#text} at (591,0) size 5x20 + text run at (591,0) width 5: "." RenderBlock {P} at (0,678) size 769x57 - RenderText {#text} at (0,0) size 766x27 - text run at (0,0) width 766: "This sentence should be rather large, but the last word in the sentence should be" - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (0,34) size 47x19 - text run at (0,34) width 47: "medium" - RenderText {#text} at (47,28) size 6x27 - text run at (47,28) width 6: "." + RenderText {#text} at (0,0) size 745x55 + text run at (0,0) width 745: "This sentence should be rather large, but the last word in the sentence should" + text run at (0,28) width 29: "be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (29,34) size 51x19 + text run at (29,34) width 51: "medium" + RenderText {#text} at (80,28) size 6x27 + text run at (80,28) width 6: "." RenderBlock {P} at (0,766) size 769x75 - RenderText {#text} at (0,0) size 735x73 - text run at (0,0) width 735: "This sentence should be very large, but the last word in the" - text run at (0,37) width 242: "sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (242,50) size 47x19 - text run at (242,50) width 47: "medium" - RenderText {#text} at (289,37) size 8x36 - text run at (289,37) width 8: "." - RenderBlock {P} at (0,888) size 769x58 - RenderText {#text} at (0,1) size 763x55 - text run at (0,1) width 763: "This sentence should be half an inch tall." - RenderBlock {P} at (0,993) size 769x46 - RenderText {#text} at (0,1) size 671x43 - text run at (0,1) width 671: "This sentence should be one centimeter tall." - RenderBlock {P} at (0,1076) size 769x46 - RenderText {#text} at (0,1) size 678x43 - text run at (0,1) width 678: "This sentence should be ten millimeters tall." - RenderBlock {P} at (0,1159) size 769x29 - RenderText {#text} at (0,0) size 422x27 - text run at (0,0) width 422: "This sentence should be eighteen points tall." - RenderBlock {P} at (0,1211) size 769x29 - RenderText {#text} at (0,0) size 492x27 - text run at (0,0) width 492: "This sentence should be one and one half picas tall." - RenderBlock {P} at (0,1271) size 769x38 - RenderText {#text} at (0,0) size 454x36 - text run at (0,0) width 454: "This sentence should be two em tall." - RenderBlock {P} at (0,1340) size 769x25 - RenderText {#text} at (0,0) size 303x23 - text run at (0,0) width 303: "This sentence should be three ex tall." - RenderBlock {P} at (0,1389) size 769x31 - RenderText {#text} at (0,0) size 467x29 - text run at (0,0) width 467: "This sentence should be twenty-five pixels tall." - RenderBlock {P} at (0,1451) size 769x38 - RenderText {#text} at (0,0) size 533x36 - text run at (0,0) width 533: "This sentence should be twice normal size." - RenderBlock {P} at (0,1520) size 769x21 - RenderText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." - RenderTable {TABLE} at (0,1556) size 769x1249 [border: (1px outset #808080)] + RenderText {#text} at (0,0) size 751x73 + text run at (0,0) width 751: "This sentence should be very large, but the last word in the" + text run at (0,37) width 248: "sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (248,50) size 51x19 + text run at (248,50) width 51: "medium" + RenderText {#text} at (299,37) size 8x36 + text run at (299,37) width 8: "." + RenderBlock {P} at (0,888) size 769x115 + RenderText {#text} at (0,1) size 695x112 + text run at (0,1) width 695: "This sentence should be half an inch" + text run at (0,58) width 72: "tall." + RenderBlock {P} at (0,1050) size 769x46 + RenderText {#text} at (0,1) size 676x43 + text run at (0,1) width 676: "This sentence should be one centimeter tall." + RenderBlock {P} at (0,1133) size 769x46 + RenderText {#text} at (0,1) size 682x43 + text run at (0,1) width 682: "This sentence should be ten millimeters tall." + RenderBlock {P} at (0,1216) size 769x29 + RenderText {#text} at (0,0) size 430x27 + text run at (0,0) width 430: "This sentence should be eighteen points tall." + RenderBlock {P} at (0,1268) size 769x29 + RenderText {#text} at (0,0) size 499x27 + text run at (0,0) width 499: "This sentence should be one and one half picas tall." + RenderBlock {P} at (0,1328) size 769x38 + RenderText {#text} at (0,0) size 465x36 + text run at (0,0) width 465: "This sentence should be two em tall." + RenderBlock {P} at (0,1397) size 769x25 + RenderText {#text} at (0,0) size 312x23 + text run at (0,0) width 312: "This sentence should be three ex tall." + RenderBlock {P} at (0,1446) size 769x31 + RenderText {#text} at (0,0) size 476x29 + text run at (0,0) width 476: "This sentence should be twenty-five pixels tall." + RenderBlock {P} at (0,1508) size 769x38 + RenderText {#text} at (0,0) size 546x36 + text run at (0,0) width 546: "This sentence should be twice normal size." + RenderBlock {P} at (0,1577) size 769x21 + RenderText {#text} at (0,0) size 673x19 + text run at (0,0) width 673: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." + RenderTable {TABLE} at (0,1613) size 769x1249 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x1247 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x1219 RenderTableCell {TD} at (0,623) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x1219 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 648x19 - text run at (0,0) width 648: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." + RenderText {#text} at (0,0) size 688x19 + text run at (0,0) width 688: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." RenderBlock {P} at (4,40) size 747x20 - RenderText {#text} at (0,0) size 179x19 - text run at (0,0) width 179: "This sentence has been set to " + RenderText {#text} at (0,0) size 186x19 + text run at (0,0) width 186: "This sentence has been set to " RenderInline {CODE} at (0,0) size 48x16 - RenderText {#text} at (179,3) size 48x16 - text run at (179,3) width 48: "medium" - RenderText {#text} at (227,0) size 343x19 - text run at (227,0) width 343: ", which may or may not be the same size as unstyled text." + RenderText {#text} at (186,3) size 48x16 + text run at (186,3) width 48: "medium" + RenderText {#text} at (234,0) size 361x19 + text run at (234,0) width 361: ", which may or may not be the same size as unstyled text." RenderBlock {P} at (4,79) size 747x23 - RenderText {#text} at (0,0) size 366x21 - text run at (0,0) width 366: "This sentence should be larger than unstyled text." + RenderText {#text} at (0,0) size 377x21 + text run at (0,0) width 377: "This sentence should be larger than unstyled text." RenderBlock {P} at (4,120) size 747x17 - RenderText {#text} at (0,0) size 273x15 - text run at (0,0) width 273: "This sentence should be smaller than unstyled text." + RenderText {#text} at (0,0) size 276x15 + text run at (0,0) width 276: "This sentence should be smaller than unstyled text." RenderBlock {P} at (4,149) size 747x21 - RenderText {#text} at (0,5) size 303x12 - text run at (0,5) width 303: "This sentence should be very small, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (303,0) size 47x19 - text run at (303,0) width 47: "medium" - RenderText {#text} at (350,5) size 2x12 - text run at (350,5) width 2: "." + RenderText {#text} at (0,5) size 305x12 + text run at (0,5) width 305: "This sentence should be very small, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (305,0) size 51x19 + text run at (305,0) width 51: "medium" + RenderText {#text} at (356,5) size 2x12 + text run at (356,5) width 2: "." RenderBlock {P} at (4,179) size 747x21 - RenderText {#text} at (0,5) size 328x12 - text run at (0,5) width 328: "This sentence should be rather small, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (328,0) size 47x19 - text run at (328,0) width 47: "medium" - RenderText {#text} at (375,5) size 3x12 - text run at (375,5) width 3: "." + RenderText {#text} at (0,5) size 327x12 + text run at (0,5) width 327: "This sentence should be rather small, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (327,0) size 51x19 + text run at (327,0) width 51: "medium" + RenderText {#text} at (378,5) size 3x12 + text run at (378,5) width 3: "." RenderBlock {P} at (4,212) size 747x21 - RenderText {#text} at (0,3) size 400x15 - text run at (0,3) width 400: "This sentence should be small, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (400,0) size 47x19 - text run at (400,0) width 47: "medium" - RenderText {#text} at (447,3) size 3x15 - text run at (447,3) width 3: "." + RenderText {#text} at (0,3) size 401x15 + text run at (0,3) width 401: "This sentence should be small, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (401,0) size 51x19 + text run at (401,0) width 51: "medium" + RenderText {#text} at (452,3) size 3x15 + text run at (452,3) width 3: "." RenderBlock {P} at (4,250) size 747x22 - RenderText {#text} at (0,0) size 534x20 - text run at (0,0) width 534: "This sentence should be large, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (534,1) size 47x19 - text run at (534,1) width 47: "medium" - RenderText {#text} at (581,0) size 5x20 - text run at (581,0) width 5: "." + RenderText {#text} at (0,0) size 540x20 + text run at (0,0) width 540: "This sentence should be large, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (540,1) size 51x19 + text run at (540,1) width 51: "medium" + RenderText {#text} at (591,0) size 5x20 + text run at (591,0) width 5: "." RenderBlock {P} at (4,295) size 747x57 - RenderText {#text} at (0,0) size 737x55 - text run at (0,0) width 737: "This sentence should be rather large, but the last word in the sentence should" + RenderText {#text} at (0,0) size 745x55 + text run at (0,0) width 745: "This sentence should be rather large, but the last word in the sentence should" text run at (0,28) width 29: "be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (29,34) size 47x19 - text run at (29,34) width 47: "medium" - RenderText {#text} at (76,28) size 6x27 - text run at (76,28) width 6: "." + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (29,34) size 51x19 + text run at (29,34) width 51: "medium" + RenderText {#text} at (80,28) size 6x27 + text run at (80,28) width 6: "." RenderBlock {P} at (4,383) size 747x75 - RenderText {#text} at (0,0) size 735x73 - text run at (0,0) width 735: "This sentence should be very large, but the last word in the" - text run at (0,37) width 242: "sentence should be " - RenderInline {SPAN} at (0,0) size 47x19 - RenderText {#text} at (242,50) size 47x19 - text run at (242,50) width 47: "medium" - RenderText {#text} at (289,37) size 8x36 - text run at (289,37) width 8: "." + RenderText {#text} at (0,0) size 704x73 + text run at (0,0) width 704: "This sentence should be very large, but the last word in" + text run at (0,37) width 295: "the sentence should be " + RenderInline {SPAN} at (0,0) size 51x19 + RenderText {#text} at (295,50) size 51x19 + text run at (295,50) width 51: "medium" + RenderText {#text} at (346,37) size 8x36 + text run at (346,37) width 8: "." RenderBlock {P} at (4,505) size 747x115 - RenderText {#text} at (0,1) size 681x112 - text run at (0,1) width 681: "This sentence should be half an inch" - text run at (0,58) width 70: "tall." + RenderText {#text} at (0,1) size 695x112 + text run at (0,1) width 695: "This sentence should be half an inch" + text run at (0,58) width 72: "tall." RenderBlock {P} at (4,667) size 747x46 - RenderText {#text} at (0,1) size 671x43 - text run at (0,1) width 671: "This sentence should be one centimeter tall." + RenderText {#text} at (0,1) size 676x43 + text run at (0,1) width 676: "This sentence should be one centimeter tall." RenderBlock {P} at (4,750) size 747x46 - RenderText {#text} at (0,1) size 678x43 - text run at (0,1) width 678: "This sentence should be ten millimeters tall." + RenderText {#text} at (0,1) size 682x43 + text run at (0,1) width 682: "This sentence should be ten millimeters tall." RenderBlock {P} at (4,833) size 747x29 - RenderText {#text} at (0,0) size 422x27 - text run at (0,0) width 422: "This sentence should be eighteen points tall." + RenderText {#text} at (0,0) size 430x27 + text run at (0,0) width 430: "This sentence should be eighteen points tall." RenderBlock {P} at (4,885) size 747x29 - RenderText {#text} at (0,0) size 492x27 - text run at (0,0) width 492: "This sentence should be one and one half picas tall." + RenderText {#text} at (0,0) size 499x27 + text run at (0,0) width 499: "This sentence should be one and one half picas tall." RenderBlock {P} at (4,945) size 747x38 - RenderText {#text} at (0,0) size 454x36 - text run at (0,0) width 454: "This sentence should be two em tall." + RenderText {#text} at (0,0) size 465x36 + text run at (0,0) width 465: "This sentence should be two em tall." RenderBlock {P} at (4,1014) size 747x25 - RenderText {#text} at (0,0) size 303x23 - text run at (0,0) width 303: "This sentence should be three ex tall." + RenderText {#text} at (0,0) size 312x23 + text run at (0,0) width 312: "This sentence should be three ex tall." RenderBlock {P} at (4,1063) size 747x31 - RenderText {#text} at (0,0) size 467x29 - text run at (0,0) width 467: "This sentence should be twenty-five pixels tall." + RenderText {#text} at (0,0) size 476x29 + text run at (0,0) width 476: "This sentence should be twenty-five pixels tall." RenderBlock {P} at (4,1125) size 747x38 - RenderText {#text} at (0,0) size 533x36 - text run at (0,0) width 533: "This sentence should be twice normal size." + RenderText {#text} at (0,0) size 546x36 + text run at (0,0) width 546: "This sentence should be twice normal size." RenderBlock {P} at (4,1194) size 747x21 - RenderText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." + RenderText {#text} at (0,0) size 673x19 + text run at (0,0) width 673: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." layer at (8,377) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,369) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/font_properties/font_style-expected.txt b/LayoutTests/platform/wincairo/css1/font_properties/font_style-expected.txt index 95ced4a2c23e..e783f95cc6e8 100644 --- a/LayoutTests/platform/wincairo/css1/font_properties/font_style-expected.txt +++ b/LayoutTests/platform/wincairo/css1/font_properties/font_style-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x64 RenderText {#text} at (0,0) size 248x64 text run at (0,0) width 208: ".one {font-style: italic;}" @@ -16,48 +16,48 @@ layer at (0,0) size 800x600 text run at (248,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 784x20 - RenderText {#text} at (0,0) size 508x19 - text run at (0,0) width 508: "This paragraph should be in italics, but the last word of the sentence should be " - RenderInline {SPAN} at (0,0) size 41x19 - RenderText {#text} at (508,0) size 41x19 - text run at (508,0) width 41: "normal" - RenderText {#text} at (549,0) size 4x19 - text run at (549,0) width 4: "." + RenderText {#text} at (0,0) size 501x19 + text run at (0,0) width 501: "This paragraph should be in italics, but the last word of the sentence should be " + RenderInline {SPAN} at (0,0) size 44x19 + RenderText {#text} at (501,0) size 44x19 + text run at (501,0) width 44: "normal" + RenderText {#text} at (545,0) size 4x19 + text run at (545,0) width 4: "." RenderBlock {P} at (0,167) size 784x20 RenderText {#text} at (0,0) size 219x19 text run at (0,0) width 219: "This paragraph should be oblique." RenderBlock {P} at (0,203) size 784x20 - RenderInline {I} at (0,0) size 201x19 - RenderText {#text} at (0,0) size 201x19 - text run at (0,0) width 201: "This paragraph should be normal." + RenderInline {I} at (0,0) size 212x19 + RenderText {#text} at (0,0) size 212x19 + text run at (0,0) width 212: "This paragraph should be normal." RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,239) size 575x130 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 573x128 - RenderTableRow {TR} at (0,0) size 573x28 - RenderTableCell {TD} at (0,0) size 573x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 573x100 + RenderTable {TABLE} at (0,239) size 571x130 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 569x128 + RenderTableRow {TR} at (0,0) size 569x28 + RenderTableCell {TD} at (0,0) size 569x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 569x100 RenderTableCell {TD} at (0,64) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 561x100 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 553x20 - RenderText {#text} at (0,0) size 508x19 - text run at (0,0) width 508: "This paragraph should be in italics, but the last word of the sentence should be " - RenderInline {SPAN} at (0,0) size 41x19 - RenderText {#text} at (508,0) size 41x19 - text run at (508,0) width 41: "normal" - RenderText {#text} at (549,0) size 4x19 - text run at (549,0) width 4: "." - RenderBlock {P} at (4,40) size 553x20 + RenderTableCell {TD} at (12,28) size 557x100 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 549x20 + RenderText {#text} at (0,0) size 501x19 + text run at (0,0) width 501: "This paragraph should be in italics, but the last word of the sentence should be " + RenderInline {SPAN} at (0,0) size 44x19 + RenderText {#text} at (501,0) size 44x19 + text run at (501,0) width 44: "normal" + RenderText {#text} at (545,0) size 4x19 + text run at (545,0) width 4: "." + RenderBlock {P} at (4,40) size 549x20 RenderText {#text} at (0,0) size 219x19 text run at (0,0) width 219: "This paragraph should be oblique." - RenderBlock {P} at (4,76) size 553x20 - RenderInline {I} at (0,0) size 201x19 - RenderText {#text} at (0,0) size 201x19 - text run at (0,0) width 201: "This paragraph should be normal." + RenderBlock {P} at (4,76) size 549x20 + RenderInline {I} at (0,0) size 212x19 + RenderText {#text} at (0,0) size 212x19 + text run at (0,0) width 212: "This paragraph should be normal." RenderText {#text} at (0,0) size 0x0 layer at (8,121) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/font_properties/font_variant-expected.txt b/LayoutTests/platform/wincairo/css1/font_properties/font_variant-expected.txt index e8eb06ffb026..1a0dd932f7f2 100644 --- a/LayoutTests/platform/wincairo/css1/font_properties/font_variant-expected.txt +++ b/LayoutTests/platform/wincairo/css1/font_properties/font_variant-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x48 RenderText {#text} at (0,0) size 256x48 text run at (0,0) width 256: ".one {font-variant: small-caps;}" @@ -14,38 +14,38 @@ layer at (0,0) size 800x600 text run at (224,16) width 0: " " text run at (0,32) width 0: " " RenderBlock {P} at (0,115) size 784x20 - RenderText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This Paragraph should be in Small Caps." + RenderText {#text} at (0,0) size 268x19 + text run at (0,0) width 268: "This Paragraph should be in Small Caps." RenderBlock {P} at (0,151) size 784x20 - RenderText {#text} at (0,0) size 573x19 - text run at (0,0) width 573: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - RenderInline {SPAN} at (0,0) size 46x19 - RenderText {#text} at (573,0) size 46x19 - text run at (573,0) width 46: "Normal" - RenderText {#text} at (619,0) size 4x19 - text run at (619,0) width 4: "." - RenderTable {TABLE} at (0,187) size 645x94 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 643x92 - RenderTableRow {TR} at (0,0) size 643x28 - RenderTableCell {TD} at (0,0) size 643x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 643x64 + RenderText {#text} at (0,0) size 574x19 + text run at (0,0) width 574: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " + RenderInline {SPAN} at (0,0) size 48x19 + RenderText {#text} at (574,0) size 48x19 + text run at (574,0) width 48: "Normal" + RenderText {#text} at (622,0) size 4x19 + text run at (622,0) width 4: "." + RenderTable {TABLE} at (0,187) size 648x94 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 646x92 + RenderTableRow {TR} at (0,0) size 646x28 + RenderTableCell {TD} at (0,0) size 646x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 646x64 RenderTableCell {TD} at (0,46) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 631x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 623x20 - RenderText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This Paragraph should be in Small Caps." - RenderBlock {P} at (4,40) size 623x20 - RenderText {#text} at (0,0) size 573x19 - text run at (0,0) width 573: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - RenderInline {SPAN} at (0,0) size 46x19 - RenderText {#text} at (573,0) size 46x19 - text run at (573,0) width 46: "Normal" - RenderText {#text} at (619,0) size 4x19 - text run at (619,0) width 4: "." + RenderTableCell {TD} at (12,28) size 634x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 626x20 + RenderText {#text} at (0,0) size 268x19 + text run at (0,0) width 268: "This Paragraph should be in Small Caps." + RenderBlock {P} at (4,40) size 626x20 + RenderText {#text} at (0,0) size 574x19 + text run at (0,0) width 574: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " + RenderInline {SPAN} at (0,0) size 48x19 + RenderText {#text} at (574,0) size 48x19 + text run at (574,0) width 48: "Normal" + RenderText {#text} at (622,0) size 4x19 + text run at (622,0) width 4: "." layer at (8,105) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,97) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/font_properties/font_weight-expected.txt b/LayoutTests/platform/wincairo/css1/font_properties/font_weight-expected.txt index 6bc9cd054df9..bceec65573a6 100644 --- a/LayoutTests/platform/wincairo/css1/font_properties/font_weight-expected.txt +++ b/LayoutTests/platform/wincairo/css1/font_properties/font_weight-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1105 RenderBlock {HTML} at (0,0) size 785x1105 RenderBody {BODY} at (8,8) size 769x1089 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x176 RenderText {#text} at (0,0) size 240x176 text run at (0,0) width 200: ".one {font-weight: bold;}" @@ -30,96 +30,96 @@ layer at (0,0) size 785x1105 text run at (200,144) width 0: " " text run at (0,160) width 0: " " RenderBlock {P} at (0,243) size 769x20 - RenderText {#text} at (0,0) size 195x19 - text run at (0,0) width 195: "This sentence should be bold." + RenderText {#text} at (0,0) size 198x19 + text run at (0,0) width 198: "This sentence should be bold." RenderBlock {P} at (0,279) size 769x20 - RenderText {#text} at (0,0) size 292x19 - text run at (0,0) width 292: "This sentence should be bolder than normal." + RenderText {#text} at (0,0) size 300x19 + text run at (0,0) width 300: "This sentence should be bolder than normal." RenderBlock {H4} at (0,320) size 769x21 - RenderText {#text} at (0,0) size 129x19 - text run at (0,0) width 129: "This is a heading-4." + RenderText {#text} at (0,0) size 131x19 + text run at (0,0) width 131: "This is a heading-4." RenderBlock {H4} at (0,361) size 769x21 - RenderText {#text} at (0,0) size 175x19 - text run at (0,0) width 175: "This is a bolder heading-4." + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "This is a bolder heading-4." RenderBlock {P} at (0,402) size 769x21 - RenderInline {B} at (0,0) size 335x19 - RenderText {#text} at (0,0) size 335x19 - text run at (0,0) width 335: "This sentence should be normal (boldface made lighter)." + RenderInline {B} at (0,0) size 353x19 + RenderText {#text} at (0,0) size 353x19 + text run at (0,0) width 353: "This sentence should be normal (boldface made lighter)." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,438) size 769x21 - RenderText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 100." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "This sentence should be weight 100." RenderBlock {P} at (0,474) size 769x21 - RenderText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 300." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "This sentence should be weight 300." RenderBlock {P} at (0,510) size 769x21 - RenderText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 500." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "This sentence should be weight 500." RenderBlock {P} at (0,546) size 769x21 - RenderText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "This sentence should be weight 700." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This sentence should be weight 700." RenderBlock {P} at (0,582) size 769x21 - RenderText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "This sentence should be weight 900." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This sentence should be weight 900." RenderBlock {P} at (0,618) size 769x21 - RenderText {#text} at (0,0) size 484x19 - text run at (0,0) width 484: "This sentence should be bold, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 41x19 - RenderText {#text} at (484,0) size 41x19 - text run at (484,0) width 41: "normal" - RenderText {#text} at (525,0) size 4x19 - text run at (525,0) width 4: "." - RenderTable {TABLE} at (0,654) size 551x435 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 549x432 - RenderTableRow {TR} at (0,0) size 549x28 - RenderTableCell {TD} at (0,0) size 549x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 549x404 + RenderText {#text} at (0,0) size 493x19 + text run at (0,0) width 493: "This sentence should be bold, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 44x19 + RenderText {#text} at (493,0) size 44x19 + text run at (493,0) width 44: "normal" + RenderText {#text} at (537,0) size 4x19 + text run at (537,0) width 4: "." + RenderTable {TABLE} at (0,654) size 563x435 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 561x432 + RenderTableRow {TR} at (0,0) size 561x28 + RenderTableCell {TD} at (0,0) size 561x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 561x404 RenderTableCell {TD} at (0,215) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 537x404 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 529x20 - RenderText {#text} at (0,0) size 195x19 - text run at (0,0) width 195: "This sentence should be bold." - RenderBlock {P} at (4,40) size 529x20 - RenderText {#text} at (0,0) size 292x19 - text run at (0,0) width 292: "This sentence should be bolder than normal." - RenderBlock {H4} at (4,81) size 529x21 - RenderText {#text} at (0,0) size 129x19 - text run at (0,0) width 129: "This is a heading-4." - RenderBlock {H4} at (4,122) size 529x21 - RenderText {#text} at (0,0) size 175x19 - text run at (0,0) width 175: "This is a bolder heading-4." - RenderBlock {P} at (4,163) size 529x21 - RenderInline {B} at (0,0) size 335x19 - RenderText {#text} at (0,0) size 335x19 - text run at (0,0) width 335: "This sentence should be normal (boldface made lighter)." + RenderTableCell {TD} at (12,28) size 549x404 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 541x20 + RenderText {#text} at (0,0) size 198x19 + text run at (0,0) width 198: "This sentence should be bold." + RenderBlock {P} at (4,40) size 541x20 + RenderText {#text} at (0,0) size 300x19 + text run at (0,0) width 300: "This sentence should be bolder than normal." + RenderBlock {H4} at (4,81) size 541x21 + RenderText {#text} at (0,0) size 131x19 + text run at (0,0) width 131: "This is a heading-4." + RenderBlock {H4} at (4,122) size 541x21 + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "This is a bolder heading-4." + RenderBlock {P} at (4,163) size 541x21 + RenderInline {B} at (0,0) size 353x19 + RenderText {#text} at (0,0) size 353x19 + text run at (0,0) width 353: "This sentence should be normal (boldface made lighter)." RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (4,199) size 529x21 - RenderText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 100." - RenderBlock {P} at (4,235) size 529x21 - RenderText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 300." - RenderBlock {P} at (4,271) size 529x21 - RenderText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 500." - RenderBlock {P} at (4,307) size 529x21 - RenderText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "This sentence should be weight 700." - RenderBlock {P} at (4,343) size 529x21 - RenderText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "This sentence should be weight 900." - RenderBlock {P} at (4,379) size 529x21 - RenderText {#text} at (0,0) size 484x19 - text run at (0,0) width 484: "This sentence should be bold, but the last word in the sentence should be " - RenderInline {SPAN} at (0,0) size 41x19 - RenderText {#text} at (484,0) size 41x19 - text run at (484,0) width 41: "normal" - RenderText {#text} at (525,0) size 4x19 - text run at (525,0) width 4: "." + RenderBlock {P} at (4,199) size 541x21 + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "This sentence should be weight 100." + RenderBlock {P} at (4,235) size 541x21 + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "This sentence should be weight 300." + RenderBlock {P} at (4,271) size 541x21 + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "This sentence should be weight 500." + RenderBlock {P} at (4,307) size 541x21 + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This sentence should be weight 700." + RenderBlock {P} at (4,343) size 541x21 + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This sentence should be weight 900." + RenderBlock {P} at (4,379) size 541x21 + RenderText {#text} at (0,0) size 493x19 + text run at (0,0) width 493: "This sentence should be bold, but the last word in the sentence should be " + RenderInline {SPAN} at (0,0) size 44x19 + RenderText {#text} at (493,0) size 44x19 + text run at (493,0) width 44: "normal" + RenderText {#text} at (537,0) size 4x19 + text run at (537,0) width 4: "." layer at (8,233) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,225) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/formatting_model/canvas-expected.txt b/LayoutTests/platform/wincairo/css1/formatting_model/canvas-expected.txt index be8c6e334759..03717a2a2e8f 100644 --- a/LayoutTests/platform/wincairo/css1/formatting_model/canvas-expected.txt +++ b/LayoutTests/platform/wincairo/css1/formatting_model/canvas-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 [bgcolor=#00FFFF] RenderBody {BODY} at (25,25) size 750x550 [bgcolor=#008000] RenderBlock {P} at (0,0) size 750x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 750x32 RenderText {#text} at (0,0) size 552x32 text run at (0,0) width 240: "HTML {background-color: aqua;}" @@ -14,29 +14,29 @@ layer at (0,0) size 800x600 text run at (552,16) width 0: " " RenderBlock {P} at (0,99) size 750x60 RenderText {#text} at (0,0) size 735x59 - text run at (0,0) width 368: "The body of this document should have a green background. " - text run at (368,0) width 367: "It also has a margin of 25 pixels, so the light blue background" - text run at (0,20) width 335: "set for the HTML element should surround the BODY. " - text run at (335,20) width 372: "If the BODY content is significantly shorter than the browser's" - text run at (0,40) width 411: "window height, then the bottom border may be larger than 25 pixels." + text run at (0,0) width 387: "The body of this document should have a green background. " + text run at (387,0) width 308: "It also has a margin of 25 pixels, so the light blue" + text run at (0,20) width 429: "background set for the HTML element should surround the BODY. " + text run at (429,20) width 306: "If the BODY content is significantly shorter than" + text run at (0,40) width 519: "the browser's window height, then the bottom border may be larger than 25 pixels." RenderTable {TABLE} at (0,175) size 750x98 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 748x96 RenderTableRow {TR} at (0,0) size 748x28 RenderTableCell {TD} at (0,0) size 748x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 748x68 RenderTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 736x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 728x60 - RenderText {#text} at (0,0) size 720x59 - text run at (0,0) width 368: "The body of this document should have a green background. " - text run at (368,0) width 291: "It also has a margin of 25 pixels, so the light blue" - text run at (0,20) width 411: "background set for the HTML element should surround the BODY. " - text run at (411,20) width 309: "If the BODY content is significantly shorter than the" - text run at (0,40) width 474: "browser's window height, then the bottom border may be larger than 25 pixels." + RenderText {#text} at (0,0) size 704x59 + text run at (0,0) width 387: "The body of this document should have a green background. " + text run at (387,0) width 308: "It also has a margin of 25 pixels, so the light blue" + text run at (0,20) width 429: "background set for the HTML element should surround the BODY. " + text run at (429,20) width 275: "If the BODY content is significantly shorter" + text run at (0,40) width 550: "than the browser's window height, then the bottom border may be larger than 25 pixels." layer at (25,106) size 750x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,81) size 750x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/formatting_model/floating_elements-expected.txt b/LayoutTests/platform/wincairo/css1/formatting_model/floating_elements-expected.txt index 68a353ef1070..0d392742876b 100644 --- a/LayoutTests/platform/wincairo/css1/formatting_model/floating_elements-expected.txt +++ b/LayoutTests/platform/wincairo/css1/formatting_model/floating_elements-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x6501 +layer at (0,0) size 785x6798 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x6501 - RenderBlock {HTML} at (0,0) size 785x6501 - RenderBody {BODY} at (8,8) size 769x6485 [bgcolor=#CCCCCC] +layer at (0,0) size 785x6798 + RenderBlock {HTML} at (0,0) size 785x6798 + RenderBody {BODY} at (8,8) size 769x6782 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x144 RenderText {#text} at (0,0) size 480x144 text run at (0,0) width 272: "HR.minor {clear: both; width: 5%;}" @@ -26,704 +26,722 @@ layer at (0,0) size 785x6501 text run at (176,112) width 0: " " text run at (0,128) width 0: " " RenderBlock {P} at (0,211) size 769x40 - RenderText {#text} at (0,0) size 731x39 - text run at (0,0) width 645: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " - text run at (645,0) width 86: "Other than the" - text run at (0,20) width 690: "substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the floats." - RenderBlock {DIV} at (2,301) size 765x90 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." + RenderText {#text} at (0,0) size 751x39 + text run at (0,0) width 681: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " + text run at (681,0) width 67: "Other than" + text run at (0,20) width 751: "the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the floats." + RenderBlock {DIV} at (2,301) size 765x110 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." RenderBlock (floating) {P} at (566,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (199,5) size 358x79 - text run at (199,5) width 164: "This is text within the DIV. " - text run at (363,5) width 189: "The floating elements within this" - text run at (199,25) width 358: "DIV should not go beyond the left or right inner edge of this" - text run at (199,45) width 352: "DIV, which means that the borders of the floating elements" - text run at (199,65) width 326: "should not overlap the top or side borders of the DIV." - RenderBlock {DIV} at (2,410) size 765x50 [border: (5px solid #800080)] + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,5) size 363x99 + text run at (199,5) width 175: "This is text within the DIV. " + text run at (374,5) width 180: "The floating elements within" + text run at (199,25) width 363: "this DIV should not go beyond the left or right inner edge" + text run at (199,45) width 354: "of this DIV, which means that the borders of the floating" + text run at (199,65) width 360: "elements should not overlap the top or side borders of the" + text run at (199,85) width 31: "DIV." + RenderBlock {DIV} at (2,429) size 765x70 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderImage {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (20,5) size 704x39 - text run at (20,5) width 164: "This is text within the DIV. " - text run at (184,5) width 540: "The floating images within this DIV should not go beyond the left or right inner edge of this" - text run at (20,25) width 671: "DIV, which means that the borders of the floating images should not overlap the top or side borders of the DIV." - RenderBlock {DIV} at (2,510) size 442x230 [border: (5px solid #800080)] + RenderText {#text} at (20,5) size 725x59 + text run at (20,5) width 175: "This is text within the DIV. " + text run at (195,5) width 535: "The floating images within this DIV should not go beyond the left or right inner edge" + text run at (20,25) width 707: "of this DIV, which means that the borders of the floating images should not overlap the top or side borders of the" + text run at (5,45) width 31: "DIV." + RenderBlock {DIV} at (2,549) size 442x250 [border: (5px solid #800080)] RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 157x39 - text run at (17,17) width 157: "This is the first left-floating" - text run at (17,37) width 65: "paragraph." + RenderText {#text} at (17,17) size 122x39 + text run at (17,17) width 122: "This is the first left-" + text run at (17,37) width 119: "floating paragraph." RenderBlock (floating) {P} at (199,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 135x39 - text run at (17,17) width 135: "This is the second left-" - text run at (17,37) width 112: "floating paragraph." + RenderText {#text} at (17,17) size 142x39 + text run at (17,17) width 142: "This is the second left-" + text run at (17,37) width 119: "floating paragraph." RenderBlock (floating) {P} at (5,79) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 119x39 - text run at (17,17) width 119: "This is the third left-" - text run at (17,37) width 112: "floating paragraph." - RenderText {#text} at (393,5) size 426x219 - text run at (393,5) width 38: "This is" - text run at (393,25) width 22: "text" - text run at (393,45) width 35: "within" - text run at (393,65) width 18: "the" + RenderText {#text} at (17,17) size 127x39 + text run at (17,17) width 127: "This is the third left-" + text run at (17,37) width 119: "floating paragraph." + RenderText {#text} at (393,5) size 430x239 + text run at (393,5) width 42: "This is" + text run at (393,25) width 23: "text" + text run at (393,45) width 40: "within" + text run at (393,65) width 19: "the" text run at (199,85) width 35: "DIV. " - text run at (234,85) width 189: "The floating elements within this" - text run at (199,105) width 222: "DIV should not go beyond the left or" - text run at (199,125) width 206: "right inner edge of this DIV, which" - text run at (199,145) width 222: "means that the borders of the floating" - text run at (5,165) width 417: "elements should not overlap the top or side borders of the DIV in any" - text run at (5,185) width 33: "way. " - text run at (38,185) width 287: "In addition, they should not overlap each other. " - text run at (325,185) width 76: "The first two" - text run at (5,205) width 414: "should be side by side, whereas the third should be on the next \"line.\"" - RenderBlock {DIV} at (2,758) size 360x210 [border: (5px solid #800080)] + text run at (234,85) width 180: "The floating elements within" + text run at (199,105) width 218: "this DIV should not go beyond the" + text run at (199,125) width 218: "left or right inner edge of this DIV," + text run at (199,145) width 224: "which means that the borders of the" + text run at (5,165) width 412: "floating elements should not overlap the top or side borders of the" + text run at (5,185) width 109: "DIV in any way. " + text run at (114,185) width 296: "In addition, they should not overlap each other." + text run at (5,205) width 425: "The first two should be side by side, whereas the third should be on" + text run at (5,225) width 95: "the next \"line.\"" + RenderBlock {DIV} at (2,817) size 360x210 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] RenderImage {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] RenderImage {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - RenderText {#text} at (317,5) size 350x199 - text run at (317,5) width 38: "This is" - text run at (317,25) width 22: "text" - text run at (161,45) width 96: "within the DIV. " - text run at (257,45) width 70: "The floating" - text run at (161,65) width 178: "images within this DIV should" - text run at (5,85) width 319: "not go beyond the left or right inner edge of this DIV," - text run at (5,105) width 349: "which means that the borders of the floating images should" - text run at (5,125) width 318: "not overlap the top or side borders of the DIV in any" - text run at (5,145) width 33: "way. " - text run at (38,145) width 287: "In addition, they should not overlap each other. " - text run at (325,145) width 23: "The" - text run at (5,165) width 340: "first two should be side by side, whereas the third should" - text run at (5,185) width 123: "be on the next \"line.\"" - RenderBlock {DIV} at (2,1018) size 314x364 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - RenderBlock (floating) {P} at (115,79) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (199,5) size 303x353 - text run at (199,5) width 103: "This is text within" - text run at (199,25) width 57: "the DIV. " - text run at (256,25) width 23: "The" - text run at (199,45) width 99: "floating elements" - text run at (5,79) width 90: "within this DIV" - text run at (5,99) width 81: "should not go" - text run at (5,119) width 106: "beyond the left or" - text run at (5,139) width 108: "right inner edge of" - text run at (5,159) width 94: "this DIV, which" - text run at (5,179) width 278: "means that the borders of the floating elements" - text run at (5,199) width 291: "should not overlap the top or side borders of the" - text run at (5,219) width 103: "DIV in any way. " - text run at (108,219) width 163: "In addition, they should not" - text run at (5,239) width 273: "overlap each other in any way, nor should the" - text run at (5,259) width 290: "floated elements be overwritten by the DIV text." - text run at (5,279) width 276: "In addition, the floated elements should not be" - text run at (5,299) width 303: "side-by-side, but instead the first should be floated" - text run at (5,319) width 293: "left, and the second floated to the right below the" - text run at (5,339) width 26: "first." - RenderBlock {DIV} at (2,1400) size 410x246 [border: (5px solid #800080)] + RenderText {#text} at (317,5) size 349x199 + text run at (317,5) width 28: "This" + text run at (317,25) width 37: "is text" + text run at (161,45) width 102: "within the DIV. " + text run at (263,45) width 77: "The floating" + text run at (161,65) width 192: "images within this DIV should" + text run at (5,85) width 336: "not go beyond the left or right inner edge of this DIV," + text run at (5,105) width 324: "which means that the borders of the floating images" + text run at (5,125) width 349: "should not overlap the top or side borders of the DIV in" + text run at (5,145) width 61: "any way. " + text run at (66,145) width 257: "In addition, they should not overlap each" + text run at (5,165) width 39: "other. " + text run at (44,165) width 307: "The first two should be side by side, whereas the" + text run at (5,185) width 213: "third should be on the next \"line.\"" + RenderBlock {DIV} at (2,1077) size 314x384 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." + RenderBlock (floating) {P} at (115,99) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,5) size 303x373 + text run at (199,5) width 69: "This is text" + text run at (199,25) width 98: "within the DIV." + text run at (199,45) width 77: "The floating" + text run at (199,65) width 99: "elements within" + text run at (5,99) width 101: "this DIV should" + text run at (5,119) width 91: "not go beyond" + text run at (5,139) width 93: "the left or right" + text run at (5,159) width 109: "inner edge of this" + text run at (5,179) width 74: "DIV, which" + text run at (5,199) width 292: "means that the borders of the floating elements" + text run at (5,219) width 301: "should not overlap the top or side borders of the" + text run at (5,239) width 109: "DIV in any way. " + text run at (114,239) width 173: "In addition, they should not" + text run at (5,259) width 287: "overlap each other in any way, nor should the" + text run at (5,279) width 303: "floated elements be overwritten by the DIV text." + text run at (5,299) width 290: "In addition, the floated elements should not be" + text run at (5,319) width 268: "side-by-side, but instead the first should be" + text run at (5,339) width 288: "floated left, and the second floated to the right" + text run at (5,359) width 94: "below the first." + RenderBlock {DIV} at (2,1479) size 410x246 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] RenderImage {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] RenderText {#text} at (261,5) size 400x235 - text run at (261,5) width 125: "This is text within the" + text run at (261,5) width 136: "This is text within the" text run at (5,41) width 35: "DIV. " - text run at (40,41) width 70: "The floating" - text run at (5,61) width 135: "images within this DIV" - text run at (5,81) width 362: "should not go beyond the left or right inner edge of this DIV," - text run at (5,101) width 372: "which means that the borders of the floating images should not" - text run at (5,121) width 332: "overlap the top or side borders of the DIV in any way. " - text run at (337,121) width 68: "In addition," - text run at (5,141) width 368: "they should not overlap each other in any way, nor should the" - text run at (5,161) width 294: "floated elements be overwritten by the DIV text. " - text run at (299,161) width 90: "In addition, the" - text run at (5,181) width 371: "floated images should not be side-by-side, but instead the first" - text run at (5,201) width 400: "should be floated left, and the second floated to the right below the" - text run at (5,221) width 26: "first." - RenderBlock {DIV} at (2,1696) size 765x130 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (566,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 159: "paragraph (first in source)." + text run at (40,41) width 77: "The floating" + text run at (5,61) width 114: "images within this" + text run at (5,81) width 379: "DIV should not go beyond the left or right inner edge of this" + text run at (5,101) width 359: "DIV, which means that the borders of the floating images" + text run at (5,121) width 376: "should not overlap the top or side borders of the DIV in any" + text run at (5,141) width 34: "way. " + text run at (39,141) width 336: "In addition, they should not overlap each other in any" + text run at (5,161) width 400: "way, nor should the floated elements be overwritten by the DIV" + text run at (5,181) width 31: "text. " + text run at (36,181) width 363: "In addition, the floated images should not be side-by-side," + text run at (5,201) width 357: "but instead the first should be floated left, and the second" + text run at (5,221) width 213: "floated to the right below the first." + RenderBlock {DIV} at (2,1775) size 765x130 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (566,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 127x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (199,5) size 745x119 - text run at (199,5) width 164: "This is text within the DIV. " - text run at (363,5) width 189: "The floating elements within this" - text run at (199,25) width 349: "DIV should not go beyond the top side of this DIV, which" - text run at (199,45) width 344: "means that the borders of the floating elements should not" - text run at (199,65) width 332: "overlap the top or side borders of the DIV in any way. " - text run at (531,65) width 12: "In" - text run at (199,85) width 551: "addition, the top of the left-floating box should not be higher than the top of the right-floating" - text run at (5,105) width 27: "box." - RenderBlock {DIV} at (2,1844) size 765x70 [border: (5px solid #800080)] + RenderText {#text} at (17,17) size 132x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,5) size 549x119 + text run at (199,5) width 175: "This is text within the DIV. " + text run at (374,5) width 180: "The floating elements within" + text run at (199,25) width 350: "this DIV should not go beyond the top side of this DIV," + text run at (199,45) width 335: "which means that the borders of the floating elements" + text run at (199,65) width 349: "should not overlap the top or side borders of the DIV in" + text run at (199,85) width 61: "any way. " + text run at (260,85) width 264: "In addition, the top of the left-floating box" + text run at (5,105) width 365: "should not be higher than the top of the right-floating box." + RenderBlock {DIV} at (2,1923) size 765x70 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderImage {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (20,5) size 710x59 - text run at (20,5) width 164: "This is text within the DIV. " - text run at (184,5) width 531: "The floating images within this DIV should not go beyond the top side of this DIV, which" - text run at (20,25) width 669: "means that the borders of the floating images should not overlap the top or side borders of the DIV in any way. " - text run at (689,25) width 12: "In" - text run at (5,45) width 606: "addition, the top of the left-floating image should not be higher than the top of the right-floating image." - RenderBlock {DIV} at (2,1964) size 765x130 [border: (5px solid #800080)] - RenderText {#text} at (199,5) size 172x19 - text run at (199,5) width 164: "This is text within the DIV. " - text run at (363,5) width 8: "*" - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - RenderText {#text} at (371,5) size 546x39 - text run at (371,5) width 374: " The floating elements within this DIV should not go any higher" - text run at (199,25) width 407: "than the line-box containing the inline content which precedes them. " - text run at (606,25) width 12: "* " + RenderText {#text} at (20,5) size 719x59 + text run at (20,5) width 175: "This is text within the DIV. " + text run at (195,5) width 522: "The floating images within this DIV should not go beyond the top side of this DIV," + text run at (20,25) width 704: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in any" + text run at (5,45) width 34: "way. " + text run at (39,45) width 661: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image." + RenderBlock {DIV} at (2,2043) size 765x150 [border: (5px solid #800080)] + RenderText {#text} at (199,5) size 183x19 + text run at (199,5) width 175: "This is text within the DIV. " + text run at (374,5) width 8: "*" + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (382,5) size 542x39 + text run at (382,5) width 359: " The floating elements within this DIV should not go any" + text run at (199,25) width 477: "higher than the line-box containing the inline content which precedes them. " + text run at (676,25) width 12: "* " RenderBlock (floating) {P} at (566,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (618,25) size 752x99 - text run at (618,25) width 139: "This means that the top" - text run at (199,45) width 359: "side of each float can be, at most, as high as the top edge of" - text run at (199,65) width 326: "the inline element containing the content just before the" - text run at (5,85) width 225: "floating elements occur in the source. " - text run at (230,85) width 314: "In order to mark these points clearly, an asterisk has" - text run at (5,105) width 279: "been inserted just before each floated element." - RenderBlock {DIV} at (2,2113) size 765x90 [border: (5px solid #800080)] - RenderText {#text} at (20,5) size 172x19 - text run at (20,5) width 164: "This is text within the DIV. " - text run at (184,5) width 8: "*" + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (688,25) size 755x119 + text run at (688,25) width 72: "This means" + text run at (199,45) width 349: "that the top side of each float can be, at most, as high as" + text run at (199,65) width 352: "the top edge of the inline element containing the content" + text run at (199,85) width 331: "just before the floating elements occur in the source. " + text run at (530,85) width 13: "In" + text run at (5,105) width 544: "order to mark these points clearly, an asterisk has been inserted just before each floated" + text run at (5,125) width 53: "element." + RenderBlock {DIV} at (2,2211) size 765x90 [border: (5px solid #800080)] + RenderText {#text} at (20,5) size 183x19 + text run at (20,5) width 175: "This is text within the DIV. " + text run at (195,5) width 8: "*" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (192,5) size 725x39 - text run at (192,5) width 553: " The floating images within this DIV should not go any higher than the line-box containing the" - text run at (20,25) width 217: "inline content which precedes them. " - text run at (237,25) width 12: "* " + RenderText {#text} at (203,5) size 685x39 + text run at (203,5) width 502: " The floating images within this DIV should not go any higher than the line-box" + text run at (20,25) width 323: "containing the inline content which precedes them. " + text run at (343,25) width 12: "* " RenderImage {IMG} at (745,25) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (249,25) size 735x59 - text run at (249,25) width 486: "This means that the top side of each float can be, at most, as high as the top edge" - text run at (5,45) width 560: "of the inline element containing the content just before the floating images occur in the source. " - text run at (565,45) width 175: "In order to mark these points" - text run at (5,65) width 407: "clearly, an asterisk has been inserted just before each floated image." - RenderBlock {DIV} at (2,2253) size 765x230 [border: (5px solid #800080)] - RenderText {#text} at (199,5) size 172x19 - text run at (199,5) width 164: "This is text within the DIV. " - text run at (363,5) width 8: "*" - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - RenderText {#text} at (371,5) size 546x39 - text run at (371,5) width 374: " The floating elements within this DIV should not go any higher" - text run at (199,25) width 407: "than the line-box containing the inline content which precedes them. " - text run at (606,25) width 12: "* " + RenderText {#text} at (355,25) size 738x59 + text run at (355,25) width 376: "This means that the top side of each float can be, at most, as" + text run at (5,45) width 725: "high as the top edge of the inline element containing the content just before the floating images occur in the source. " + text run at (730,45) width 13: "In" + text run at (5,65) width 590: "order to mark these points clearly, an asterisk has been inserted just before each floated image." + RenderBlock {DIV} at (2,2351) size 765x290 [border: (5px solid #800080)] + RenderText {#text} at (199,5) size 183x19 + text run at (199,5) width 175: "This is text within the DIV. " + text run at (374,5) width 8: "*" + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (382,5) size 542x39 + text run at (382,5) width 359: " The floating elements within this DIV should not go any" + text run at (199,25) width 477: "higher than the line-box containing the inline content which precedes them. " + text run at (676,25) width 12: "* " RenderBlock (floating) {P} at (566,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (618,25) size 364x39 - text run at (618,25) width 139: "This means that the top" - text run at (393,45) width 158: "side of each float can be,*" - RenderBlock (floating) {P} at (199,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 120x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 111: "paragraph (third in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (551,45) size 367x119 - text run at (551,45) width 15: " at" - text run at (393,65) width 141: "most, as high as the top" - text run at (393,85) width 151: "edge of the inline element" - text run at (393,105) width 155: "containing the content just" - text run at (393,125) width 164: "before the floating elements" - text run at (199,145) width 122: "occur in the source. " - text run at (321,145) width 8: "*" - RenderBlock (floating) {P} at (5,145) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 120x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 119: "paragraph (fourth in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (329,145) size 557x79 - text run at (329,145) width 427: " In order to mark these points clearly, an asterisk has been inserted just" - text run at (199,165) width 174: "before each floated element. " - text run at (373,165) width 379: "If a line has room for a floated element, then the element should" - text run at (199,185) width 517: "float so that its top is aligned with the top of the line-box in which the asterisk appears." - text run at (199,205) width 380: "Otherwise, its top should align with the top of the next line-box." - RenderBlock {DIV} at (2,2502) size 765x130 [border: (5px solid #800080)] - RenderText {#text} at (20,5) size 172x19 - text run at (20,5) width 164: "This is text within the DIV. " - text run at (184,5) width 8: "*" + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (688,25) size 561x39 + text run at (688,25) width 72: "This means" + text run at (199,45) width 238: "that the top side of each float can be,*" + RenderBlock (floating) {P} at (199,65) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 117: "paragraph (third in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (437,45) size 274x119 + text run at (437,45) width 119: " at most, as high as" + text run at (393,65) width 156: "the top edge of the inline" + text run at (393,85) width 142: "element containing the" + text run at (393,105) width 139: "content just before the" + text run at (393,125) width 162: "floating elements occur in" + text run at (587,145) width 72: "the source. " + text run at (659,145) width 8: "*" + RenderBlock (floating) {P} at (393,145) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 126: "paragraph (fourth in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (667,145) size 741x139 + text run at (667,145) width 70: " In order to" + text run at (587,165) width 159: "mark these points clearly," + text run at (587,185) width 125: "an asterisk has been" + text run at (587,205) width 152: "inserted just before each" + text run at (587,225) width 104: "floated element. " + text run at (691,225) width 48: "If a line" + text run at (5,245) width 722: "has room for a floated element, then the element should float so that its top is aligned with the top of the line-box in" + text run at (5,265) width 173: "which the asterisk appears. " + text run at (178,265) width 402: "Otherwise, its top should align with the top of the next line-box." + RenderBlock {DIV} at (2,2659) size 765x130 [border: (5px solid #800080)] + RenderText {#text} at (20,5) size 183x19 + text run at (20,5) width 175: "This is text within the DIV. " + text run at (195,5) width 8: "*" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (192,5) size 710x39 - text run at (192,5) width 553: " The floating images within this DIV should not go any higher than the line-box containing the" - text run at (35,25) width 217: "inline content which precedes them. " - text run at (252,25) width 12: "* " + RenderText {#text} at (203,5) size 670x39 + text run at (203,5) width 502: " The floating images within this DIV should not go any higher than the line-box" + text run at (35,25) width 323: "containing the inline content which precedes them. " + text run at (358,25) width 12: "* " RenderImage {IMG} at (745,25) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (264,25) size 305x19 - text run at (264,25) width 297: "This means that the top side of each float can be, " - text run at (561,25) width 8: "*" + RenderText {#text} at (370,25) size 318x19 + text run at (370,25) width 310: "This means that the top side of each float can be, " + text run at (680,25) width 8: "*" RenderImage {IMG} at (20,25) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (569,25) size 679x39 - text run at (569,25) width 160: " at most, as high as the top" - text run at (50,45) width 593: "edge of the inline element containing the content just before the floating images occur in the source. " - text run at (643,45) width 8: "*" - RenderImage {IMG} at (35,45) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (651,45) size 747x79 - text run at (651,45) width 69: " In order to" - text run at (50,65) width 521: "mark these points clearly, an asterisk has been inserted just before each floated image. " - text run at (571,65) width 181: "If a line has room for a floated" - text run at (5,85) width 693: "image, then the image should float so that its top is aligned with the top of the line-box in which the asterisk appears." - text run at (5,105) width 380: "Otherwise, its top should align with the top of the next line-box." - RenderBlock {DIV} at (2,2682) size 490x310 [border: (5px solid #800080)] - RenderText {#text} at (199,5) size 50x19 - text run at (199,5) width 50: "This is *" - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - RenderText {#text} at (249,5) size 12x19 - text run at (249,5) width 12: " *" + RenderText {#text} at (688,25) size 721x59 + text run at (688,25) width 53: " at most," + text run at (35,45) width 689: "as high as the top edge of the inline element containing the content just before the floating images occur in the" + text run at (20,65) width 49: "source. " + text run at (69,65) width 8: "*" + RenderImage {IMG} at (5,65) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (77,65) size 735x59 + text run at (77,65) width 615: " In order to mark these points clearly, an asterisk has been inserted just before each floated image. " + text run at (692,65) width 48: "If a line" + text run at (20,85) width 700: "has room for a floated image, then the image should float so that its top is aligned with the top of the line-box in" + text run at (5,105) width 173: "which the asterisk appears. " + text run at (178,105) width 402: "Otherwise, its top should align with the top of the next line-box." + RenderBlock {DIV} at (2,2839) size 490x330 [border: (5px solid #800080)] + RenderText {#text} at (199,5) size 54x19 + text run at (199,5) width 54: "This is *" + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (253,5) size 12x19 + text run at (253,5) width 12: " *" RenderBlock (floating) {P} at (291,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (261,5) size 478x299 - text run at (261,5) width 26: " text" - text run at (199,25) width 92: "within the DIV." - text run at (199,45) width 83: "Under CSS1," - text run at (199,65) width 87: "the left floating" - text run at (5,85) width 249: "element should be placed in the upper left" - text run at (5,105) width 448: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,125) width 184: "border of the floating element. " - text run at (189,125) width 266: "Similarly, the right floating element should be" - text run at (5,145) width 465: "placed in the upper right corner of the DIV, and the purple border of the DIV" - text run at (5,165) width 434: "should abut the green border of the floating element. The text of the DIV" - text run at (5,185) width 448: "element should flow between and under the two floating elements. The two" - text run at (5,205) width 434: "asterisk characters mark the insertion points of the floating elements. It is" - text run at (5,225) width 460: "expected that, under future specifications, it may be acceptable for the top of" - text run at (5,245) width 478: "floated elements to align with the top of the line-box following the insertion point" - text run at (5,265) width 456: "of the floated element to avoid floating elements appearing before text which" - text run at (5,285) width 213: "precedes it in the source document." - RenderBlock {DIV} at (2,3010) size 490x230 [border: (5px solid #800080)] - RenderText {#text} at (20,5) size 50x19 - text run at (20,5) width 50: "This is *" + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,25) size 475x299 + text run at (199,25) width 90: "text within the" + text run at (199,45) width 35: "DIV. " + text run at (234,45) width 40: "Under" + text run at (199,65) width 88: "CSS1, the left" + text run at (199,85) width 48: "floating" + text run at (5,105) width 475: "element should be placed in the upper left corner of the DIV, and the purple" + text run at (5,125) width 446: "border of the DIV should abut the green border of the floating element." + text run at (5,145) width 443: "Similarly, the right floating element should be placed in the upper right" + text run at (5,165) width 465: "corner of the DIV, and the purple border of the DIV should abut the green" + text run at (5,185) width 450: "border of the floating element. The text of the DIV element should flow" + text run at (5,205) width 461: "between and under the two floating elements. The two asterisk characters" + text run at (5,225) width 468: "mark the insertion points of the floating elements. It is expected that, under" + text run at (5,245) width 470: "future specifications, it may be acceptable for the top of floated elements to" + text run at (5,265) width 475: "align with the top of the line-box following the insertion point of the floated" + text run at (5,285) width 466: "element to avoid floating elements appearing before text which precedes it" + text run at (5,305) width 150: "in the source document." + RenderBlock {DIV} at (2,3187) size 490x250 [border: (5px solid #800080)] + RenderText {#text} at (20,5) size 54x19 + text run at (20,5) width 54: "This is *" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (70,5) size 12x19 - text run at (70,5) width 12: " *" + RenderText {#text} at (74,5) size 12x19 + text run at (74,5) width 12: " *" RenderImage {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (82,5) size 479x219 - text run at (82,5) width 126: " text within the DIV. " - text run at (208,5) width 256: "Under CSS1, the left floating image should" - text run at (20,25) width 445: "be placed in the upper left corner of the DIV, and the purple border of the" - text run at (5,45) width 336: "DIV should abut the green border of the floating image. " - text run at (341,45) width 107: "Similarly, the right" - text run at (5,65) width 457: "floating image should be placed in the upper right corner of the DIV, and the" - text run at (5,85) width 457: "purple border of the DIV should abut the green border of the floating image." - text run at (5,105) width 456: "The text of the DIV element should flow between and under the two floating" - text run at (5,125) width 445: "image. The two asterisk characters mark the insertion points of the floating" - text run at (5,145) width 43: "image. " - text run at (48,145) width 424: "It is expected that, under future specifications, it may be acceptable for" - text run at (5,165) width 452: "the top of floated elements to align with the top of the line-box following the" - text run at (5,185) width 479: "insertion point of the floated element to avoid floating elements appearing before" - text run at (5,205) width 278: "text which precedes it in the source document." - RenderTable {TABLE} at (0,3290) size 769x3195 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x3193 + RenderText {#text} at (86,5) size 480x239 + text run at (86,5) width 133: " text within the DIV. " + text run at (219,5) width 226: "Under CSS1, the left floating image" + text run at (20,25) width 422: "should be placed in the upper left corner of the DIV, and the purple" + text run at (5,45) width 435: "border of the DIV should abut the green border of the floating image." + text run at (5,65) width 476: "Similarly, the right floating image should be placed in the upper right corner" + text run at (5,85) width 466: "of the DIV, and the purple border of the DIV should abut the green border" + text run at (5,105) width 478: "of the floating image. The text of the DIV element should flow between and" + text run at (5,125) width 477: "under the two floating image. The two asterisk characters mark the insertion" + text run at (5,145) width 180: "points of the floating image. " + text run at (185,145) width 300: "It is expected that, under future specifications, it" + text run at (5,165) width 478: "may be acceptable for the top of floated elements to align with the top of the" + text run at (5,185) width 429: "line-box following the insertion point of the floated element to avoid" + text run at (5,205) width 442: "floating elements appearing before text which precedes it in the source" + text run at (5,225) width 66: "document." + RenderTable {TABLE} at (0,3487) size 769x3295 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x3293 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x3165 - RenderTableCell {TD} at (0,1596) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x3265 + RenderTableCell {TD} at (0,1646) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x3165 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x40 - RenderText {#text} at (0,0) size 731x39 - text run at (0,0) width 645: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " - text run at (645,0) width 86: "Other than the" - text run at (0,20) width 690: "substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the floats." - RenderBlock {DIV} at (6,94) size 743x110 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." + RenderTableCell {TD} at (12,28) size 755x3265 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x60 + RenderText {#text} at (0,0) size 740x59 + text run at (0,0) width 681: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " + text run at (681,0) width 36: "Other" + text run at (0,20) width 740: "than the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the" + text run at (0,40) width 38: "floats." + RenderBlock {DIV} at (6,114) size 743x110 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." RenderBlock (floating) {P} at (544,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (199,5) size 536x99 - text run at (199,5) width 164: "This is text within the DIV. " - text run at (363,5) width 165: "The floating elements within" - text run at (199,25) width 342: "this DIV should not go beyond the left or right inner edge" - text run at (199,45) width 336: "of this DIV, which means that the borders of the floating" - text run at (199,65) width 325: "elements should not overlap the top or side borders of" - text run at (5,85) width 53: "the DIV." - RenderBlock {DIV} at (6,222) size 743x50 [border: (5px solid #800080)] + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,5) size 337x99 + text run at (199,5) width 175: "This is text within the DIV. " + text run at (374,5) width 136: "The floating elements" + text run at (199,25) width 337: "within this DIV should not go beyond the left or right" + text run at (199,45) width 332: "inner edge of this DIV, which means that the borders" + text run at (199,65) width 332: "of the floating elements should not overlap the top or" + text run at (199,85) width 151: "side borders of the DIV." + RenderBlock {DIV} at (6,242) size 743x70 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderImage {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (20,5) size 695x39 - text run at (20,5) width 164: "This is text within the DIV. " - text run at (184,5) width 516: "The floating images within this DIV should not go beyond the left or right inner edge of" - text run at (20,25) width 695: "this DIV, which means that the borders of the floating images should not overlap the top or side borders of the DIV." - RenderBlock {DIV} at (6,322) size 442x230 [border: (5px solid #800080)] + RenderText {#text} at (20,5) size 716x59 + text run at (20,5) width 175: "This is text within the DIV. " + text run at (195,5) width 501: "The floating images within this DIV should not go beyond the left or right inner" + text run at (20,25) width 701: "edge of this DIV, which means that the borders of the floating images should not overlap the top or side borders" + text run at (5,45) width 71: "of the DIV." + RenderBlock {DIV} at (6,362) size 442x250 [border: (5px solid #800080)] RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 157x39 - text run at (17,17) width 157: "This is the first left-floating" - text run at (17,37) width 65: "paragraph." + RenderText {#text} at (17,17) size 122x39 + text run at (17,17) width 122: "This is the first left-" + text run at (17,37) width 119: "floating paragraph." RenderBlock (floating) {P} at (199,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 135x39 - text run at (17,17) width 135: "This is the second left-" - text run at (17,37) width 112: "floating paragraph." + RenderText {#text} at (17,17) size 142x39 + text run at (17,17) width 142: "This is the second left-" + text run at (17,37) width 119: "floating paragraph." RenderBlock (floating) {P} at (5,79) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 119x39 - text run at (17,17) width 119: "This is the third left-" - text run at (17,37) width 112: "floating paragraph." - RenderText {#text} at (393,5) size 426x219 - text run at (393,5) width 38: "This is" - text run at (393,25) width 22: "text" - text run at (393,45) width 35: "within" - text run at (393,65) width 18: "the" + RenderText {#text} at (17,17) size 127x39 + text run at (17,17) width 127: "This is the third left-" + text run at (17,37) width 119: "floating paragraph." + RenderText {#text} at (393,5) size 430x239 + text run at (393,5) width 42: "This is" + text run at (393,25) width 23: "text" + text run at (393,45) width 40: "within" + text run at (393,65) width 19: "the" text run at (199,85) width 35: "DIV. " - text run at (234,85) width 189: "The floating elements within this" - text run at (199,105) width 222: "DIV should not go beyond the left or" - text run at (199,125) width 206: "right inner edge of this DIV, which" - text run at (199,145) width 222: "means that the borders of the floating" - text run at (5,165) width 417: "elements should not overlap the top or side borders of the DIV in any" - text run at (5,185) width 33: "way. " - text run at (38,185) width 287: "In addition, they should not overlap each other. " - text run at (325,185) width 76: "The first two" - text run at (5,205) width 414: "should be side by side, whereas the third should be on the next \"line.\"" - RenderBlock {DIV} at (6,570) size 360x210 [border: (5px solid #800080)] + text run at (234,85) width 180: "The floating elements within" + text run at (199,105) width 218: "this DIV should not go beyond the" + text run at (199,125) width 218: "left or right inner edge of this DIV," + text run at (199,145) width 224: "which means that the borders of the" + text run at (5,165) width 412: "floating elements should not overlap the top or side borders of the" + text run at (5,185) width 109: "DIV in any way. " + text run at (114,185) width 296: "In addition, they should not overlap each other." + text run at (5,205) width 425: "The first two should be side by side, whereas the third should be on" + text run at (5,225) width 95: "the next \"line.\"" + RenderBlock {DIV} at (6,630) size 360x210 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] RenderImage {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] RenderImage {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - RenderText {#text} at (317,5) size 350x199 - text run at (317,5) width 38: "This is" - text run at (317,25) width 22: "text" - text run at (161,45) width 96: "within the DIV. " - text run at (257,45) width 70: "The floating" - text run at (161,65) width 178: "images within this DIV should" - text run at (5,85) width 319: "not go beyond the left or right inner edge of this DIV," - text run at (5,105) width 349: "which means that the borders of the floating images should" - text run at (5,125) width 318: "not overlap the top or side borders of the DIV in any" - text run at (5,145) width 33: "way. " - text run at (38,145) width 287: "In addition, they should not overlap each other. " - text run at (325,145) width 23: "The" - text run at (5,165) width 340: "first two should be side by side, whereas the third should" - text run at (5,185) width 123: "be on the next \"line.\"" - RenderBlock {DIV} at (6,830) size 314x364 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - RenderBlock (floating) {P} at (115,79) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (199,5) size 303x353 - text run at (199,5) width 103: "This is text within" - text run at (199,25) width 57: "the DIV. " - text run at (256,25) width 23: "The" - text run at (199,45) width 99: "floating elements" - text run at (5,79) width 90: "within this DIV" - text run at (5,99) width 81: "should not go" - text run at (5,119) width 106: "beyond the left or" - text run at (5,139) width 108: "right inner edge of" - text run at (5,159) width 94: "this DIV, which" - text run at (5,179) width 278: "means that the borders of the floating elements" - text run at (5,199) width 291: "should not overlap the top or side borders of the" - text run at (5,219) width 103: "DIV in any way. " - text run at (108,219) width 163: "In addition, they should not" - text run at (5,239) width 273: "overlap each other in any way, nor should the" - text run at (5,259) width 290: "floated elements be overwritten by the DIV text." - text run at (5,279) width 276: "In addition, the floated elements should not be" - text run at (5,299) width 303: "side-by-side, but instead the first should be floated" - text run at (5,319) width 293: "left, and the second floated to the right below the" - text run at (5,339) width 26: "first." - RenderBlock {DIV} at (6,1212) size 410x246 [border: (5px solid #800080)] + RenderText {#text} at (317,5) size 349x199 + text run at (317,5) width 28: "This" + text run at (317,25) width 37: "is text" + text run at (161,45) width 102: "within the DIV. " + text run at (263,45) width 77: "The floating" + text run at (161,65) width 192: "images within this DIV should" + text run at (5,85) width 336: "not go beyond the left or right inner edge of this DIV," + text run at (5,105) width 324: "which means that the borders of the floating images" + text run at (5,125) width 349: "should not overlap the top or side borders of the DIV in" + text run at (5,145) width 61: "any way. " + text run at (66,145) width 257: "In addition, they should not overlap each" + text run at (5,165) width 39: "other. " + text run at (44,165) width 307: "The first two should be side by side, whereas the" + text run at (5,185) width 213: "third should be on the next \"line.\"" + RenderBlock {DIV} at (6,890) size 314x384 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." + RenderBlock (floating) {P} at (115,99) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,5) size 303x373 + text run at (199,5) width 69: "This is text" + text run at (199,25) width 98: "within the DIV." + text run at (199,45) width 77: "The floating" + text run at (199,65) width 99: "elements within" + text run at (5,99) width 101: "this DIV should" + text run at (5,119) width 91: "not go beyond" + text run at (5,139) width 93: "the left or right" + text run at (5,159) width 109: "inner edge of this" + text run at (5,179) width 74: "DIV, which" + text run at (5,199) width 292: "means that the borders of the floating elements" + text run at (5,219) width 301: "should not overlap the top or side borders of the" + text run at (5,239) width 109: "DIV in any way. " + text run at (114,239) width 173: "In addition, they should not" + text run at (5,259) width 287: "overlap each other in any way, nor should the" + text run at (5,279) width 303: "floated elements be overwritten by the DIV text." + text run at (5,299) width 290: "In addition, the floated elements should not be" + text run at (5,319) width 268: "side-by-side, but instead the first should be" + text run at (5,339) width 288: "floated left, and the second floated to the right" + text run at (5,359) width 94: "below the first." + RenderBlock {DIV} at (6,1292) size 410x246 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] RenderImage {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] RenderText {#text} at (261,5) size 400x235 - text run at (261,5) width 125: "This is text within the" + text run at (261,5) width 136: "This is text within the" text run at (5,41) width 35: "DIV. " - text run at (40,41) width 70: "The floating" - text run at (5,61) width 135: "images within this DIV" - text run at (5,81) width 362: "should not go beyond the left or right inner edge of this DIV," - text run at (5,101) width 372: "which means that the borders of the floating images should not" - text run at (5,121) width 332: "overlap the top or side borders of the DIV in any way. " - text run at (337,121) width 68: "In addition," - text run at (5,141) width 368: "they should not overlap each other in any way, nor should the" - text run at (5,161) width 294: "floated elements be overwritten by the DIV text. " - text run at (299,161) width 90: "In addition, the" - text run at (5,181) width 371: "floated images should not be side-by-side, but instead the first" - text run at (5,201) width 400: "should be floated left, and the second floated to the right below the" - text run at (5,221) width 26: "first." - RenderBlock {DIV} at (6,1508) size 743x130 [border: (5px solid #800080)] - RenderBlock (floating) {P} at (544,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 159: "paragraph (first in source)." + text run at (40,41) width 77: "The floating" + text run at (5,61) width 114: "images within this" + text run at (5,81) width 379: "DIV should not go beyond the left or right inner edge of this" + text run at (5,101) width 359: "DIV, which means that the borders of the floating images" + text run at (5,121) width 376: "should not overlap the top or side borders of the DIV in any" + text run at (5,141) width 34: "way. " + text run at (39,141) width 336: "In addition, they should not overlap each other in any" + text run at (5,161) width 400: "way, nor should the floated elements be overwritten by the DIV" + text run at (5,181) width 31: "text. " + text run at (36,181) width 363: "In addition, the floated images should not be side-by-side," + text run at (5,201) width 357: "but instead the first should be floated left, and the second" + text run at (5,221) width 213: "floated to the right below the first." + RenderBlock {DIV} at (6,1588) size 743x130 [border: (5px solid #800080)] + RenderBlock (floating) {P} at (544,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 127x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (199,5) size 718x119 - text run at (199,5) width 164: "This is text within the DIV. " - text run at (363,5) width 165: "The floating elements within" - text run at (199,25) width 334: "this DIV should not go beyond the top side of this DIV," - text run at (199,45) width 317: "which means that the borders of the floating elements" - text run at (199,65) width 336: "should not overlap the top or side borders of the DIV in" - text run at (199,85) width 58: "any way. " - text run at (257,85) width 466: "In addition, the top of the left-floating box should not be higher than the top of" - text run at (5,105) width 128: "the right-floating box." - RenderBlock {DIV} at (6,1656) size 743x70 [border: (5px solid #800080)] + RenderText {#text} at (17,17) size 132x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,5) size 531x119 + text run at (199,5) width 175: "This is text within the DIV. " + text run at (374,5) width 136: "The floating elements" + text run at (199,25) width 333: "within this DIV should not go beyond the top side of" + text run at (199,45) width 337: "this DIV, which means that the borders of the floating" + text run at (199,65) width 337: "elements should not overlap the top or side borders of" + text run at (199,85) width 132: "the DIV in any way. " + text run at (331,85) width 188: "In addition, the top of the left-" + text run at (5,105) width 445: "floating box should not be higher than the top of the right-floating box." + RenderBlock {DIV} at (6,1736) size 743x70 [border: (5px solid #800080)] RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] RenderImage {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (20,5) size 710x59 - text run at (20,5) width 164: "This is text within the DIV. " - text run at (184,5) width 531: "The floating images within this DIV should not go beyond the top side of this DIV, which" - text run at (20,25) width 669: "means that the borders of the floating images should not overlap the top or side borders of the DIV in any way. " - text run at (689,25) width 12: "In" - text run at (5,45) width 606: "addition, the top of the left-floating image should not be higher than the top of the right-floating image." - RenderBlock {DIV} at (6,1776) size 743x130 [border: (5px solid #800080)] - RenderText {#text} at (199,5) size 172x19 - text run at (199,5) width 164: "This is text within the DIV. " - text run at (363,5) width 8: "*" - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - RenderText {#text} at (371,5) size 506x39 - text run at (371,5) width 334: " The floating elements within this DIV should not go any" - text run at (199,25) width 447: "higher than the line-box containing the inline content which precedes them. " - text run at (646,25) width 12: "* " + RenderText {#text} at (20,5) size 722x59 + text run at (20,5) width 175: "This is text within the DIV. " + text run at (195,5) width 522: "The floating images within this DIV should not go beyond the top side of this DIV," + text run at (20,25) width 677: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in" + text run at (5,45) width 61: "any way. " + text run at (66,45) width 661: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image." + RenderBlock {DIV} at (6,1856) size 743x150 [border: (5px solid #800080)] + RenderText {#text} at (199,5) size 183x19 + text run at (199,5) width 175: "This is text within the DIV. " + text run at (374,5) width 8: "*" + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (382,5) size 515x39 + text run at (382,5) width 332: " The floating elements within this DIV should not go" + text run at (199,25) width 504: "any higher than the line-box containing the inline content which precedes them. " + text run at (703,25) width 8: "*" RenderBlock (floating) {P} at (544,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (658,25) size 720x99 - text run at (658,25) width 67: "This means" - text run at (199,45) width 336: "that the top side of each float can be, at most, as high as" - text run at (199,65) width 331: "the top edge of the inline element containing the content" - text run at (5,85) width 315: "just before the floating elements occur in the source. " - text run at (320,85) width 222: "In order to mark these points clearly," - text run at (5,105) width 371: "an asterisk has been inserted just before each floated element." - RenderBlock {DIV} at (6,1925) size 743x90 [border: (5px solid #800080)] - RenderText {#text} at (20,5) size 172x19 - text run at (20,5) width 164: "This is text within the DIV. " - text run at (184,5) width 8: "*" + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,45) size 538x99 + text run at (199,45) width 321: "This means that the top side of each float can be, at" + text run at (199,65) width 313: "most, as high as the top edge of the inline element" + text run at (199,85) width 343: "containing the content just before the floating elements" + text run at (5,105) width 127: "occur in the source. " + text run at (132,105) width 411: "In order to mark these points clearly, an asterisk has been inserted" + text run at (5,125) width 203: "just before each floated element." + RenderBlock {DIV} at (6,2024) size 743x90 [border: (5px solid #800080)] + RenderText {#text} at (20,5) size 183x19 + text run at (20,5) width 175: "This is text within the DIV. " + text run at (195,5) width 8: "*" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (192,5) size 703x39 - text run at (192,5) width 531: " The floating images within this DIV should not go any higher than the line-box containing" - text run at (20,25) width 239: "the inline content which precedes them. " - text run at (259,25) width 12: "* " + RenderText {#text} at (203,5) size 685x39 + text run at (203,5) width 502: " The floating images within this DIV should not go any higher than the line-box" + text run at (20,25) width 323: "containing the inline content which precedes them. " + text run at (343,25) width 12: "* " RenderImage {IMG} at (723,25) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (271,25) size 717x59 - text run at (271,25) width 429: "This means that the top side of each float can be, at most, as high as the" - text run at (5,45) width 617: "top edge of the inline element containing the content just before the floating images occur in the source. " - text run at (622,45) width 100: "In order to mark" - text run at (5,65) width 482: "these points clearly, an asterisk has been inserted just before each floated image." - RenderBlock {DIV} at (6,2065) size 743x290 [border: (5px solid #800080)] - RenderText {#text} at (199,5) size 172x19 - text run at (199,5) width 164: "This is text within the DIV. " - text run at (363,5) width 8: "*" - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - RenderText {#text} at (371,5) size 506x39 - text run at (371,5) width 334: " The floating elements within this DIV should not go any" - text run at (199,25) width 447: "higher than the line-box containing the inline content which precedes them. " - text run at (646,25) width 12: "* " + RenderText {#text} at (355,25) size 709x59 + text run at (355,25) width 359: "This means that the top side of each float can be, at most," + text run at (5,45) width 689: "as high as the top edge of the inline element containing the content just before the floating images occur in the" + text run at (5,65) width 49: "source. " + text run at (54,65) width 607: "In order to mark these points clearly, an asterisk has been inserted just before each floated image." + RenderBlock {DIV} at (6,2164) size 743x250 [border: (5px solid #800080)] + RenderText {#text} at (199,5) size 183x19 + text run at (199,5) width 175: "This is text within the DIV. " + text run at (374,5) width 8: "*" + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (382,5) size 515x39 + text run at (382,5) width 332: " The floating elements within this DIV should not go" + text run at (199,25) width 504: "any higher than the line-box containing the inline content which precedes them. " + text run at (703,25) width 8: "*" RenderBlock (floating) {P} at (544,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (658,25) size 526x39 - text run at (658,25) width 67: "This means" - text run at (199,45) width 230: "that the top side of each float can be,*" + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,45) size 314x19 + text run at (199,45) width 314: "This means that the top side of each float can be,*" RenderBlock (floating) {P} at (199,65) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 120x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 111: "paragraph (third in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (429,45) size 272x119 - text run at (429,45) width 114: " at most, as high as" - text run at (393,65) width 147: "the top edge of the inline" - text run at (393,85) width 132: "element containing the" - text run at (393,105) width 134: "content just before the" - text run at (393,125) width 151: "floating elements occur in" - text run at (587,145) width 70: "the source. " - text run at (657,145) width 8: "*" - RenderBlock (floating) {P} at (393,145) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 120x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 119: "paragraph (fourth in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (665,145) size 733x139 - text run at (665,145) width 69: " In order to" - text run at (587,165) width 106: "mark these points" - text run at (587,185) width 135: "clearly, an asterisk has" - text run at (587,205) width 148: "been inserted just before" - text run at (587,225) width 131: "each floated element. " - text run at (718,225) width 20: "If a" - text run at (5,245) width 709: "line has room for a floated element, then the element should float so that its top is aligned with the top of the line-box in" - text run at (5,265) width 167: "which the asterisk appears. " - text run at (172,265) width 380: "Otherwise, its top should align with the top of the next line-box." - RenderBlock {DIV} at (6,2373) size 743x130 [border: (5px solid #800080)] - RenderText {#text} at (20,5) size 172x19 - text run at (20,5) width 164: "This is text within the DIV. " - text run at (184,5) width 8: "*" + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 117: "paragraph (third in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (513,45) size 246x119 + text run at (513,45) width 15: " at" + text run at (393,65) width 147: "most, as high as the top" + text run at (393,85) width 109: "edge of the inline" + text run at (393,105) width 142: "element containing the" + text run at (393,125) width 139: "content just before the" + text run at (393,145) width 238: "floating elements occur in the source. " + text run at (631,145) width 8: "*" + RenderBlock (floating) {P} at (5,165) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 126: "paragraph (fourth in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (639,145) size 539x99 + text run at (639,145) width 70: " In order to" + text run at (199,165) width 491: "mark these points clearly, an asterisk has been inserted just before each floated" + text run at (199,185) width 57: "element. " + text run at (256,185) width 477: "If a line has room for a floated element, then the element should float so that" + text run at (199,205) width 470: "its top is aligned with the top of the line-box in which the asterisk appears. " + text run at (669,205) width 69: "Otherwise," + text run at (199,225) width 329: "its top should align with the top of the next line-box." + RenderBlock {DIV} at (6,2433) size 743x130 [border: (5px solid #800080)] + RenderText {#text} at (20,5) size 183x19 + text run at (20,5) width 175: "This is text within the DIV. " + text run at (195,5) width 8: "*" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (192,5) size 688x39 - text run at (192,5) width 531: " The floating images within this DIV should not go any higher than the line-box containing" - text run at (35,25) width 239: "the inline content which precedes them. " - text run at (274,25) width 12: "* " + RenderText {#text} at (203,5) size 670x39 + text run at (203,5) width 502: " The floating images within this DIV should not go any higher than the line-box" + text run at (35,25) width 323: "containing the inline content which precedes them. " + text run at (358,25) width 12: "* " RenderImage {IMG} at (723,25) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (286,25) size 305x19 - text run at (286,25) width 297: "This means that the top side of each float can be, " - text run at (583,25) width 8: "*" + RenderText {#text} at (370,25) size 318x19 + text run at (370,25) width 310: "This means that the top side of each float can be, " + text run at (680,25) width 8: "*" RenderImage {IMG} at (20,25) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (591,25) size 655x39 - text run at (591,25) width 114: " at most, as high as" - text run at (50,45) width 639: "the top edge of the inline element containing the content just before the floating images occur in the source. " - text run at (689,45) width 8: "*" - RenderImage {IMG} at (35,45) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (697,45) size 723x79 - text run at (697,45) width 16: " In" - text run at (50,65) width 574: "order to mark these points clearly, an asterisk has been inserted just before each floated image. " - text run at (624,65) width 104: "If a line has room" - text run at (5,85) width 714: "for a floated image, then the image should float so that its top is aligned with the top of the line-box in which the asterisk" - text run at (5,105) width 56: "appears. " - text run at (61,105) width 380: "Otherwise, its top should align with the top of the next line-box." - RenderBlock {DIV} at (6,2553) size 490x310 [border: (5px solid #800080)] - RenderText {#text} at (199,5) size 50x19 - text run at (199,5) width 50: "This is *" - RenderBlock (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - RenderText {#text} at (249,5) size 12x19 - text run at (249,5) width 12: " *" + RenderText {#text} at (688,25) size 703x59 + text run at (688,25) width 15: " at" + text run at (35,45) width 688: "most, as high as the top edge of the inline element containing the content just before the floating images occur" + text run at (20,65) width 88: "in the source. " + text run at (108,65) width 8: "*" + RenderImage {IMG} at (5,65) size 15x36 [border: (3px solid #000000)] + RenderText {#text} at (116,65) size 727x59 + text run at (116,65) width 611: " In order to mark these points clearly, an asterisk has been inserted just before each floated image." + text run at (20,85) width 712: "If a line has room for a floated image, then the image should float so that its top is aligned with the top of the line-" + text run at (5,105) width 217: "box in which the asterisk appears. " + text run at (222,105) width 402: "Otherwise, its top should align with the top of the next line-box." + RenderBlock {DIV} at (6,2613) size 490x330 [border: (5px solid #800080)] + RenderText {#text} at (199,5) size 54x19 + text run at (199,5) width 54: "This is *" + RenderBlock (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] + RenderText {#text} at (17,17) size 130x59 + text run at (17,17) width 130: "This is a left-floating" + text run at (17,37) width 112: "paragraph (first in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (253,5) size 12x19 + text run at (253,5) width 12: " *" RenderBlock (floating) {P} at (291,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - RenderText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - RenderText {#text} at (261,5) size 478x299 - text run at (261,5) width 26: " text" - text run at (199,25) width 92: "within the DIV." - text run at (199,45) width 83: "Under CSS1," - text run at (199,65) width 87: "the left floating" - text run at (5,85) width 249: "element should be placed in the upper left" - text run at (5,105) width 448: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,125) width 184: "border of the floating element. " - text run at (189,125) width 266: "Similarly, the right floating element should be" - text run at (5,145) width 465: "placed in the upper right corner of the DIV, and the purple border of the DIV" - text run at (5,165) width 434: "should abut the green border of the floating element. The text of the DIV" - text run at (5,185) width 448: "element should flow between and under the two floating elements. The two" - text run at (5,205) width 434: "asterisk characters mark the insertion points of the floating elements. It is" - text run at (5,225) width 460: "expected that, under future specifications, it may be acceptable for the top of" - text run at (5,245) width 478: "floated elements to align with the top of the line-box following the insertion point" - text run at (5,265) width 456: "of the floated element to avoid floating elements appearing before text which" - text run at (5,285) width 213: "precedes it in the source document." - RenderBlock {DIV} at (6,2881) size 490x230 [border: (5px solid #800080)] - RenderText {#text} at (20,5) size 50x19 - text run at (20,5) width 50: "This is *" + RenderText {#text} at (17,17) size 139x59 + text run at (17,17) width 139: "This is a right-floating" + text run at (17,37) width 132: "paragraph (second in" + text run at (17,57) width 50: "source)." + RenderText {#text} at (199,25) size 475x299 + text run at (199,25) width 90: "text within the" + text run at (199,45) width 35: "DIV. " + text run at (234,45) width 40: "Under" + text run at (199,65) width 88: "CSS1, the left" + text run at (199,85) width 48: "floating" + text run at (5,105) width 475: "element should be placed in the upper left corner of the DIV, and the purple" + text run at (5,125) width 446: "border of the DIV should abut the green border of the floating element." + text run at (5,145) width 443: "Similarly, the right floating element should be placed in the upper right" + text run at (5,165) width 465: "corner of the DIV, and the purple border of the DIV should abut the green" + text run at (5,185) width 450: "border of the floating element. The text of the DIV element should flow" + text run at (5,205) width 461: "between and under the two floating elements. The two asterisk characters" + text run at (5,225) width 468: "mark the insertion points of the floating elements. It is expected that, under" + text run at (5,245) width 470: "future specifications, it may be acceptable for the top of floated elements to" + text run at (5,265) width 475: "align with the top of the line-box following the insertion point of the floated" + text run at (5,285) width 466: "element to avoid floating elements appearing before text which precedes it" + text run at (5,305) width 150: "in the source document." + RenderBlock {DIV} at (6,2961) size 490x250 [border: (5px solid #800080)] + RenderText {#text} at (20,5) size 54x19 + text run at (20,5) width 54: "This is *" RenderImage {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (70,5) size 12x19 - text run at (70,5) width 12: " *" + RenderText {#text} at (74,5) size 12x19 + text run at (74,5) width 12: " *" RenderImage {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - RenderText {#text} at (82,5) size 479x219 - text run at (82,5) width 126: " text within the DIV. " - text run at (208,5) width 256: "Under CSS1, the left floating image should" - text run at (20,25) width 445: "be placed in the upper left corner of the DIV, and the purple border of the" - text run at (5,45) width 336: "DIV should abut the green border of the floating image. " - text run at (341,45) width 107: "Similarly, the right" - text run at (5,65) width 457: "floating image should be placed in the upper right corner of the DIV, and the" - text run at (5,85) width 457: "purple border of the DIV should abut the green border of the floating image." - text run at (5,105) width 456: "The text of the DIV element should flow between and under the two floating" - text run at (5,125) width 445: "image. The two asterisk characters mark the insertion points of the floating" - text run at (5,145) width 43: "image. " - text run at (48,145) width 424: "It is expected that, under future specifications, it may be acceptable for" - text run at (5,165) width 452: "the top of floated elements to align with the top of the line-box following the" - text run at (5,185) width 479: "insertion point of the floated element to avoid floating elements appearing before" - text run at (5,205) width 278: "text which precedes it in the source document." + RenderText {#text} at (86,5) size 480x239 + text run at (86,5) width 133: " text within the DIV. " + text run at (219,5) width 226: "Under CSS1, the left floating image" + text run at (20,25) width 422: "should be placed in the upper left corner of the DIV, and the purple" + text run at (5,45) width 435: "border of the DIV should abut the green border of the floating image." + text run at (5,65) width 476: "Similarly, the right floating image should be placed in the upper right corner" + text run at (5,85) width 466: "of the DIV, and the purple border of the DIV should abut the green border" + text run at (5,105) width 478: "of the floating image. The text of the DIV element should flow between and" + text run at (5,125) width 477: "under the two floating image. The two asterisk characters mark the insertion" + text run at (5,145) width 180: "points of the floating image. " + text run at (185,145) width 300: "It is expected that, under future specifications, it" + text run at (5,165) width 478: "may be acceptable for the top of floated elements to align with the top of the" + text run at (5,185) width 429: "line-box following the insertion point of the floated element to avoid" + text run at (5,205) width 442: "floating elements appearing before text which precedes it in the source" + text run at (5,225) width 66: "document." layer at (8,201) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,193) size 769x2 [border: (1px inset #000000)] layer at (32,283) size 579x2 clip at (0,0) size 0x0 RenderBlock {HR} at (24,275) size 579x2 [border: (1px inset #000000)] -layer at (372,408) size 41x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (364,400) size 41x2 [border: (1px inset #000000)] -layer at (32,492) size 579x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (24,484) size 579x2 [border: (1px inset #000000)] -layer at (372,756) size 41x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (364,748) size 41x2 [border: (1px inset #000000)] -layer at (32,1000) size 579x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (24,992) size 579x2 [border: (1px inset #000000)] -layer at (372,1398) size 41x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (364,1390) size 41x2 [border: (1px inset #000000)] -layer at (32,1678) size 579x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (24,1670) size 579x2 [border: (1px inset #000000)] -layer at (372,1842) size 41x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (364,1834) size 41x2 [border: (1px inset #000000)] -layer at (32,1946) size 579x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (24,1938) size 579x2 [border: (1px inset #000000)] -layer at (372,2111) size 41x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (364,2103) size 41x2 [border: (1px inset #000000)] -layer at (32,2235) size 579x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (24,2227) size 579x2 [border: (1px inset #000000)] -layer at (372,2500) size 41x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (364,2492) size 41x2 [border: (1px inset #000000)] -layer at (32,2664) size 579x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (24,2656) size 579x2 [border: (1px inset #000000)] -layer at (372,3008) size 41x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (364,3000) size 41x2 [border: (1px inset #000000)] -layer at (32,3272) size 579x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (24,3264) size 579x2 [border: (1px inset #000000)] -layer at (49,3395) size 562x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (28,68) size 563x2 [border: (1px inset #000000)] -layer at (379,3539) size 39x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (357,212) size 41x2 [border: (1px inset #000000)] -layer at (49,3623) size 562x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (28,296) size 563x2 [border: (1px inset #000000)] -layer at (379,3887) size 39x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (357,560) size 41x2 [border: (1px inset #000000)] -layer at (49,4131) size 562x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (28,804) size 563x2 [border: (1px inset #000000)] -layer at (379,4529) size 39x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (357,1202) size 41x2 [border: (1px inset #000000)] -layer at (49,4809) size 562x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (28,1482) size 563x2 [border: (1px inset #000000)] -layer at (379,4973) size 39x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (357,1646) size 41x2 [border: (1px inset #000000)] -layer at (49,5077) size 562x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (28,1750) size 563x2 [border: (1px inset #000000)] -layer at (379,5242) size 39x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (357,1915) size 41x2 [border: (1px inset #000000)] -layer at (49,5366) size 562x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (28,2039) size 563x2 [border: (1px inset #000000)] -layer at (379,5690) size 39x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (357,2363) size 41x2 [border: (1px inset #000000)] -layer at (49,5854) size 562x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (28,2527) size 563x2 [border: (1px inset #000000)] -layer at (379,6198) size 39x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (357,2871) size 41x2 [border: (1px inset #000000)] -layer at (49,6462) size 562x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (28,3135) size 563x2 [border: (1px inset #000000)] +layer at (372,427) size 41x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (364,419) size 41x2 [border: (1px inset #000000)] +layer at (32,531) size 579x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (24,523) size 579x2 [border: (1px inset #000000)] +layer at (372,815) size 41x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (364,807) size 41x2 [border: (1px inset #000000)] +layer at (32,1059) size 579x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (24,1051) size 579x2 [border: (1px inset #000000)] +layer at (372,1477) size 41x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (364,1469) size 41x2 [border: (1px inset #000000)] +layer at (32,1757) size 579x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (24,1749) size 579x2 [border: (1px inset #000000)] +layer at (372,1921) size 41x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (364,1913) size 41x2 [border: (1px inset #000000)] +layer at (32,2025) size 579x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (24,2017) size 579x2 [border: (1px inset #000000)] +layer at (372,2209) size 41x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (364,2201) size 41x2 [border: (1px inset #000000)] +layer at (32,2333) size 579x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (24,2325) size 579x2 [border: (1px inset #000000)] +layer at (372,2657) size 41x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (364,2649) size 41x2 [border: (1px inset #000000)] +layer at (32,2821) size 579x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (24,2813) size 579x2 [border: (1px inset #000000)] +layer at (372,3185) size 41x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (364,3177) size 41x2 [border: (1px inset #000000)] +layer at (32,3469) size 579x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (24,3461) size 579x2 [border: (1px inset #000000)] +layer at (49,3612) size 562x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (28,88) size 563x2 [border: (1px inset #000000)] +layer at (379,3756) size 39x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (357,232) size 41x2 [border: (1px inset #000000)] +layer at (49,3860) size 562x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (28,336) size 563x2 [border: (1px inset #000000)] +layer at (379,4144) size 39x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (357,620) size 41x2 [border: (1px inset #000000)] +layer at (49,4388) size 562x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (28,864) size 563x2 [border: (1px inset #000000)] +layer at (379,4806) size 39x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (357,1282) size 41x2 [border: (1px inset #000000)] +layer at (49,5086) size 562x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (28,1562) size 563x2 [border: (1px inset #000000)] +layer at (379,5250) size 39x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (357,1726) size 41x2 [border: (1px inset #000000)] +layer at (49,5354) size 562x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (28,1830) size 563x2 [border: (1px inset #000000)] +layer at (379,5538) size 39x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (357,2014) size 41x2 [border: (1px inset #000000)] +layer at (49,5662) size 562x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (28,2138) size 563x2 [border: (1px inset #000000)] +layer at (379,5947) size 39x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (357,2423) size 41x2 [border: (1px inset #000000)] +layer at (49,6111) size 562x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (28,2587) size 563x2 [border: (1px inset #000000)] +layer at (379,6475) size 39x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (357,2951) size 41x2 [border: (1px inset #000000)] +layer at (49,6759) size 562x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (28,3235) size 563x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/formatting_model/height_of_lines-expected.txt b/LayoutTests/platform/wincairo/css1/formatting_model/height_of_lines-expected.txt index 922f946e6472..c278f33e5399 100644 --- a/LayoutTests/platform/wincairo/css1/formatting_model/height_of_lines-expected.txt +++ b/LayoutTests/platform/wincairo/css1/formatting_model/height_of_lines-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x2345 RenderBlock {HTML} at (0,0) size 785x2345 RenderBody {BODY} at (8,8) size 769x2329 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x288 RenderText {#text} at (0,0) size 536x288 text run at (0,0) width 344: "P.one {font-size: 14px; line-height: 20px;}" @@ -42,94 +42,93 @@ layer at (0,0) size 785x2345 text run at (320,256) width 0: " " text run at (0,272) width 0: " " RenderBlock {P} at (0,353) size 769x464 - RenderText {#text} at (0,2) size 763x238 - text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (417,2) width 346: "This means that the lines of text within it should be separated" - text run at (0,22) width 371: "by six pixels, three of which are part of the line-box of each line. " - text run at (371,22) width 373: "Any images within the paragraph should increase the height of the" - text run at (0,224) width 294: "line-box so that they fit within the line box, such as " - RenderImage {IMG} at (294,40) size 200x200 - RenderText {#text} at (494,224) size 28x16 - text run at (494,224) width 28: " and " - RenderImage {IMG} at (522,224) size 200x200 - RenderText {#text} at (722,224) size 768x238 - text run at (722,224) width 8: ". " - text run at (730,224) width 38: "This is" - text run at (0,426) width 725: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top" - text run at (0,446) width 43: "aligned." + RenderText {#text} at (0,2) size 767x238 + text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " + text run at (420,2) width 347: "This means that the lines of text within it should be separated" + text run at (0,22) width 374: "by six pixels, three of which are part of the line-box of each line. " + text run at (374,22) width 375: "Any images within the paragraph should increase the height of the" + text run at (0,224) width 296: "line-box so that they fit within the line box, such as " + RenderImage {IMG} at (296,40) size 200x200 + RenderText {#text} at (496,224) size 28x16 + text run at (496,224) width 28: " and " + RenderImage {IMG} at (524,224) size 200x200 + RenderText {#text} at (724,224) size 757x238 + text run at (724,224) width 8: ". " + text run at (732,224) width 25: "This" + text run at (0,426) width 744: "is additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top" + text run at (0,446) width 45: "aligned." RenderBlock {P} at (0,831) size 769x484 - RenderText {#text} at (0,2) size 763x198 - text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (417,2) width 346: "This means that the lines of text within it should be separated" - text run at (0,22) width 78: "by six pixels. " - text run at (78,22) width 683: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding (5px)," - text run at (0,184) width 357: "border (10px) and margins (15px) within the line box, such as " - RenderImage {IMG} at (372,55) size 130x130 [border: (10px solid #000000)] - RenderText {#text} at (517,184) size 28x16 - text run at (517,184) width 28: " and " - RenderImage {IMG} at (560,199) size 130x130 [border: (10px solid #000000)] - RenderText {#text} at (705,184) size 768x257 - text run at (705,184) width 8: ". " - text run at (713,184) width 38: "This is" - text run at (0,346) width 725: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top" - text run at (0,366) width 47: "aligned. " - text run at (47,366) width 700: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image the" - text run at (0,386) width 768: "bottom border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin 15px" - text run at (0,425) width 143: "below the top of the text " - RenderImage {IMG} at (133,394) size 80x80 [border: (10px solid #000000)] - RenderText {#text} at (203,425) size 764x57 - text run at (203,425) width 8: ". " - text run at (211,425) width 553: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward" - text run at (0,466) width 392: "the image in the vertical direction, and also in the horizontal direction." + RenderText {#text} at (0,2) size 767x198 + text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " + text run at (420,2) width 347: "This means that the lines of text within it should be separated" + text run at (0,22) width 79: "by six pixels. " + text run at (79,22) width 652: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding" + text run at (0,184) width 395: "(5px), border (10px) and margins (15px) within the line box, such as " + RenderImage {IMG} at (410,55) size 130x130 [border: (10px solid #000000)] + RenderText {#text} at (555,184) size 28x16 + text run at (555,184) width 28: " and " + RenderImage {IMG} at (598,199) size 130x130 [border: (10px solid #000000)] + RenderText {#text} at (743,184) size 759x257 + text run at (743,184) width 4: "." + text run at (0,346) width 755: "This is additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-" + text run at (0,366) width 71: "top aligned. " + text run at (71,366) width 682: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image" + text run at (0,386) width 759: "the bottom border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin" + text run at (0,425) width 175: "15px below the top of the text " + RenderImage {IMG} at (165,394) size 80x80 [border: (10px solid #000000)] + RenderText {#text} at (235,425) size 754x57 + text run at (235,425) width 8: ". " + text run at (243,425) width 511: "The last image in this paragraph has -10px margins set on it, so that should pull the text in" + text run at (0,466) width 443: "toward the image in the vertical direction, and also in the horizontal direction." RenderTable {TABLE} at (0,1329) size 769x1000 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x998 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x970 RenderTableCell {TD} at (0,499) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x970 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x464 - RenderText {#text} at (0,2) size 726x238 - text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (417,2) width 289: "This means that the lines of text within it should be" - text run at (0,22) width 428: "separated by six pixels, three of which are part of the line-box of each line. " - text run at (428,22) width 298: "Any images within the paragraph should increase the" - text run at (0,224) width 369: "height of the line-box so that they fit within the line box, such as " - RenderImage {IMG} at (369,40) size 200x200 - RenderText {#text} at (569,224) size 24x16 - text run at (569,224) width 24: " and" + RenderText {#text} at (0,2) size 729x238 + text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " + text run at (420,2) width 291: "This means that the lines of text within it should be" + text run at (0,22) width 430: "separated by six pixels, three of which are part of the line-box of each line. " + text run at (430,22) width 299: "Any images within the paragraph should increase the" + text run at (0,224) width 372: "height of the line-box so that they fit within the line box, such as " + RenderImage {IMG} at (372,40) size 200x200 + RenderText {#text} at (572,224) size 24x16 + text run at (572,224) width 24: " and" RenderImage {IMG} at (0,244) size 200x200 - RenderText {#text} at (200,244) size 738x218 + RenderText {#text} at (200,244) size 741x218 text run at (200,244) width 8: ". " - text run at (208,244) width 530: "This is additional text to make sure that there is enough room left below the image so that this" - text run at (0,446) width 280: "line does not hit the image that is text-top aligned." + text run at (208,244) width 533: "This is additional text to make sure that there is enough room left below the image so that this" + text run at (0,446) width 285: "line does not hit the image that is text-top aligned." RenderBlock {P} at (4,482) size 747x484 - RenderText {#text} at (0,2) size 731x198 - text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (417,2) width 289: "This means that the lines of text within it should be" + RenderText {#text} at (0,2) size 738x198 + text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " + text run at (420,2) width 291: "This means that the lines of text within it should be" text run at (0,22) width 135: "separated by six pixels. " - text run at (135,22) width 596: "Any images within the paragraph should increase the height of the line-box so that they fit, including their" + text run at (135,22) width 603: "Any images within the paragraph should increase the height of the line-box so that they fit, including their" text run at (0,184) width 444: "padding (5px), border (10px) and margins (15px) within the line box, such as " RenderImage {IMG} at (459,55) size 130x130 [border: (10px solid #000000)] RenderText {#text} at (604,184) size 24x16 text run at (604,184) width 24: " and" RenderImage {IMG} at (15,219) size 130x130 [border: (10px solid #000000)] - RenderText {#text} at (160,204) size 729x237 + RenderText {#text} at (160,204) size 735x237 text run at (160,204) width 8: ". " - text run at (168,204) width 553: "This is additional text to make sure that there is enough room left below the image so that this line" - text run at (0,366) width 261: "does not hit the image that is text-top aligned. " - text run at (261,366) width 468: "It is the outer edge of the margin that should be text-bottom and text-top aligned in" - text run at (0,386) width 728: "this paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the" + text run at (168,204) width 558: "This is additional text to make sure that there is enough room left below the image so that this line" + text run at (0,366) width 264: "does not hit the image that is text-top aligned. " + text run at (264,366) width 471: "It is the outer edge of the margin that should be text-bottom and text-top aligned in" + text run at (0,386) width 730: "this paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the" text run at (0,425) width 415: "second image the top border should begin 15px below the top of the text " RenderImage {IMG} at (405,394) size 80x80 [border: (10px solid #000000)] - RenderText {#text} at (475,425) size 723x57 + RenderText {#text} at (475,425) size 724x57 text run at (475,425) width 8: ". " - text run at (483,425) width 240: "The last image in this paragraph has -10px" - text run at (0,466) width 705: "margins set on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction." + text run at (483,425) width 241: "The last image in this paragraph has -10px" + text run at (0,466) width 713: "margins set on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction." layer at (8,345) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,337) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/formatting_model/horizontal_formatting-expected.txt b/LayoutTests/platform/wincairo/css1/formatting_model/horizontal_formatting-expected.txt index d780b23159be..c09398aabc82 100644 --- a/LayoutTests/platform/wincairo/css1/formatting_model/horizontal_formatting-expected.txt +++ b/LayoutTests/platform/wincairo/css1/formatting_model/horizontal_formatting-expected.txt @@ -1,62 +1,65 @@ -layer at (0,0) size 785x728 +layer at (0,0) size 785x788 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x728 - RenderBlock {HTML} at (0,0) size 785x728 - RenderBody {BODY} at (8,8) size 769x704 [bgcolor=#CCCCCC] +layer at (0,0) size 785x788 + RenderBlock {HTML} at (0,0) size 785x788 + RenderBody {BODY} at (8,8) size 769x764 [bgcolor=#CCCCCC] RenderBlock {P} at (10,0) size 759x20 - RenderText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "This paragraph should be indented ten pixels." + RenderText {#text} at (0,0) size 286x19 + text run at (0,0) width 286: "This paragraph should be indented ten pixels." RenderBlock {DIV} at (10,36) size 759x20 RenderBlock {P} at (10,0) size 749x20 - RenderText {#text} at (0,0) size 539x19 - text run at (0,0) width 539: "This paragraph should be indented twenty pixels, since horizontal margins do not collapse." - RenderBlock {P} at (0,72) size 385x100 [bgcolor=#808080] - RenderText {#text} at (0,0) size 379x99 - text run at (0,0) width 345: "This element has a width of 50%, and due to 'auto' values" - text run at (0,20) width 366: "applied to the right margin, the element should be left justified" - text run at (0,40) width 102: "within its parent. " - text run at (102,40) width 277: "The gray rectangle should therefore appear on" - text run at (0,60) width 363: "the left edge of the viewport (e.g. the browser window). The" - text run at (0,80) width 315: "text inside the gray rectangle should not be centered." - RenderBlock {P} at (192,188) size 385x120 [bgcolor=#808080] - RenderText {#text} at (0,0) size 370x119 - text run at (0,0) width 345: "This element has a width of 50%, and due to 'auto' values" - text run at (0,20) width 348: "applied to the left and right margins, the element should be" - text run at (0,40) width 158: "centered within its parent. " - text run at (158,40) width 212: "The gray rectangle should therefore" - text run at (0,60) width 324: "appear in the middle of the viewport (e.g. the browser" - text run at (0,80) width 343: "window). The text inside the gray rectangle should not be" - text run at (0,100) width 56: "centered." - RenderBlock {P} at (384,324) size 385x100 [bgcolor=#808080] - RenderText {#text} at (0,0) size 379x99 - text run at (0,0) width 345: "This element has a width of 50%, and due to 'auto' values" - text run at (0,20) width 366: "applied to the left margin, the element should be right justified" - text run at (0,40) width 102: "within its parent. " - text run at (102,40) width 277: "The gray rectangle should therefore appear on" - text run at (0,60) width 371: "the right edge of the viewport (e.g. the browser window). The" - text run at (0,80) width 315: "text inside the gray rectangle should not be centered." - RenderBlock {P} at (0,440) size 769x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "Since the width is \"auto,\" the margins that are set to \"auto\" become zero and this paragraph should have width 100% and the" - text run at (0,20) width 160: "text should be left justified." - RenderBlock {P} at (0,496) size 769x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "Since the width is \"auto,\" the margins that are set to \"auto\" become zero and this paragraph should have width 100% and the" - text run at (0,20) width 160: "text should be left justified." - RenderBlock {P} at (0,552) size 769x40 [bgcolor=#808080] - RenderText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "Since the width is \"auto,\" the margins that are set to \"auto\" become zero and this paragraph should have width 100% and the" - text run at (0,20) width 160: "text should be left justified." - RenderBlock {P} at (0,608) size 385x60 [bgcolor=#808080] - RenderText {#text} at (0,0) size 362x39 - text run at (0,0) width 362: "Since auto is an invalid value for padding, the right-margin of" - text run at (0,20) width 200: "this paragraph should be reset to " + RenderText {#text} at (0,0) size 570x19 + text run at (0,0) width 570: "This paragraph should be indented twenty pixels, since horizontal margins do not collapse." + RenderBlock {P} at (0,72) size 385x120 [bgcolor=#808080] + RenderText {#text} at (0,0) size 375x119 + text run at (0,0) width 362: "This element has a width of 50%, and due to 'auto' values" + text run at (0,20) width 335: "applied to the right margin, the element should be left" + text run at (0,40) width 163: "justified within its parent. " + text run at (163,40) width 164: "The gray rectangle should" + text run at (0,60) width 358: "therefore appear on the left edge of the viewport (e.g. the" + text run at (0,80) width 375: "browser window). The text inside the gray rectangle should" + text run at (0,100) width 100: "not be centered." + RenderBlock {P} at (192,208) size 385x120 [bgcolor=#808080] + RenderText {#text} at (0,0) size 375x119 + text run at (0,0) width 362: "This element has a width of 50%, and due to 'auto' values" + text run at (0,20) width 368: "applied to the left and right margins, the element should be" + text run at (0,40) width 166: "centered within its parent. " + text run at (166,40) width 164: "The gray rectangle should" + text run at (0,60) width 343: "therefore appear in the middle of the viewport (e.g. the" + text run at (0,80) width 375: "browser window). The text inside the gray rectangle should" + text run at (0,100) width 100: "not be centered." + RenderBlock {P} at (384,344) size 385x120 [bgcolor=#808080] + RenderText {#text} at (0,0) size 375x119 + text run at (0,0) width 362: "This element has a width of 50%, and due to 'auto' values" + text run at (0,20) width 335: "applied to the left margin, the element should be right" + text run at (0,40) width 163: "justified within its parent. " + text run at (163,40) width 164: "The gray rectangle should" + text run at (0,60) width 367: "therefore appear on the right edge of the viewport (e.g. the" + text run at (0,80) width 375: "browser window). The text inside the gray rectangle should" + text run at (0,100) width 100: "not be centered." + RenderBlock {P} at (0,480) size 769x40 [bgcolor=#808080] + RenderText {#text} at (0,0) size 762x39 + text run at (0,0) width 762: "Since the width is \"auto,\" the margins that are set to \"auto\" become zero and this paragraph should have width 100% and" + text run at (0,20) width 193: "the text should be left justified." + RenderBlock {P} at (0,536) size 769x40 [bgcolor=#808080] + RenderText {#text} at (0,0) size 762x39 + text run at (0,0) width 762: "Since the width is \"auto,\" the margins that are set to \"auto\" become zero and this paragraph should have width 100% and" + text run at (0,20) width 193: "the text should be left justified." + RenderBlock {P} at (0,592) size 769x40 [bgcolor=#808080] + RenderText {#text} at (0,0) size 762x39 + text run at (0,0) width 762: "Since the width is \"auto,\" the margins that are set to \"auto\" become zero and this paragraph should have width 100% and" + text run at (0,20) width 193: "the text should be left justified." + RenderBlock {P} at (0,648) size 385x80 [bgcolor=#808080] + RenderText {#text} at (0,0) size 370x39 + text run at (0,0) width 370: "Since auto is an invalid value for padding, the right-margin" + text run at (0,20) width 224: "of this paragraph should be reset to " RenderInline {CODE} at (0,0) size 32x16 - RenderText {#text} at (200,23) size 32x16 - text run at (200,23) width 32: "auto" - RenderText {#text} at (232,20) size 384x39 - text run at (232,20) width 152: " and thus be expanded to" - text run at (0,40) width 354: "50% and it should only occupy the left half of the viewport." - RenderBlock {P} at (0,684) size 769x20 [bgcolor=#808080] - RenderText {#text} at (0,0) size 608x19 - text run at (0,0) width 608: "Because this paragraph has width 100%, the auto margins become zero, so it should not be centered." + RenderText {#text} at (224,23) size 32x16 + text run at (224,23) width 32: "auto" + RenderText {#text} at (256,20) size 369x59 + text run at (256,20) width 76: " and thus be" + text run at (0,40) width 369: "expanded to 50% and it should only occupy the left half of" + text run at (0,60) width 83: "the viewport." + RenderBlock {P} at (0,744) size 769x20 [bgcolor=#808080] + RenderText {#text} at (0,0) size 632x19 + text run at (0,0) width 632: "Because this paragraph has width 100%, the auto margins become zero, so it should not be centered." diff --git a/LayoutTests/platform/wincairo/css1/formatting_model/inline_elements-expected.txt b/LayoutTests/platform/wincairo/css1/formatting_model/inline_elements-expected.txt index 61b6bcd7f80b..43abe71fcee5 100644 --- a/LayoutTests/platform/wincairo/css1/formatting_model/inline_elements-expected.txt +++ b/LayoutTests/platform/wincairo/css1/formatting_model/inline_elements-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x790 RenderBlock {HTML} at (0,0) size 785x791 RenderBody {BODY} at (8,8) size 769x775 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x112 RenderText {#text} at (0,0) size 560x112 text run at (0,0) width 208: "P.one {line-height: 200%;}" @@ -22,76 +22,76 @@ layer at (0,0) size 785x790 text run at (192,80) width 0: " " text run at (0,96) width 0: " " RenderBlock {P} at (0,179) size 769x192 - RenderText {#text} at (0,6) size 179x19 - text run at (0,6) width 179: "This is a paragraph that has a " - RenderInline {SPAN} at (0,0) size 763x173 [border: (10px solid #FF0000)] - RenderText {#text} at (231,6) size 763x147 - text run at (231,6) width 532: "very long span in it, and the span has a 10px red border separated from the span by 2pt," - text run at (0,38) width 133: "and a margin of 30pt. " - text run at (133,38) width 621: "The padding and border should be present on all sides of the span (although vertical lines should appear" - text run at (0,70) width 421: "only at the beginning and the end of the whole span, not on each line). " - text run at (421,70) width 342: "The padding, border, and margin should all be noticeable" - text run at (0,102) width 223: "at the beginning and end of the span. " - text run at (223,102) width 527: "However, the line height should not be changed by any of them, so the margin should be" - text run at (0,134) width 374: "unnoticeable and the border should overlap text on other lines." - RenderText {#text} at (426,134) size 730x51 - text run at (426,134) width 5: " " - text run at (430,134) width 300: "The line spacing in the whole paragraph should be" - text run at (0,166) width 132: "200% of the font size." + RenderText {#text} at (0,6) size 187x19 + text run at (0,6) width 187: "This is a paragraph that has a " + RenderInline {SPAN} at (0,0) size 762x173 [border: (10px solid #FF0000)] + RenderText {#text} at (239,6) size 762x147 + text run at (239,6) width 523: "very long span in it, and the span has a 10px red border separated from the span by" + text run at (0,38) width 167: "2pt, and a margin of 30pt. " + text run at (167,38) width 560: "The padding and border should be present on all sides of the span (although vertical lines" + text run at (0,70) width 539: "should appear only at the beginning and the end of the whole span, not on each line). " + text run at (539,70) width 208: "The padding, border, and margin" + text run at (0,102) width 388: "should all be noticeable at the beginning and end of the span. " + text run at (388,102) width 366: "However, the line height should not be changed by any of" + text run at (0,134) width 585: "them, so the margin should be unnoticeable and the border should overlap text on other lines." + RenderText {#text} at (637,134) size 762x51 + text run at (637,134) width 5: " " + text run at (641,134) width 121: "The line spacing in" + text run at (0,166) width 336: "the whole paragraph should be 200% of the font size." RenderBlock {P} at (0,387) size 769x64 - RenderText {#text} at (0,0) size 160x15 - text run at (0,0) width 160: "This is a paragraph that has a " - RenderInline {SPAN} at (0,0) size 757x93 [border: (12px solid #FF0000)] - RenderText {#text} at (174,0) size 757x63 - text run at (174,0) width 548: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" - text run at (0,16) width 752: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the padding" - text run at (0,32) width 237: "and border should not effect the line height. " - text run at (237,32) width 520: "The span's border should have vertical lines only at the beginning and end of the whole span, not" - text run at (0,48) width 67: "on each line." - RenderText {#text} at (81,48) size 406x15 - text run at (81,48) width 4: " " - text run at (84,48) width 403: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." + RenderText {#text} at (0,0) size 159x15 + text run at (0,0) width 159: "This is a paragraph that has a " + RenderInline {SPAN} at (0,0) size 764x93 [border: (12px solid #FF0000)] + RenderText {#text} at (173,0) size 764x63 + text run at (173,0) width 553: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" + text run at (0,16) width 764: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the padding" + text run at (0,32) width 240: "and border should not effect the line height. " + text run at (240,32) width 524: "The span's border should have vertical lines only at the beginning and end of the whole span, not" + text run at (0,48) width 69: "on each line." + RenderText {#text} at (83,48) size 416x15 + text run at (83,48) width 4: " " + text run at (86,48) width 413: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." RenderTable {TABLE} at (0,464) size 769x311 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x308 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x280 RenderTableCell {TD} at (0,154) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x280 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x192 - RenderText {#text} at (0,6) size 179x19 - text run at (0,6) width 179: "This is a paragraph that has a " - RenderInline {SPAN} at (0,0) size 744x173 [border: (10px solid #FF0000)] - RenderText {#text} at (231,6) size 744x147 - text run at (231,6) width 504: "very long span in it, and the span has a 10px red border separated from the span by" - text run at (0,38) width 161: "2pt, and a margin of 30pt. " - text run at (161,38) width 575: "The padding and border should be present on all sides of the span (although vertical lines should" - text run at (0,70) width 467: "appear only at the beginning and the end of the whole span, not on each line). " - text run at (467,70) width 277: "The padding, border, and margin should all be" - text run at (0,102) width 288: "noticeable at the beginning and end of the span. " - text run at (288,102) width 421: "However, the line height should not be changed by any of them, so the" - text run at (0,134) width 480: "margin should be unnoticeable and the border should overlap text on other lines." - RenderText {#text} at (532,134) size 709x51 - text run at (532,134) width 5: " " - text run at (536,134) width 173: "The line spacing in the whole" - text run at (0,166) width 259: "paragraph should be 200% of the font size." + RenderText {#text} at (0,6) size 187x19 + text run at (0,6) width 187: "This is a paragraph that has a " + RenderInline {SPAN} at (0,0) size 747x173 [border: (10px solid #FF0000)] + RenderText {#text} at (239,6) size 747x147 + text run at (239,6) width 503: "very long span in it, and the span has a 10px red border separated from the span" + text run at (0,38) width 187: "by 2pt, and a margin of 30pt. " + text run at (187,38) width 560: "The padding and border should be present on all sides of the span (although vertical lines" + text run at (0,70) width 539: "should appear only at the beginning and the end of the whole span, not on each line). " + text run at (539,70) width 208: "The padding, border, and margin" + text run at (0,102) width 388: "should all be noticeable at the beginning and end of the span. " + text run at (388,102) width 349: "However, the line height should not be changed by any" + text run at (0,134) width 602: "of them, so the margin should be unnoticeable and the border should overlap text on other lines." + RenderText {#text} at (654,134) size 711x51 + text run at (654,134) width 5: " " + text run at (658,134) width 53: "The line" + text run at (0,166) width 404: "spacing in the whole paragraph should be 200% of the font size." RenderBlock {P} at (4,212) size 747x64 - RenderText {#text} at (0,0) size 160x15 - text run at (0,0) width 160: "This is a paragraph that has a " - RenderInline {SPAN} at (0,0) size 722x93 [border: (12px solid #FF0000)] - RenderText {#text} at (174,0) size 722x63 - text run at (174,0) width 548: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" - text run at (0,16) width 705: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the" - text run at (0,32) width 284: "padding and border should not effect the line height. " - text run at (284,32) width 432: "The span's border should have vertical lines only at the beginning and end of the" - text run at (0,48) width 155: "whole span, not on each line." - RenderText {#text} at (169,48) size 406x15 - text run at (169,48) width 4: " " - text run at (172,48) width 403: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." + RenderText {#text} at (0,0) size 159x15 + text run at (0,0) width 159: "This is a paragraph that has a " + RenderInline {SPAN} at (0,0) size 726x93 [border: (12px solid #FF0000)] + RenderText {#text} at (173,0) size 726x63 + text run at (173,0) width 553: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" + text run at (0,16) width 716: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the" + text run at (0,32) width 288: "padding and border should not effect the line height. " + text run at (288,32) width 436: "The span's border should have vertical lines only at the beginning and end of the" + text run at (0,48) width 157: "whole span, not on each line." + RenderText {#text} at (171,48) size 416x15 + text run at (171,48) width 4: " " + text run at (174,48) width 413: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." layer at (8,169) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,161) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/formatting_model/replaced_elements-expected.txt b/LayoutTests/platform/wincairo/css1/formatting_model/replaced_elements-expected.txt index 47b534f12d0f..a8eb8c7d0b90 100644 --- a/LayoutTests/platform/wincairo/css1/formatting_model/replaced_elements-expected.txt +++ b/LayoutTests/platform/wincairo/css1/formatting_model/replaced_elements-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x2377 RenderBlock {HTML} at (0,0) size 785x2377 RenderBody {BODY} at (8,8) size 769x2361 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x128 RenderText {#text} at (0,0) size 504x128 text run at (0,0) width 208: "IMG.one {display: inline;}" @@ -26,35 +26,35 @@ layer at (0,0) size 785x2377 text run at (464,112) width 0: " " RenderBlock {P} at (0,195) size 769x20 RenderImage {IMG} at (0,0) size 15x15 - RenderText {#text} at (15,0) size 411x19 - text run at (15,0) width 411: "The image at the beginning of this sentence should be a 15px square." + RenderText {#text} at (15,0) size 434x19 + text run at (15,0) width 434: "The image at the beginning of this sentence should be a 15px square." RenderImage {IMG} at (0,231) size 15x15 RenderBlock {P} at (0,262) size 769x20 - RenderText {#text} at (0,0) size 467x19 - text run at (0,0) width 467: "The above image should be a 15px square with the same left edge as this text." + RenderText {#text} at (0,0) size 489x19 + text run at (0,0) width 489: "The above image should be a 15px square with the same left edge as this text." RenderImage {IMG} at (377,298) size 15x15 RenderBlock {P} at (0,329) size 769x20 - RenderText {#text} at (0,0) size 383x19 - text run at (0,0) width 383: "The above image should be a 15px square aligned at the center." + RenderText {#text} at (0,0) size 399x19 + text run at (0,0) width 399: "The above image should be a 15px square aligned at the center." RenderImage {IMG} at (192,365) size 385x385 RenderBlock {P} at (0,765) size 769x41 - RenderText {#text} at (0,0) size 750x39 - text run at (0,0) width 750: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally within the" - text run at (0,20) width 95: "parent element: " - text run at (95,20) width 375: "the document body in the first half, and the table in the second." + RenderText {#text} at (0,0) size 766x39 + text run at (0,0) width 766: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally within" + text run at (0,20) width 123: "the parent element: " + text run at (123,20) width 395: "the document body in the first half, and the table in the second." RenderImage {IMG} at (384,821) size 385x385 RenderBlock {P} at (0,1222) size 769x40 - RenderText {#text} at (0,0) size 765x39 - text run at (0,0) width 765: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of the parent" - text run at (0,20) width 53: "element: " - text run at (53,20) width 375: "the document body in the first half, and the table in the second." + RenderText {#text} at (0,0) size 758x39 + text run at (0,0) width 758: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of the" + text run at (0,20) width 100: "parent element: " + text run at (100,20) width 395: "the document body in the first half, and the table in the second." RenderTable {TABLE} at (0,1278) size 769x1083 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x1081 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x1053 RenderTableCell {TD} at (0,540) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 @@ -62,27 +62,27 @@ layer at (0,0) size 785x2377 RenderTableCell {TD} at (12,28) size 755x1053 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 RenderImage {IMG} at (0,0) size 15x15 - RenderText {#text} at (15,0) size 411x19 - text run at (15,0) width 411: "The image at the beginning of this sentence should be a 15px square." + RenderText {#text} at (15,0) size 434x19 + text run at (15,0) width 434: "The image at the beginning of this sentence should be a 15px square." RenderImage {IMG} at (4,40) size 15x15 RenderBlock {P} at (4,71) size 747x20 - RenderText {#text} at (0,0) size 467x19 - text run at (0,0) width 467: "The above image should be a 15px square with the same left edge as this text." + RenderText {#text} at (0,0) size 489x19 + text run at (0,0) width 489: "The above image should be a 15px square with the same left edge as this text." RenderImage {IMG} at (370,107) size 15x15 RenderBlock {P} at (4,138) size 747x20 - RenderText {#text} at (0,0) size 383x19 - text run at (0,0) width 383: "The above image should be a 15px square aligned at the center." + RenderText {#text} at (0,0) size 399x19 + text run at (0,0) width 399: "The above image should be a 15px square aligned at the center." RenderImage {IMG} at (190,174) size 375x374 RenderBlock {P} at (4,563) size 747x41 - RenderText {#text} at (0,0) size 728x39 - text run at (0,0) width 728: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally within" - text run at (0,20) width 117: "the parent element: " - text run at (117,20) width 375: "the document body in the first half, and the table in the second." + RenderText {#text} at (0,0) size 722x39 + text run at (0,0) width 722: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally" + text run at (0,20) width 167: "within the parent element: " + text run at (167,20) width 395: "the document body in the first half, and the table in the second." RenderImage {IMG} at (377,619) size 374x374 RenderBlock {P} at (4,1009) size 747x40 - RenderText {#text} at (0,0) size 723x39 - text run at (0,0) width 723: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of the" - text run at (0,20) width 95: "parent element: " - text run at (95,20) width 375: "the document body in the first half, and the table in the second." + RenderText {#text} at (0,0) size 735x39 + text run at (0,0) width 735: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of" + text run at (0,20) width 123: "the parent element: " + text run at (123,20) width 395: "the document body in the first half, and the table in the second." layer at (8,185) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,177) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/formatting_model/vertical_formatting-expected.txt b/LayoutTests/platform/wincairo/css1/formatting_model/vertical_formatting-expected.txt index 2dc602849569..da2e55fe28fa 100644 --- a/LayoutTests/platform/wincairo/css1/formatting_model/vertical_formatting-expected.txt +++ b/LayoutTests/platform/wincairo/css1/formatting_model/vertical_formatting-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x2579 +layer at (0,0) size 785x2599 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2579 - RenderBlock {HTML} at (0,0) size 785x2579 - RenderBody {BODY} at (8,8) size 769x2563 [bgcolor=#CCCCCC] +layer at (0,0) size 785x2599 + RenderBlock {HTML} at (0,0) size 785x2599 + RenderBody {BODY} at (8,8) size 769x2583 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x320 RenderText {#text} at (0,0) size 496x320 text run at (0,0) width 368: "P.one {margin-bottom: 2cm; padding-bottom: 0;}" @@ -48,125 +48,126 @@ layer at (0,0) size 785x2579 text run at (160,288) width 0: " " text run at (0,304) width 0: " " RenderBlock {P} at (0,387) size 769x40 - RenderText {#text} at (0,0) size 720x39 - text run at (0,0) width 720: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins should" - text run at (0,20) width 240: "collapse to the maximum of the margins." + RenderText {#text} at (0,0) size 754x39 + text run at (0,0) width 754: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins should" + text run at (0,20) width 255: "collapse to the maximum of the margins." RenderBlock {P} at (0,502) size 769x21 - RenderText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This is another paragraph." RenderBlock {P} at (0,538) size 769x21 - RenderText {#text} at (0,0) size 472x19 - text run at (0,0) width 472: "There should be a two-centimeter margin between this paragraph and the next." + RenderText {#text} at (0,0) size 494x19 + text run at (0,0) width 494: "There should be a two-centimeter margin between this paragraph and the next." RenderBlock {P} at (0,634) size 769x21 - RenderText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This is another paragraph." RenderBlock {P} at (0,670) size 769x41 - RenderText {#text} at (0,0) size 756x39 - text run at (0,0) width 756: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative margin, the" - text run at (0,20) width 371: "two margins should be added (the minus sign should be kept)." + RenderText {#text} at (0,0) size 719x39 + text run at (0,0) width 719: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative" + text run at (0,20) width 465: "margin, the two margins should be added (the minus sign should be kept)." RenderBlock {P} at (0,747) size 769x21 - RenderText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." - RenderBlock {DIV} at (0,805) size 769x117 - RenderBlock {P} at (0,75) size 769x41 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 750: "There should be three centimeters between this text and the text above, but only one centimeter between this text and the text" - text run at (0,20) width 753: "below, because vertical margins of nested elements should collapse only if there is no border or padding between the margins." - RenderBlock {P} at (0,959) size 769x21 - RenderText {#text} at (0,0) size 103x19 - text run at (0,0) width 103: "This is more text." - RenderBlock {P} at (0,995) size 769x116 - RenderText {#text} at (0,0) size 748x39 - text run at (0,0) width 748: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a negative" - text run at (0,20) width 376: "margin with the largest absolute value of the margins collapsed." - RenderBlock {P} at (0,1072) size 769x79 - RenderText {#text} at (0,37) size 753x40 - text run at (0,37) width 753: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the one" - text run at (0,57) width 146: "below it and to the right." - RenderBlock (floating) {P} at (0,1226) size 385x61 - RenderText {#text} at (0,0) size 366x59 - text run at (0,0) width 366: "There should be two centimeters between this paragraph and" - text run at (0,20) width 346: "the one above it, since margins do not collapse on floating" - text run at (0,40) width 56: "elements." - RenderBlock {P} at (0,1188) size 769x61 - RenderText {#text} at (384,0) size 382x59 - text run at (384,0) width 382: "There should be one centimeter between this paragraph and the" - text run at (384,20) width 375: "(non-floating) one above it, since the float should not effect the" - text run at (384,40) width 115: "paragraph spacing." - RenderBlock {P} at (0,1302) size 769x78 - RenderText {#text} at (0,0) size 766x39 - text run at (0,0) width 531: "There should be two centimeters of padding between this paragraph and the one below. " - text run at (531,0) width 235: "Padding does not collapse, and there is" - text run at (0,20) width 177: "1cm of padding on each side." - RenderBlock {P} at (0,1380) size 769x58 - RenderText {#text} at (0,37) size 158x20 - text run at (0,37) width 158: "This is the next paragraph." - RenderTable {TABLE} at (0,1453) size 769x1110 [border: (1px outset #808080)] + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This is another paragraph." + RenderBlock {DIV} at (0,805) size 769x137 + RenderBlock {P} at (0,75) size 769x61 + RenderText {#text} at (0,0) size 759x59 + text run at (0,0) width 757: "There should be three centimeters between this text and the text above, but only one centimeter between this text and the" + text run at (0,20) width 759: "text below, because vertical margins of nested elements should collapse only if there is no border or padding between the" + text run at (0,40) width 54: "margins." + RenderBlock {P} at (0,979) size 769x21 + RenderText {#text} at (0,0) size 109x19 + text run at (0,0) width 109: "This is more text." + RenderBlock {P} at (0,1015) size 769x116 + RenderText {#text} at (0,0) size 725x39 + text run at (0,0) width 725: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a" + text run at (0,20) width 456: "negative margin with the largest absolute value of the margins collapsed." + RenderBlock {P} at (0,1092) size 769x79 + RenderText {#text} at (0,37) size 765x40 + text run at (0,37) width 765: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the" + text run at (0,57) width 181: "one below it and to the right." + RenderBlock (floating) {P} at (0,1246) size 385x61 + RenderText {#text} at (0,0) size 382x59 + text run at (0,0) width 382: "There should be two centimeters between this paragraph and" + text run at (0,20) width 365: "the one above it, since margins do not collapse on floating" + text run at (0,40) width 59: "elements." + RenderBlock {P} at (0,1208) size 769x61 + RenderText {#text} at (384,0) size 376x59 + text run at (384,0) width 376: "There should be one centimeter between this paragraph and" + text run at (384,20) width 357: "the (non-floating) one above it, since the float should not" + text run at (384,40) width 182: "effect the paragraph spacing." + RenderBlock {P} at (0,1322) size 769x78 + RenderText {#text} at (0,0) size 749x39 + text run at (0,0) width 554: "There should be two centimeters of padding between this paragraph and the one below. " + text run at (554,0) width 195: "Padding does not collapse, and" + text run at (0,20) width 234: "there is 1cm of padding on each side." + RenderBlock {P} at (0,1400) size 769x58 + RenderText {#text} at (0,37) size 167x20 + text run at (0,37) width 167: "This is the next paragraph." + RenderTable {TABLE} at (0,1473) size 769x1110 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x1107 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x1079 RenderTableCell {TD} at (0,553) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x1079 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x40 - RenderText {#text} at (0,0) size 720x39 - text run at (0,0) width 720: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins should" - text run at (0,20) width 240: "collapse to the maximum of the margins." + RenderText {#text} at (0,0) size 708x39 + text run at (0,0) width 708: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins" + text run at (0,20) width 301: "should collapse to the maximum of the margins." RenderBlock {P} at (4,119) size 747x21 - RenderText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This is another paragraph." RenderBlock {P} at (4,155) size 747x21 - RenderText {#text} at (0,0) size 472x19 - text run at (0,0) width 472: "There should be a two-centimeter margin between this paragraph and the next." + RenderText {#text} at (0,0) size 494x19 + text run at (0,0) width 494: "There should be a two-centimeter margin between this paragraph and the next." RenderBlock {P} at (4,251) size 747x21 - RenderText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This is another paragraph." RenderBlock {P} at (4,287) size 747x41 - RenderText {#text} at (0,0) size 734x39 - text run at (0,0) width 734: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative margin," - text run at (0,20) width 393: "the two margins should be added (the minus sign should be kept)." + RenderText {#text} at (0,0) size 719x39 + text run at (0,0) width 719: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative" + text run at (0,20) width 465: "margin, the two margins should be added (the minus sign should be kept)." RenderBlock {P} at (4,364) size 747x21 - RenderText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This is another paragraph." RenderBlock {DIV} at (4,422) size 747x137 RenderBlock {P} at (0,75) size 747x61 - RenderText {#text} at (0,0) size 725x59 - text run at (0,0) width 724: "There should be three centimeters between this text and the text above, but only one centimeter between this text and the" - text run at (0,20) width 725: "text below, because vertical margins of nested elements should collapse only if there is no border or padding between the" - text run at (0,40) width 50: "margins." + RenderText {#text} at (0,0) size 734x59 + text run at (0,0) width 734: "There should be three centimeters between this text and the text above, but only one centimeter between this text and" + text run at (0,20) width 702: "the text below, because vertical margins of nested elements should collapse only if there is no border or padding" + text run at (0,40) width 134: "between the margins." RenderBlock {P} at (4,596) size 747x21 - RenderText {#text} at (0,0) size 103x19 - text run at (0,0) width 103: "This is more text." + RenderText {#text} at (0,0) size 109x19 + text run at (0,0) width 109: "This is more text." RenderBlock {P} at (4,632) size 747x116 - RenderText {#text} at (0,0) size 695x39 - text run at (0,0) width 695: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a" - text run at (0,20) width 429: "negative margin with the largest absolute value of the margins collapsed." + RenderText {#text} at (0,0) size 725x39 + text run at (0,0) width 725: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a" + text run at (0,20) width 456: "negative margin with the largest absolute value of the margins collapsed." RenderBlock {P} at (4,709) size 747x79 - RenderText {#text} at (0,37) size 727x40 - text run at (0,37) width 727: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the" - text run at (0,57) width 172: "one below it and to the right." + RenderText {#text} at (0,37) size 742x40 + text run at (0,37) width 742: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and" + text run at (0,57) width 204: "the one below it and to the right." RenderBlock (floating) {P} at (4,863) size 374x61 - RenderText {#text} at (0,0) size 366x59 - text run at (0,0) width 366: "There should be two centimeters between this paragraph and" - text run at (0,20) width 346: "the one above it, since margins do not collapse on floating" - text run at (0,40) width 56: "elements." + RenderText {#text} at (0,0) size 355x59 + text run at (0,0) width 355: "There should be two centimeters between this paragraph" + text run at (0,20) width 340: "and the one above it, since margins do not collapse on" + text run at (0,40) width 111: "floating elements." RenderBlock {P} at (4,825) size 747x61 RenderText {#text} at (373,0) size 360x59 - text run at (373,0) width 360: "There should be one centimeter between this paragraph and" - text run at (373,20) width 338: "the (non-floating) one above it, since the float should not" - text run at (373,40) width 174: "effect the paragraph spacing." + text run at (373,0) width 349: "There should be one centimeter between this paragraph" + text run at (373,20) width 360: "and the (non-floating) one above it, since the float should" + text run at (373,40) width 206: "not effect the paragraph spacing." RenderBlock {P} at (4,939) size 747x78 - RenderText {#text} at (0,0) size 719x39 - text run at (0,0) width 531: "There should be two centimeters of padding between this paragraph and the one below. " - text run at (531,0) width 188: "Padding does not collapse, and" - text run at (0,20) width 224: "there is 1cm of padding on each side." + RenderText {#text} at (0,0) size 722x39 + text run at (0,0) width 554: "There should be two centimeters of padding between this paragraph and the one below. " + text run at (554,0) width 168: "Padding does not collapse," + text run at (0,20) width 261: "and there is 1cm of padding on each side." RenderBlock {P} at (4,1017) size 747x58 - RenderText {#text} at (0,37) size 158x20 - text run at (0,37) width 158: "This is the next paragraph." + RenderText {#text} at (0,37) size 167x20 + text run at (0,37) width 167: "This is the next paragraph." layer at (8,377) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,369) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/pseudo/anchor-expected.txt b/LayoutTests/platform/wincairo/css1/pseudo/anchor-expected.txt index 0f1dc48f7a0d..9054e66531ef 100644 --- a/LayoutTests/platform/wincairo/css1/pseudo/anchor-expected.txt +++ b/LayoutTests/platform/wincairo/css1/pseudo/anchor-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x737 RenderBlock {HTML} at (0,0) size 785x737 RenderBody {BODY} at (8,8) size 769x721 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x96 RenderText {#text} at (0,0) size 200x96 text run at (0,0) width 136: "A {color: green;}" @@ -20,14 +20,14 @@ layer at (0,0) size 785x737 text run at (176,64) width 0: " " text run at (0,80) width 0: " " RenderBlock {P} at (0,163) size 769x20 - RenderText {#text} at (0,0) size 477x19 - text run at (0,0) width 477: "The following anchors should appear as described; none of them should be red." + RenderText {#text} at (0,0) size 500x19 + text run at (0,0) width 500: "The following anchors should appear as described; none of them should be red." RenderBlock {UL} at (0,199) size 769x160 RenderListItem {LI} at (40,0) size 729x120 RenderBlock (anonymous) at (0,0) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 534x19 - text run at (0,0) width 534: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" + RenderText {#text} at (0,0) size 567x19 + text run at (0,0) width 567: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" RenderBlock {UL} at (0,20) size 729x100 RenderListItem {LI} at (40,0) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet @@ -37,15 +37,15 @@ layer at (0,0) size 785x737 RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (40,20) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderInline {A} at (0,0) size 110x19 [color=#800080] - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "NIST Web server" + RenderInline {A} at (0,0) size 111x19 [color=#800080] + RenderText {#text} at (0,0) size 111x19 + text run at (0,0) width 111: "NIST Web server" RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (40,40) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderInline {A} at (0,0) size 122x19 [color=#800080] - RenderText {#text} at (0,0) size 122x19 - text run at (0,0) width 122: "CWRU Web server" + RenderInline {A} at (0,0) size 124x19 [color=#800080] + RenderText {#text} at (0,0) size 124x19 + text run at (0,0) width 124: "CWRU Web server" RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (40,60) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet @@ -55,55 +55,55 @@ layer at (0,0) size 785x737 RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (40,80) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderInline {A} at (0,0) size 54x19 [color=#800080] - RenderText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Erewhon" - RenderText {#text} at (54,0) size 209x19 - text run at (54,0) width 209: " (don't click on it, it goes nowhere)" + RenderInline {A} at (0,0) size 58x19 [color=#800080] + RenderText {#text} at (0,0) size 58x19 + text run at (0,0) width 58: "Erewhon" + RenderText {#text} at (58,0) size 219x19 + text run at (58,0) width 219: " (don't click on it, it goes nowhere)" RenderListItem {LI} at (40,120) size 729x40 RenderBlock (anonymous) at (0,0) size 729x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 192x19 - text run at (0,0) width 192: "Dark green in any circumstance:" + RenderText {#text} at (0,0) size 204x19 + text run at (0,0) width 204: "Dark green in any circumstance:" RenderBlock {UL} at (0,20) size 729x20 RenderListItem {LI} at (40,0) size 689x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderInline {A} at (0,0) size 122x19 [color=#006600] - RenderText {#text} at (0,0) size 122x19 - text run at (0,0) width 122: "CWRU Web server" + RenderInline {A} at (0,0) size 124x19 [color=#006600] + RenderText {#text} at (0,0) size 124x19 + text run at (0,0) width 124: "CWRU Web server" RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,375) size 769x40 - RenderText {#text} at (0,0) size 114x19 - text run at (0,0) width 114: "The quoted word \"" - RenderInline {A} at (0,0) size 41x19 [color=#008000] - RenderText {#text} at (114,0) size 41x19 - text run at (114,0) width 41: "anchor" - RenderText {#text} at (155,0) size 756x39 - text run at (155,0) width 360: "\" should be green, NOT purple, since it's part of an anchor. " - text run at (515,0) width 241: "It's a named anchor, and styles declared" - text run at (0,20) width 283: "for the A tag are applied to them under CSS1. " - text run at (283,20) width 310: "It also should NOT turn orange when clicked upon." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "The quoted word \"" + RenderInline {A} at (0,0) size 43x19 [color=#008000] + RenderText {#text} at (118,0) size 43x19 + text run at (118,0) width 43: "anchor" + RenderText {#text} at (161,0) size 729x39 + text run at (161,0) width 376: "\" should be green, NOT purple, since it's part of an anchor. " + text run at (537,0) width 192: "It's a named anchor, and styles" + text run at (0,20) width 349: "declared for the A tag are applied to them under CSS1. " + text run at (349,20) width 326: "It also should NOT turn orange when clicked upon." RenderTable {TABLE} at (0,431) size 769x290 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x288 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x260 RenderTableCell {TD} at (0,144) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x260 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 477x19 - text run at (0,0) width 477: "The following anchors should appear as described; none of them should be red." + RenderText {#text} at (0,0) size 500x19 + text run at (0,0) width 500: "The following anchors should appear as described; none of them should be red." RenderBlock {UL} at (4,40) size 747x160 RenderListItem {LI} at (40,0) size 707x120 RenderBlock (anonymous) at (0,0) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 534x19 - text run at (0,0) width 534: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" + RenderText {#text} at (0,0) size 567x19 + text run at (0,0) width 567: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" RenderBlock {UL} at (0,20) size 707x100 RenderListItem {LI} at (40,0) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet @@ -113,15 +113,15 @@ layer at (0,0) size 785x737 RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (40,20) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderInline {A} at (0,0) size 110x19 [color=#800080] - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "NIST Web server" + RenderInline {A} at (0,0) size 111x19 [color=#800080] + RenderText {#text} at (0,0) size 111x19 + text run at (0,0) width 111: "NIST Web server" RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (40,40) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderInline {A} at (0,0) size 122x19 [color=#800080] - RenderText {#text} at (0,0) size 122x19 - text run at (0,0) width 122: "CWRU Web server" + RenderInline {A} at (0,0) size 124x19 [color=#800080] + RenderText {#text} at (0,0) size 124x19 + text run at (0,0) width 124: "CWRU Web server" RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (40,60) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet @@ -131,33 +131,33 @@ layer at (0,0) size 785x737 RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (40,80) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderInline {A} at (0,0) size 54x19 [color=#800080] - RenderText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Erewhon" - RenderText {#text} at (54,0) size 209x19 - text run at (54,0) width 209: " (don't click on it, it goes nowhere)" + RenderInline {A} at (0,0) size 58x19 [color=#800080] + RenderText {#text} at (0,0) size 58x19 + text run at (0,0) width 58: "Erewhon" + RenderText {#text} at (58,0) size 219x19 + text run at (58,0) width 219: " (don't click on it, it goes nowhere)" RenderListItem {LI} at (40,120) size 707x40 RenderBlock (anonymous) at (0,0) size 707x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 192x19 - text run at (0,0) width 192: "Dark green in any circumstance:" + RenderText {#text} at (0,0) size 204x19 + text run at (0,0) width 204: "Dark green in any circumstance:" RenderBlock {UL} at (0,20) size 707x20 RenderListItem {LI} at (40,0) size 667x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderInline {A} at (0,0) size 122x19 [color=#006600] - RenderText {#text} at (0,0) size 122x19 - text run at (0,0) width 122: "CWRU Web server" + RenderInline {A} at (0,0) size 124x19 [color=#006600] + RenderText {#text} at (0,0) size 124x19 + text run at (0,0) width 124: "CWRU Web server" RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,216) size 747x40 - RenderText {#text} at (0,0) size 114x19 - text run at (0,0) width 114: "The quoted word \"" - RenderInline {A} at (0,0) size 41x19 [color=#008000] - RenderText {#text} at (114,0) size 41x19 - text run at (114,0) width 41: "anchor" - RenderText {#text} at (155,0) size 700x39 - text run at (155,0) width 360: "\" should be green, NOT purple, since it's part of an anchor. " - text run at (515,0) width 185: "It's a named anchor, and styles" - text run at (0,20) width 339: "declared for the A tag are applied to them under CSS1. " - text run at (339,20) width 310: "It also should NOT turn orange when clicked upon." + RenderText {#text} at (0,0) size 118x19 + text run at (0,0) width 118: "The quoted word \"" + RenderInline {A} at (0,0) size 43x19 [color=#008000] + RenderText {#text} at (118,0) size 43x19 + text run at (118,0) width 43: "anchor" + RenderText {#text} at (161,0) size 729x39 + text run at (161,0) width 376: "\" should be green, NOT purple, since it's part of an anchor. " + text run at (537,0) width 192: "It's a named anchor, and styles" + text run at (0,20) width 349: "declared for the A tag are applied to them under CSS1. " + text run at (349,20) width 326: "It also should NOT turn orange when clicked upon." layer at (8,153) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,145) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/pseudo/firstletter-expected.txt b/LayoutTests/platform/wincairo/css1/pseudo/firstletter-expected.txt index 5dc62a707006..643f095d9ac8 100644 --- a/LayoutTests/platform/wincairo/css1/pseudo/firstletter-expected.txt +++ b/LayoutTests/platform/wincairo/css1/pseudo/firstletter-expected.txt @@ -7,8 +7,8 @@ layer at (0,0) size 785x751 RenderInline (generated) at (0,0) size 9x19 [color=#800000] RenderText at (0,0) size 9x19 text run at (0,0) width 9: "T" - RenderText {#text} at (9,0) size 328x19 - text run at (9,0) width 328: "he style declarations which apply to the text below are:" + RenderText {#text} at (9,0) size 345x19 + text run at (9,0) width 345: "he style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x64 RenderText {#text} at (0,0) size 312x64 text run at (0,0) width 248: "P:first-letter {color: maroon;}" @@ -22,39 +22,39 @@ layer at (0,0) size 785x751 RenderInline (generated) at (0,0) size 9x19 [color=#800000] RenderText at (0,0) size 9x19 text run at (0,0) width 9: "T" - RenderText {#text} at (9,0) size 758x59 - text run at (9,0) width 414: "he first letter of this paragraph, and only that one, should be maroon. " - text run at (423,0) width 335: "If this precise combination does not occur, then the user" - text run at (0,20) width 149: "agent has failed this test. " - text run at (149,20) width 609: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one" - text run at (0,40) width 24: "line." + RenderText {#text} at (9,0) size 763x59 + text run at (9,0) width 434: "he first letter of this paragraph, and only that one, should be maroon. " + text run at (443,0) width 320: "If this precise combination does not occur, then the" + text run at (0,20) width 187: "user agent has failed this test. " + text run at (187,20) width 574: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" + text run at (0,40) width 85: "than one line." RenderBlock {P} at (0,207) size 769x77 RenderInline (generated) at (0,0) size 19x36 [color=#800000] RenderText at (0,0) size 19x36 text run at (0,0) width 19: "T" - RenderText {#text} at (19,13) size 766x63 - text run at (19,13) width 582: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " - text run at (601,13) width 157: "If this precise combination" - text run at (0,37) width 327: "does not occur, then the user agent has failed this test. " - text run at (327,37) width 439: "Remember that in order to ensure a complete test, the paragraph must be" - text run at (0,57) width 194: "displayed on more than one line." + RenderText {#text} at (19,13) size 757x63 + text run at (19,13) width 611: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " + text run at (630,13) width 84: "If this precise" + text run at (0,37) width 423: "combination does not occur, then the user agent has failed this test. " + text run at (423,37) width 334: "Remember that in order to ensure a complete test, the" + text run at (0,57) width 325: "paragraph must be displayed on more than one line." RenderBlock {P} at (0,300) size 769x106 - RenderInline (generated) at (0,0) size 75x64 [color=#800000] - RenderText at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - RenderText {#text} at (75,36) size 768x69 - text run at (75,36) width 305: "e should check for quotation support,\" it was said. " - text run at (380,36) width 388: "The first two characters in this paragraph-- a double-quote mark" - text run at (0,66) width 525: "and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (525,66) width 209: "Note that this is not required under" - text run at (0,86) width 182: "CSS1, but it is recommended." + RenderInline (generated) at (0,0) size 76x64 [color=#800000] + RenderText at (0,1) size 76x64 + text run at (0,1) width 76: "\"W" + RenderText {#text} at (76,36) size 760x69 + text run at (76,36) width 319: "e should check for quotation support,\" it was said. " + text run at (395,36) width 365: "The first two characters in this paragraph-- a double-quote" + text run at (0,66) width 578: "mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " + text run at (578,66) width 178: "Note that this is not required" + text run at (0,86) width 228: "under CSS1, but it is recommended." RenderTable {TABLE} at (0,422) size 769x313 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x311 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x283 RenderTableCell {TD} at (0,155) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 @@ -64,31 +64,31 @@ layer at (0,0) size 785x751 RenderInline (generated) at (0,0) size 9x19 [color=#800000] RenderText at (0,0) size 9x19 text run at (0,0) width 9: "T" - RenderText {#text} at (9,0) size 732x59 - text run at (9,0) width 414: "he first letter of this paragraph, and only that one, should be maroon. " - text run at (423,0) width 306: "If this precise combination does not occur, then the" - text run at (0,20) width 178: "user agent has failed this test. " - text run at (178,20) width 554: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" - text run at (0,40) width 79: "than one line." + RenderText {#text} at (9,0) size 740x59 + text run at (9,0) width 434: "he first letter of this paragraph, and only that one, should be maroon. " + text run at (443,0) width 297: "If this precise combination does not occur, then" + text run at (0,20) width 210: "the user agent has failed this test. " + text run at (210,20) width 518: "Remember that in order to ensure a complete test, the paragraph must be displayed" + text run at (0,40) width 141: "on more than one line." RenderBlock {P} at (4,80) size 747x77 RenderInline (generated) at (0,0) size 19x36 [color=#800000] RenderText at (0,0) size 19x36 text run at (0,0) width 19: "T" - RenderText {#text} at (19,13) size 727x63 - text run at (19,13) width 582: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " - text run at (601,13) width 80: "If this precise" - text run at (0,37) width 404: "combination does not occur, then the user agent has failed this test. " - text run at (404,37) width 323: "Remember that in order to ensure a complete test, the" - text run at (0,57) width 310: "paragraph must be displayed on more than one line." + RenderText {#text} at (19,13) size 734x63 + text run at (19,13) width 611: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " + text run at (630,13) width 84: "If this precise" + text run at (0,37) width 423: "combination does not occur, then the user agent has failed this test. " + text run at (423,37) width 311: "Remember that in order to ensure a complete test," + text run at (0,57) width 348: "the paragraph must be displayed on more than one line." RenderBlock {P} at (4,173) size 747x106 - RenderInline (generated) at (0,0) size 75x64 [color=#800000] - RenderText at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - RenderText {#text} at (75,36) size 733x69 - text run at (75,36) width 305: "e should check for quotation support,\" it was said. " - text run at (380,36) width 353: "The first two characters in this paragraph-- a double-quote" - text run at (0,66) width 560: "mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (560,66) width 171: "Note that this is not required" - text run at (0,86) width 220: "under CSS1, but it is recommended." + RenderInline (generated) at (0,0) size 76x64 [color=#800000] + RenderText at (0,1) size 76x64 + text run at (0,1) width 76: "\"W" + RenderText {#text} at (76,36) size 739x69 + text run at (76,36) width 319: "e should check for quotation support,\" it was said. " + text run at (395,36) width 330: "The first two characters in this paragraph-- a double-" + text run at (0,66) width 617: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " + text run at (617,66) width 122: "Note that this is not" + text run at (0,86) width 284: "required under CSS1, but it is recommended." layer at (8,121) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/pseudo/firstline-expected.txt b/LayoutTests/platform/wincairo/css1/pseudo/firstline-expected.txt index 00abd5ae5225..8b5078ed17f0 100644 --- a/LayoutTests/platform/wincairo/css1/pseudo/firstline-expected.txt +++ b/LayoutTests/platform/wincairo/css1/pseudo/firstline-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x699 RenderBlock {HTML} at (0,0) size 785x699 RenderBody {BODY} at (8,8) size 769x683 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x64 RenderText {#text} at (0,0) size 360x64 text run at (0,0) width 224: "P:first-line {color: green;}" @@ -16,69 +16,68 @@ layer at (0,0) size 785x699 text run at (360,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 769x60 - RenderText {#text} at (0,0) size 758x59 - text run at (0,0) width 400: "The first line of this paragraph, and only that one, should be green. " - text run at (400,0) width 335: "If this precise combination does not occur, then the user" - text run at (0,20) width 149: "agent has failed this test. " - text run at (149,20) width 609: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one" - text run at (0,40) width 24: "line." + RenderText {#text} at (0,0) size 761x59 + text run at (0,0) width 423: "The first line of this paragraph, and only that one, should be green. " + text run at (423,0) width 320: "If this precise combination does not occur, then the" + text run at (0,20) width 187: "user agent has failed this test. " + text run at (187,20) width 574: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" + text run at (0,40) width 85: "than one line." RenderBlock {P} at (0,207) size 769x77 - RenderText {#text} at (0,0) size 759x76 - text run at (0,0) width 749: "The first line of this paragraph, and only that one, should be" - text run at (0,37) width 205: "a larger font size as well as green. " - text run at (205,37) width 488: "If this precise combination does not occur, then the user agent has failed this test. " - text run at (693,37) width 66: "Remember" - text run at (0,57) width 567: "that in order to ensure a complete test, the paragraph must be displayed on more than one line." + RenderText {#text} at (0,0) size 767x76 + text run at (0,0) width 767: "The first line of this paragraph, and only that one, should be" + text run at (0,37) width 216: "a larger font size as well as green. " + text run at (216,37) width 507: "If this precise combination does not occur, then the user agent has failed this test." + text run at (0,57) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." RenderBlock {P} at (0,300) size 769x80 - RenderText {#text} at (0,0) size 761x59 - text run at (0,0) width 609: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (609,0) width 152: "Thus, if the first line is" - text run at (0,20) width 745: "not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test (although the" - text run at (0,40) width 135: "problem might be that " + RenderText {#text} at (0,0) size 762x59 + text run at (0,0) width 604: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " + text run at (604,0) width 154: "Thus, if the first line is" + text run at (0,20) width 762: "not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test (although" + text run at (0,40) width 165: "the problem might be that " RenderInline {CODE} at (0,0) size 80x16 - RenderText {#text} at (135,43) size 80x16 - text run at (135,43) width 80: "small-caps" - RenderText {#text} at (215,40) size 750x39 - text run at (215,40) width 218: " is not supported by your browser). " - text run at (433,40) width 317: "This is extra text included for the purposes of making" - text run at (0,60) width 325: "the paragraph long enough to have more than one line." + RenderText {#text} at (165,43) size 80x16 + text run at (165,43) width 80: "small-caps" + RenderText {#text} at (245,40) size 754x39 + text run at (245,40) width 225: " is not supported by your browser). " + text run at (470,40) width 284: "This is extra text included for the purposes of" + text run at (0,60) width 395: "making the paragraph long enough to have more than one line." RenderTable {TABLE} at (0,396) size 769x287 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x285 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x257 RenderTableCell {TD} at (0,142) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 4x21 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x257 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x60 - RenderText {#text} at (0,0) size 735x59 - text run at (0,0) width 400: "The first line of this paragraph, and only that one, should be green. " - text run at (400,0) width 335: "If this precise combination does not occur, then the user" - text run at (0,20) width 149: "agent has failed this test. " - text run at (149,20) width 583: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than" - text run at (0,40) width 50: "one line." + RenderText {#text} at (0,0) size 743x59 + text run at (0,0) width 423: "The first line of this paragraph, and only that one, should be green. " + text run at (423,0) width 320: "If this precise combination does not occur, then the" + text run at (0,20) width 187: "user agent has failed this test. " + text run at (187,20) width 538: "Remember that in order to ensure a complete test, the paragraph must be displayed on" + text run at (0,40) width 121: "more than one line." RenderBlock {P} at (4,80) size 747x77 - RenderText {#text} at (0,0) size 711x76 - text run at (0,0) width 711: "The first line of this paragraph, and only that one, should" - text run at (0,37) width 224: "be a larger font size as well as green. " - text run at (224,37) width 484: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,57) width 637: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." + RenderText {#text} at (0,0) size 742x76 + text run at (0,0) width 729: "The first line of this paragraph, and only that one, should" + text run at (0,37) width 235: "be a larger font size as well as green. " + text run at (235,37) width 507: "If this precise combination does not occur, then the user agent has failed this test." + text run at (0,57) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." RenderBlock {P} at (4,173) size 747x80 - RenderText {#text} at (0,0) size 718x59 - text run at (0,0) width 609: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (609,0) width 109: "Thus, if the first" - text run at (0,20) width 701: "line is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test" - text run at (0,40) width 216: "(although the problem might be that " + RenderText {#text} at (0,0) size 744x59 + text run at (0,0) width 604: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " + text run at (604,0) width 140: "Thus, if the first line" + text run at (0,20) width 712: "is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test" + text run at (0,40) width 229: "(although the problem might be that " RenderInline {CODE} at (0,0) size 80x16 - RenderText {#text} at (216,43) size 80x16 - text run at (216,43) width 80: "small-caps" - RenderText {#text} at (296,40) size 709x39 - text run at (296,40) width 218: " is not supported by your browser). " - text run at (514,40) width 195: "This is extra text included for the" - text run at (0,60) width 447: "purposes of making the paragraph long enough to have more than one line." + RenderText {#text} at (229,43) size 80x16 + text run at (229,43) width 80: "small-caps" + RenderText {#text} at (309,40) size 741x39 + text run at (309,40) width 225: " is not supported by your browser). " + text run at (534,40) width 207: "This is extra text included for the" + text run at (0,60) width 472: "purposes of making the paragraph long enough to have more than one line." layer at (8,121) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/pseudo/multiple_pseudo_elements-expected.txt b/LayoutTests/platform/wincairo/css1/pseudo/multiple_pseudo_elements-expected.txt index e985be208b72..600e8830bfcd 100644 --- a/LayoutTests/platform/wincairo/css1/pseudo/multiple_pseudo_elements-expected.txt +++ b/LayoutTests/platform/wincairo/css1/pseudo/multiple_pseudo_elements-expected.txt @@ -1,14 +1,14 @@ -layer at (0,0) size 785x1069 +layer at (0,0) size 785x1089 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1069 - RenderBlock {HTML} at (0,0) size 785x1069 - RenderBody {BODY} at (8,8) size 769x1053 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1089 + RenderBlock {HTML} at (0,0) size 785x1089 + RenderBody {BODY} at (8,8) size 769x1073 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 RenderInline (generated) at (0,0) size 9x19 [color=#800000] RenderText at (0,0) size 9x19 text run at (0,0) width 9: "T" - RenderText {#text} at (9,0) size 328x19 - text run at (9,0) width 328: "he style declarations which apply to the text below are:" + RenderText {#text} at (9,0) size 345x19 + text run at (9,0) width 345: "he style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x112 RenderText {#text} at (0,0) size 368x112 text run at (0,0) width 224: "P:first-line {color: green;}" @@ -29,76 +29,76 @@ layer at (0,0) size 785x1069 RenderText at (0,0) size 9x19 text run at (0,0) width 9: "T" RenderText {#text} at (9,0) size 769x59 - text run at (9,0) width 727: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be green. " - text run at (736,0) width 33: "If this" - text run at (0,20) width 451: "precise combination does not occur, then the user agent has failed this test. " - text run at (451,20) width 301: "Remember that in order to ensure a complete test," - text run at (0,40) width 332: "the paragraph must be displayed on more than one line." + text run at (9,0) width 760: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be green." + text run at (0,20) width 511: "If this precise combination does not occur, then the user agent has failed this test. " + text run at (511,20) width 221: "Remember that in order to ensure a" + text run at (0,40) width 438: "complete test, the paragraph must be displayed on more than one line." RenderBlock {P} at (0,255) size 769x192 RenderInline (generated) at (0,0) size 68x127 [color=#800000] RenderText at (0,2) size 68x127 text run at (0,2) width 68: "T" - RenderText {#text} at (68,74) size 762x117 - text run at (68,74) width 621: "he first letter of this paragraph, and only that one," - text run at (0,132) width 762: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line should be" - text run at (0,152) width 223: "200% bigger than normal and green. " - text run at (223,152) width 484: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,172) width 637: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." + RenderText {#text} at (68,74) size 751x117 + text run at (68,74) width 634: "he first letter of this paragraph, and only that one," + text run at (0,132) width 736: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line" + text run at (0,152) width 299: "should be 200% bigger than normal and green. " + text run at (299,152) width 452: "If this precise combination does not occur, then the user agent has failed" + text run at (0,172) width 55: "this test. " + text run at (55,172) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." RenderBlock {P} at (0,463) size 769x126 - RenderInline (generated) at (0,0) size 75x64 [color=#800000] - RenderText at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - RenderText {#text} at (75,36) size 769x89 - text run at (75,36) width 337: "e should check for quotation support,\" it was said. " - text run at (412,36) width 305: "The first two characters in this paragraph-- a" - text run at (0,66) width 711: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " - text run at (711,66) width 57: "Note that" - text run at (0,86) width 757: "the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is recommended. " - text run at (757,86) width 12: "In" - text run at (0,106) width 410: "addition, the entire first line should be in a small-caps font and green." - RenderTable {TABLE} at (0,605) size 769x448 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x446 + RenderInline (generated) at (0,0) size 76x64 [color=#800000] + RenderText at (0,1) size 76x64 + text run at (0,1) width 76: "\"W" + RenderText {#text} at (76,36) size 765x89 + text run at (76,36) width 333: "e should check for quotation support,\" it was said. " + text run at (409,36) width 355: "The first two characters in this paragraph-- a double-" + text run at (0,66) width 683: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " + text run at (683,66) width 81: "Note that the" + text run at (0,86) width 765: "inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is recommended." + text run at (0,106) width 450: "In addition, the entire first line should be in a small-caps font and green." + RenderTable {TABLE} at (0,605) size 769x468 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x466 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x418 - RenderTableCell {TD} at (0,223) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x438 + RenderTableCell {TD} at (0,233) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x418 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x438 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x60 RenderInline (generated) at (0,0) size 9x19 [color=#800000] RenderText at (0,0) size 9x19 text run at (0,0) width 9: "T" - RenderText {#text} at (9,0) size 747x59 - text run at (9,0) width 727: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be green. " - text run at (736,0) width 9: "If" - text run at (0,20) width 475: "this precise combination does not occur, then the user agent has failed this test. " - text run at (475,20) width 272: "Remember that in order to ensure a complete" - text run at (0,40) width 361: "test, the paragraph must be displayed on more than one line." - RenderBlock {P} at (4,80) size 747x192 + RenderText {#text} at (9,0) size 726x59 + text run at (9,0) width 717: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be" + text run at (0,20) width 43: "green. " + text run at (43,20) width 511: "If this precise combination does not occur, then the user agent has failed this test. " + text run at (554,20) width 165: "Remember that in order to" + text run at (0,40) width 494: "ensure a complete test, the paragraph must be displayed on more than one line." + RenderBlock {P} at (4,80) size 747x212 RenderInline (generated) at (0,0) size 68x127 [color=#800000] RenderText at (0,2) size 68x127 text run at (0,2) width 68: "T" - RenderText {#text} at (68,74) size 743x117 - text run at (68,74) width 621: "he first letter of this paragraph, and only that one," - text run at (0,132) width 743: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line should" - text run at (0,152) width 242: "be 200% bigger than normal and green. " - text run at (242,152) width 484: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,172) width 637: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - RenderBlock {P} at (4,288) size 747x126 - RenderInline (generated) at (0,0) size 75x64 [color=#800000] - RenderText at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - RenderText {#text} at (75,36) size 742x89 - text run at (75,36) width 337: "e should check for quotation support,\" it was said. " - text run at (412,36) width 305: "The first two characters in this paragraph-- a" - text run at (0,66) width 711: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " - text run at (711,66) width 31: "Note" - text run at (0,86) width 685: "that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is" - text run at (0,106) width 94: "recommended. " - text run at (94,106) width 426: "In addition, the entire first line should be in a small-caps font and green." + RenderText {#text} at (68,74) size 736x137 + text run at (68,74) width 634: "he first letter of this paragraph, and only that one," + text run at (0,132) width 736: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line" + text run at (0,152) width 299: "should be 200% bigger than normal and green. " + text run at (299,152) width 413: "If this precise combination does not occur, then the user agent has" + text run at (0,172) width 94: "failed this test. " + text run at (94,172) width 632: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one" + text run at (0,192) width 27: "line." + RenderBlock {P} at (4,308) size 747x126 + RenderInline (generated) at (0,0) size 76x64 [color=#800000] + RenderText at (0,1) size 76x64 + text run at (0,1) width 76: "\"W" + RenderText {#text} at (76,36) size 739x89 + text run at (76,36) width 333: "e should check for quotation support,\" it was said. " + text run at (409,36) width 301: "The first two characters in this paragraph-- a" + text run at (0,66) width 727: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red)." + text run at (0,86) width 739: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it" + text run at (0,106) width 111: "is recommended. " + text run at (111,106) width 450: "In addition, the entire first line should be in a small-caps font and green." layer at (8,169) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,161) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/pseudo/pseudo_elements_in_selectors-expected.txt b/LayoutTests/platform/wincairo/css1/pseudo/pseudo_elements_in_selectors-expected.txt index ac2c25e0b84a..6e38c82e4024 100644 --- a/LayoutTests/platform/wincairo/css1/pseudo/pseudo_elements_in_selectors-expected.txt +++ b/LayoutTests/platform/wincairo/css1/pseudo/pseudo_elements_in_selectors-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x605 RenderBlock {HTML} at (0,0) size 785x605 RenderBody {BODY} at (8,8) size 769x589 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 373x19 - text run at (0,0) width 373: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 380x19 + text run at (0,0) width 380: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x64 RenderText {#text} at (0,0) size 264x64 text run at (0,0) width 264: "P:first-line {font-weight: bold;}" @@ -16,63 +16,63 @@ layer at (0,0) size 785x605 text run at (256,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 769x40 - RenderText {#text} at (0,0) size 714x39 - text run at (0,0) width 336: "The first line of this sentence should be boldfaced. " - text run at (336,0) width 378: "This test is included simply to establish a baseline for the" - text run at (0,20) width 604: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." + RenderText {#text} at (0,0) size 718x39 + text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " + text run at (339,0) width 379: "This test is included simply to establish a baseline for the" + text run at (0,20) width 636: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." RenderBlock {P} at (0,187) size 769x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 553: "The first line of this sentence should be boldfaced and green, thanks to its selector. " - text run at (553,0) width 200: "If this is not the case, then the" - text run at (0,20) width 541: "user agent may have failed to properly parse the selector, or it may simply not support the " + RenderText {#text} at (0,0) size 754x39 + text run at (0,0) width 555: "The first line of this sentence should be boldfaced and green, thanks to its selector. " + text run at (555,0) width 199: "If this is not the case, then the" + text run at (0,20) width 565: "user agent may have failed to properly parse the selector, or it may simply not support the " RenderInline {TT} at (0,0) size 88x16 - RenderText {#text} at (541,23) size 88x16 - text run at (541,23) width 88: ":first-line" - RenderText {#text} at (629,20) size 104x19 - text run at (629,20) width 104: " pseudo-element." + RenderText {#text} at (565,23) size 88x16 + text run at (565,23) width 88: ":first-line" + RenderText {#text} at (653,20) size 107x19 + text run at (653,20) width 107: " pseudo-element." RenderBlock {P} at (0,243) size 769x80 - RenderText {#text} at (0,0) size 757x79 - text run at (0,0) width 336: "The first line of this sentence should be boldfaced. " - text run at (336,0) width 413: "If it is red, then the user agent has violated the specification in" - text run at (0,20) width 413: "allowing pseudo-elements at a point other than the end of a selector. " - text run at (413,20) width 320: "If neither is the case, then the user agent has correctly" - text run at (0,40) width 757: "ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered to have failed" - text run at (0,60) width 47: "the test." + RenderText {#text} at (0,0) size 765x79 + text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " + text run at (339,0) width 415: "If it is red, then the user agent has violated the specification in" + text run at (0,20) width 430: "allowing pseudo-elements at a point other than the end of a selector. " + text run at (430,20) width 335: "If neither is the case, then the user agent has correctly" + text run at (0,40) width 750: "ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered to have" + text run at (0,60) width 87: "failed the test." RenderTable {TABLE} at (0,339) size 769x250 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x248 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x220 RenderTableCell {TD} at (0,124) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x220 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x40 - RenderText {#text} at (0,0) size 714x39 - text run at (0,0) width 336: "The first line of this sentence should be boldfaced. " - text run at (336,0) width 378: "This test is included simply to establish a baseline for the" - text run at (0,20) width 604: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." + RenderText {#text} at (0,0) size 718x39 + text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " + text run at (339,0) width 379: "This test is included simply to establish a baseline for the" + text run at (0,20) width 636: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." RenderBlock {P} at (4,60) size 747x60 - RenderText {#text} at (0,0) size 728x39 - text run at (0,0) width 553: "The first line of this sentence should be boldfaced and green, thanks to its selector. " - text run at (553,0) width 175: "If this is not the case, then" - text run at (0,20) width 563: "the user agent may have failed to properly parse the selector, or it may simply not support the " + RenderText {#text} at (0,0) size 729x39 + text run at (0,0) width 555: "The first line of this sentence should be boldfaced and green, thanks to its selector. " + text run at (555,0) width 174: "If this is not the case, then" + text run at (0,20) width 588: "the user agent may have failed to properly parse the selector, or it may simply not support the " RenderInline {TT} at (0,0) size 88x16 - RenderText {#text} at (563,23) size 88x16 - text run at (563,23) width 88: ":first-line" - RenderText {#text} at (651,20) size 705x39 - text run at (651,20) width 54: " pseudo-" - text run at (0,40) width 50: "element." + RenderText {#text} at (588,23) size 88x16 + text run at (588,23) width 88: ":first-line" + RenderText {#text} at (676,20) size 730x39 + text run at (676,20) width 54: " pseudo-" + text run at (0,40) width 53: "element." RenderBlock {P} at (4,136) size 747x80 - RenderText {#text} at (0,0) size 747x79 - text run at (0,0) width 336: "The first line of this sentence should be boldfaced. " - text run at (336,0) width 397: "If it is red, then the user agent has violated the specification" - text run at (0,20) width 427: "in allowing pseudo-elements at a point other than the end of a selector. " - text run at (427,20) width 320: "If neither is the case, then the user agent has correctly" - text run at (0,40) width 721: "ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered to have" - text run at (0,60) width 83: "failed the test." + RenderText {#text} at (0,0) size 737x79 + text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " + text run at (339,0) width 398: "If it is red, then the user agent has violated the specification" + text run at (0,20) width 446: "in allowing pseudo-elements at a point other than the end of a selector. " + text run at (446,20) width 276: "If neither is the case, then the user agent has" + text run at (0,40) width 687: "correctly ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be" + text run at (0,60) width 209: "considered to have failed the test." layer at (8,121) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/text_properties/letter_spacing-expected.txt b/LayoutTests/platform/wincairo/css1/text_properties/letter_spacing-expected.txt index 27bb60c23749..ece521165579 100644 --- a/LayoutTests/platform/wincairo/css1/text_properties/letter_spacing-expected.txt +++ b/LayoutTests/platform/wincairo/css1/text_properties/letter_spacing-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1461 +layer at (0,0) size 785x1481 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1461 - RenderBlock {HTML} at (0,0) size 785x1461 - RenderBody {BODY} at (8,8) size 769x1445 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1481 + RenderBlock {HTML} at (0,0) size 785x1481 + RenderBody {BODY} at (8,8) size 769x1465 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x176 RenderText {#text} at (0,0) size 264x176 text run at (0,0) width 232: ".one {letter-spacing: 0.3in;}" @@ -31,109 +31,110 @@ layer at (0,0) size 785x1461 text run at (0,160) width 264: ".eleven {letter-spacing: -0.1em;}" text run at (264,160) width 0: " " RenderBlock {P} at (0,243) size 769x80 - RenderText {#text} at (0,0) size 703x79 - text run at (0,0) width 680: "This letters in this" - text run at (0,20) width 703: "sentence should have" - text run at (0,40) width 672: "extra space between" - text run at (0,60) width 177: "them." + RenderText {#text} at (0,0) size 710x79 + text run at (0,0) width 687: "This letters in this" + text run at (0,20) width 710: "sentence should have" + text run at (0,40) width 675: "extra space between" + text run at (0,60) width 179: "them." RenderBlock {P} at (0,339) size 769x60 - RenderText {#text} at (0,0) size 708x59 - text run at (0,0) width 708: "This letters in this sentence" - text run at (0,20) width 579: "should have extra space" - text run at (0,40) width 334: "between them." + RenderText {#text} at (0,0) size 718x59 + text run at (0,0) width 718: "This letters in this sentence" + text run at (0,20) width 585: "should have extra space" + text run at (0,40) width 338: "between them." RenderBlock {P} at (0,415) size 769x60 - RenderText {#text} at (0,0) size 708x59 - text run at (0,0) width 708: "This letters in this sentence" - text run at (0,20) width 579: "should have extra space" - text run at (0,40) width 334: "between them." + RenderText {#text} at (0,0) size 718x59 + text run at (0,0) width 718: "This letters in this sentence" + text run at (0,20) width 585: "should have extra space" + text run at (0,40) width 338: "between them." RenderBlock {P} at (0,491) size 769x20 - RenderText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This letters in this sentence should have extra space between them." + RenderText {#text} at (0,0) size 687x19 + text run at (0,0) width 687: "This letters in this sentence should have extra space between them." RenderBlock {P} at (0,527) size 769x20 - RenderText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This letters in this sentence should have extra space between them." + RenderText {#text} at (0,0) size 687x19 + text run at (0,0) width 687: "This letters in this sentence should have extra space between them." RenderBlock {P} at (0,563) size 769x60 - RenderText {#text} at (0,0) size 695x59 - text run at (0,0) width 623: "This letters in this sentence" - text run at (0,20) width 695: "should have extra space between" - text run at (0,40) width 113: "them." + RenderText {#text} at (0,0) size 703x59 + text run at (0,0) width 633: "This letters in this sentence" + text run at (0,20) width 703: "should have extra space between" + text run at (0,40) width 115: "them." RenderBlock {P} at (0,639) size 769x40 - RenderText {#text} at (0,0) size 678x39 - text run at (0,0) width 678: "This letters in this sentence should have extra space" - text run at (0,20) width 179: "between them." + RenderText {#text} at (0,0) size 694x39 + text run at (0,0) width 694: "This letters in this sentence should have extra space" + text run at (0,20) width 183: "between them." RenderBlock {P} at (0,695) size 769x40 - RenderText {#text} at (0,0) size 734x39 - text run at (0,0) width 734: "This letters in this sentence should have extra space between them," - text run at (0,20) width 424: "but the last few words in the sentence " - RenderInline {SPAN} at (0,0) size 169x19 - RenderText {#text} at (424,20) size 169x19 - text run at (424,20) width 169: "should show normal spacing" - RenderText {#text} at (593,20) size 9x19 - text run at (593,20) width 9: "." - RenderBlock {P} at (0,751) size 769x20 - RenderText {#text} at (0,0) size 755x19 - text run at (0,0) width 755: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this property." - RenderBlock {P} at (0,787) size 769x20 - RenderText {#text} at (0,0) size 530x19 - text run at (0,0) width 530: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." - RenderTable {TABLE} at (0,823) size 769x622 [border: (1px outset #808080)] + RenderText {#text} at (0,0) size 754x39 + text run at (0,0) width 754: "This letters in this sentence should have extra space between them," + text run at (0,20) width 435: "but the last few words in the sentence " + RenderInline {SPAN} at (0,0) size 180x19 + RenderText {#text} at (435,20) size 180x19 + text run at (435,20) width 180: "should show normal spacing" + RenderText {#text} at (615,20) size 9x19 + text run at (615,20) width 9: "." + RenderBlock {P} at (0,751) size 769x40 + RenderText {#text} at (0,0) size 731x39 + text run at (0,0) width 731: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" + text run at (0,20) width 56: "property." + RenderBlock {P} at (0,807) size 769x20 + RenderText {#text} at (0,0) size 565x19 + text run at (0,0) width 565: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." + RenderTable {TABLE} at (0,843) size 769x622 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x620 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x592 RenderTableCell {TD} at (0,310) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x592 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x80 - RenderText {#text} at (0,0) size 703x79 - text run at (0,0) width 680: "This letters in this" - text run at (0,20) width 703: "sentence should have" - text run at (0,40) width 672: "extra space between" - text run at (0,60) width 177: "them." + RenderText {#text} at (0,0) size 710x79 + text run at (0,0) width 687: "This letters in this" + text run at (0,20) width 710: "sentence should have" + text run at (0,40) width 675: "extra space between" + text run at (0,60) width 179: "them." RenderBlock {P} at (4,100) size 747x60 - RenderText {#text} at (0,0) size 708x59 - text run at (0,0) width 708: "This letters in this sentence" - text run at (0,20) width 579: "should have extra space" - text run at (0,40) width 334: "between them." + RenderText {#text} at (0,0) size 718x59 + text run at (0,0) width 718: "This letters in this sentence" + text run at (0,20) width 585: "should have extra space" + text run at (0,40) width 338: "between them." RenderBlock {P} at (4,176) size 747x60 - RenderText {#text} at (0,0) size 708x59 - text run at (0,0) width 708: "This letters in this sentence" - text run at (0,20) width 579: "should have extra space" - text run at (0,40) width 334: "between them." + RenderText {#text} at (0,0) size 718x59 + text run at (0,0) width 718: "This letters in this sentence" + text run at (0,20) width 585: "should have extra space" + text run at (0,40) width 338: "between them." RenderBlock {P} at (4,252) size 747x20 - RenderText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This letters in this sentence should have extra space between them." + RenderText {#text} at (0,0) size 687x19 + text run at (0,0) width 687: "This letters in this sentence should have extra space between them." RenderBlock {P} at (4,288) size 747x20 - RenderText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This letters in this sentence should have extra space between them." + RenderText {#text} at (0,0) size 687x19 + text run at (0,0) width 687: "This letters in this sentence should have extra space between them." RenderBlock {P} at (4,324) size 747x60 - RenderText {#text} at (0,0) size 695x59 - text run at (0,0) width 623: "This letters in this sentence" - text run at (0,20) width 695: "should have extra space between" - text run at (0,40) width 113: "them." + RenderText {#text} at (0,0) size 703x59 + text run at (0,0) width 633: "This letters in this sentence" + text run at (0,20) width 703: "should have extra space between" + text run at (0,40) width 115: "them." RenderBlock {P} at (4,400) size 747x40 - RenderText {#text} at (0,0) size 678x39 - text run at (0,0) width 678: "This letters in this sentence should have extra space" - text run at (0,20) width 179: "between them." + RenderText {#text} at (0,0) size 694x39 + text run at (0,0) width 694: "This letters in this sentence should have extra space" + text run at (0,20) width 183: "between them." RenderBlock {P} at (4,456) size 747x40 - RenderText {#text} at (0,0) size 734x39 - text run at (0,0) width 734: "This letters in this sentence should have extra space between them," - text run at (0,20) width 424: "but the last few words in the sentence " - RenderInline {SPAN} at (0,0) size 169x19 - RenderText {#text} at (424,20) size 169x19 - text run at (424,20) width 169: "should show normal spacing" - RenderText {#text} at (593,20) size 9x19 - text run at (593,20) width 9: "." + RenderText {#text} at (0,0) size 685x39 + text run at (0,0) width 685: "This letters in this sentence should have extra space between" + text run at (0,20) width 504: "them, but the last few words in the sentence " + RenderInline {SPAN} at (0,0) size 180x19 + RenderText {#text} at (504,20) size 180x19 + text run at (504,20) width 180: "should show normal spacing" + RenderText {#text} at (684,20) size 9x19 + text run at (684,20) width 9: "." RenderBlock {P} at (4,512) size 747x40 - RenderText {#text} at (0,0) size 695x39 - text run at (0,0) width 695: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" + RenderText {#text} at (0,0) size 731x39 + text run at (0,0) width 731: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" text run at (0,20) width 56: "property." RenderBlock {P} at (4,568) size 747x20 - RenderText {#text} at (0,0) size 530x19 - text run at (0,0) width 530: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." + RenderText {#text} at (0,0) size 565x19 + text run at (0,0) width 565: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." layer at (8,233) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,225) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/text_properties/line_height-expected.txt b/LayoutTests/platform/wincairo/css1/text_properties/line_height-expected.txt index 995407cc7822..70039c4411e9 100644 --- a/LayoutTests/platform/wincairo/css1/text_properties/line_height-expected.txt +++ b/LayoutTests/platform/wincairo/css1/text_properties/line_height-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x2649 +layer at (0,0) size 785x2697 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x2649 - RenderBlock {HTML} at (0,0) size 785x2649 - RenderBody {BODY} at (8,8) size 769x2633 [bgcolor=#CCCCCC] +layer at (0,0) size 785x2697 + RenderBlock {HTML} at (0,0) size 785x2697 + RenderBody {BODY} at (8,8) size 769x2681 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x224 RenderText {#text} at (0,0) size 400x224 text run at (0,0) width 344: ".one {line-height: 0.5in; font-size: 12px;}" @@ -37,146 +37,147 @@ layer at (0,0) size 785x2649 text run at (0,208) width 304: "SPAN.color {background-color: silver;}" text run at (304,208) width 0: " " RenderBlock {P} at (0,287) size 769x48 - RenderText {#text} at (0,16) size 511x15 - text run at (0,16) width 511: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." + RenderText {#text} at (0,16) size 507x15 + text run at (0,16) width 507: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." RenderBlock {P} at (0,347) size 769x75 - RenderText {#text} at (0,30) size 533x15 - text run at (0,30) width 533: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." + RenderText {#text} at (0,30) size 526x15 + text run at (0,30) width 526: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." RenderBlock {P} at (0,434) size 769x75 - RenderText {#text} at (0,30) size 547x15 - text run at (0,30) width 547: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." + RenderText {#text} at (0,30) size 539x15 + text run at (0,30) width 539: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." RenderBlock {P} at (0,521) size 769x32 - RenderText {#text} at (0,8) size 549x15 - text run at (0,8) width 549: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." + RenderText {#text} at (0,8) size 540x15 + text run at (0,8) width 540: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." RenderBlock {P} at (0,565) size 769x32 - RenderText {#text} at (0,8) size 503x15 - text run at (0,8) width 503: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." + RenderText {#text} at (0,8) size 497x15 + text run at (0,8) width 497: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." RenderBlock {P} at (0,609) size 769x24 - RenderText {#text} at (0,4) size 492x15 - text run at (0,4) width 492: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 487x15 + text run at (0,4) width 487: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." RenderBlock {P} at (0,645) size 769x18 - RenderText {#text} at (0,1) size 493x15 - text run at (0,1) width 493: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." + RenderText {#text} at (0,1) size 489x15 + text run at (0,1) width 489: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." RenderBlock {P} at (0,675) size 769x24 - RenderText {#text} at (0,4) size 545x15 - text run at (0,4) width 545: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 537x15 + text run at (0,4) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." RenderBlock {DIV} at (0,711) size 769x168 [bgcolor=#C0C0C0] RenderBlock (anonymous) at (0,0) size 769x24 - RenderText {#text} at (0,4) size 602x15 - text run at (0,4) width 602: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 591x15 + text run at (0,4) width 591: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." RenderBlock {P} at (0,48) size 769x72 - RenderText {#text} at (0,-2) size 752x75 - text run at (0,-2) width 737: "This sentence should have a line-height of twice the DIV's font size, or 28px;" - text run at (0,22) width 752: "this should not cause extra spacing between the lines, since the line-height and" - text run at (0,46) width 359: "font-size should have the same value." + RenderText {#text} at (0,-2) size 763x75 + text run at (0,-2) width 748: "This sentence should have a line-height of twice the DIV's font size, or 28px;" + text run at (0,22) width 763: "this should not cause extra spacing between the lines, since the line-height and" + text run at (0,46) width 364: "font-size should have the same value." RenderBlock (anonymous) at (0,144) size 769x24 - RenderText {#text} at (0,4) size 615x15 - text run at (0,4) width 615: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 605x15 + text run at (0,4) width 605: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." RenderBlock {P} at (0,891) size 769x24 - RenderText {#text} at (0,4) size 545x15 - text run at (0,4) width 545: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 537x15 + text run at (0,4) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." RenderBlock {DIV} at (0,927) size 769x240 [bgcolor=#C0C0C0] RenderBlock (anonymous) at (0,0) size 769x24 - RenderText {#text} at (0,4) size 602x15 - text run at (0,4) width 602: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 591x15 + text run at (0,4) width 591: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." RenderBlock {P} at (0,48) size 769x144 - RenderText {#text} at (0,10) size 737x123 - text run at (0,10) width 737: "This sentence should have a line-height of twice the font size, which is 200%" - text run at (0,58) width 732: "normal thanks to an inline style; this should cause extra spacing between the" - text run at (0,106) width 640: "lines, as the font-size will be 28px and the line-height will be 56px." + RenderText {#text} at (0,10) size 749x123 + text run at (0,10) width 749: "This sentence should have a line-height of twice the font size, which is 200%" + text run at (0,58) width 742: "normal thanks to an inline style; this should cause extra spacing between the" + text run at (0,106) width 654: "lines, as the font-size will be 28px and the line-height will be 56px." RenderBlock (anonymous) at (0,216) size 769x24 - RenderText {#text} at (0,4) size 615x15 - text run at (0,4) width 615: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 605x15 + text run at (0,4) width 605: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." RenderBlock {P} at (0,1179) size 769x100 - RenderText {#text} at (0,17) size 756x65 - text run at (0,17) width 599: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " - text run at (599,17) width 157: "In the second section (within the" - text run at (0,67) width 183: "table) its line-height should be normal." + RenderText {#text} at (0,17) size 745x65 + text run at (0,17) width 592: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " + text run at (592,17) width 153: "In the second section (within the" + text run at (0,67) width 181: "table) its line-height should be normal." RenderBlock {P} at (0,1291) size 769x16 - RenderText {#text} at (0,0) size 515x15 - text run at (0,0) width 515: "This sentence should have a normal line-height, because negative values are not permitted for this property." + RenderText {#text} at (0,0) size 503x15 + text run at (0,0) width 503: "This sentence should have a normal line-height, because negative values are not permitted for this property." RenderBlock {P} at (0,1319) size 769x150 - RenderInline {SPAN} at (0,0) size 767x90 [bgcolor=#C0C0C0] - RenderText {#text} at (0,30) size 767x90 - text run at (0,30) width 767: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver, but no" - text run at (0,105) width 672: "padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." + RenderInline {SPAN} at (0,0) size 758x90 [bgcolor=#C0C0C0] + RenderText {#text} at (0,30) size 758x90 + text run at (0,30) width 758: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver, but no" + text run at (0,105) width 662: "padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." RenderText {#text} at (0,0) size 0x0 - RenderTable {TABLE} at (0,1481) size 769x1152 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x1150 + RenderTable {TABLE} at (0,1481) size 769x1200 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x1198 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x1122 - RenderTableCell {TD} at (0,575) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x1170 + RenderTableCell {TD} at (0,599) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x1122 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x1170 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x48 - RenderText {#text} at (0,16) size 511x15 - text run at (0,16) width 511: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." + RenderText {#text} at (0,16) size 507x15 + text run at (0,16) width 507: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." RenderBlock {P} at (4,64) size 747x75 - RenderText {#text} at (0,30) size 533x15 - text run at (0,30) width 533: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." + RenderText {#text} at (0,30) size 526x15 + text run at (0,30) width 526: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." RenderBlock {P} at (4,151) size 747x75 - RenderText {#text} at (0,30) size 547x15 - text run at (0,30) width 547: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." + RenderText {#text} at (0,30) size 539x15 + text run at (0,30) width 539: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." RenderBlock {P} at (4,238) size 747x32 - RenderText {#text} at (0,8) size 549x15 - text run at (0,8) width 549: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." + RenderText {#text} at (0,8) size 540x15 + text run at (0,8) width 540: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." RenderBlock {P} at (4,282) size 747x32 - RenderText {#text} at (0,8) size 503x15 - text run at (0,8) width 503: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." + RenderText {#text} at (0,8) size 497x15 + text run at (0,8) width 497: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." RenderBlock {P} at (4,326) size 747x24 - RenderText {#text} at (0,4) size 492x15 - text run at (0,4) width 492: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 487x15 + text run at (0,4) width 487: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." RenderBlock {P} at (4,362) size 747x18 - RenderText {#text} at (0,1) size 493x15 - text run at (0,1) width 493: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." + RenderText {#text} at (0,1) size 489x15 + text run at (0,1) width 489: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." RenderBlock {P} at (4,392) size 747x24 - RenderText {#text} at (0,4) size 545x15 - text run at (0,4) width 545: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 537x15 + text run at (0,4) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." RenderBlock {DIV} at (4,428) size 747x168 [bgcolor=#C0C0C0] RenderBlock (anonymous) at (0,0) size 747x24 - RenderText {#text} at (0,4) size 602x15 - text run at (0,4) width 602: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 591x15 + text run at (0,4) width 591: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." RenderBlock {P} at (0,48) size 747x72 - RenderText {#text} at (0,-2) size 737x75 - text run at (0,-2) width 737: "This sentence should have a line-height of twice the DIV's font size, or 28px;" - text run at (0,22) width 711: "this should not cause extra spacing between the lines, since the line-height" - text run at (0,46) width 400: "and font-size should have the same value." + RenderText {#text} at (0,-2) size 722x75 + text run at (0,-2) width 687: "This sentence should have a line-height of twice the DIV's font size, or" + text run at (0,22) width 722: "28px; this should not cause extra spacing between the lines, since the line-" + text run at (0,46) width 472: "height and font-size should have the same value." RenderBlock (anonymous) at (0,144) size 747x24 - RenderText {#text} at (0,4) size 615x15 - text run at (0,4) width 615: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderText {#text} at (0,4) size 605x15 + text run at (0,4) width 605: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." RenderBlock {P} at (4,608) size 747x24 - RenderText {#text} at (0,4) size 545x15 - text run at (0,4) width 545: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - RenderBlock {DIV} at (4,644) size 747x240 [bgcolor=#C0C0C0] + RenderText {#text} at (0,4) size 537x15 + text run at (0,4) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderBlock {DIV} at (4,644) size 747x288 [bgcolor=#C0C0C0] RenderBlock (anonymous) at (0,0) size 747x24 - RenderText {#text} at (0,4) size 602x15 - text run at (0,4) width 602: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - RenderBlock {P} at (0,48) size 747x144 - RenderText {#text} at (0,10) size 737x123 - text run at (0,10) width 737: "This sentence should have a line-height of twice the font size, which is 200%" - text run at (0,58) width 732: "normal thanks to an inline style; this should cause extra spacing between the" - text run at (0,106) width 640: "lines, as the font-size will be 28px and the line-height will be 56px." - RenderBlock (anonymous) at (0,216) size 747x24 - RenderText {#text} at (0,4) size 615x15 - text run at (0,4) width 615: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - RenderBlock {P} at (4,896) size 747x32 - RenderText {#text} at (0,0) size 738x31 - text run at (0,0) width 599: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " - text run at (599,0) width 139: "In the second section (within" - text run at (0,16) width 201: "the table) its line-height should be normal." - RenderBlock {P} at (4,940) size 747x16 - RenderText {#text} at (0,0) size 515x15 - text run at (0,0) width 515: "This sentence should have a normal line-height, because negative values are not permitted for this property." - RenderBlock {P} at (4,968) size 747x150 - RenderInline {SPAN} at (0,0) size 733x90 [bgcolor=#C0C0C0] - RenderText {#text} at (0,30) size 733x90 - text run at (0,30) width 733: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver," - text run at (0,105) width 706: "but no padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." + RenderText {#text} at (0,4) size 591x15 + text run at (0,4) width 591: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderBlock {P} at (0,48) size 747x192 + RenderText {#text} at (0,10) size 717x171 + text run at (0,10) width 687: "This sentence should have a line-height of twice the font size, which is" + text run at (0,58) width 681: "200% normal thanks to an inline style; this should cause extra spacing" + text run at (0,106) width 717: "between the lines, as the font-size will be 28px and the line-height will be" + text run at (0,154) width 54: "56px." + RenderBlock (anonymous) at (0,264) size 747x24 + RenderText {#text} at (0,4) size 605x15 + text run at (0,4) width 605: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." + RenderBlock {P} at (4,944) size 747x32 + RenderText {#text} at (0,0) size 745x31 + text run at (0,0) width 592: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " + text run at (592,0) width 153: "In the second section (within the" + text run at (0,16) width 181: "table) its line-height should be normal." + RenderBlock {P} at (4,988) size 747x16 + RenderText {#text} at (0,0) size 503x15 + text run at (0,0) width 503: "This sentence should have a normal line-height, because negative values are not permitted for this property." + RenderBlock {P} at (4,1016) size 747x150 + RenderInline {SPAN} at (0,0) size 743x90 [bgcolor=#C0C0C0] + RenderText {#text} at (0,30) size 743x90 + text run at (0,30) width 743: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver, but" + text run at (0,105) width 677: "no padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." RenderText {#text} at (0,0) size 0x0 layer at (8,281) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,273) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/text_properties/text_align-expected.txt b/LayoutTests/platform/wincairo/css1/text_properties/text_align-expected.txt index b22461b311c3..c90657ddc946 100644 --- a/LayoutTests/platform/wincairo/css1/text_properties/text_align-expected.txt +++ b/LayoutTests/platform/wincairo/css1/text_properties/text_align-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x80 RenderText {#text} at (0,0) size 224x80 text run at (0,0) width 192: ".one {text-align: left;}" @@ -18,42 +18,44 @@ layer at (0,0) size 800x600 text run at (224,48) width 0: " " text run at (0,64) width 0: " " RenderBlock {P} at (0,147) size 784x20 - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This sentence should be left-justified." + RenderText {#text} at (0,0) size 234x19 + text run at (0,0) width 234: "This sentence should be left-justified." RenderBlock {P} at (0,183) size 784x20 - RenderText {#text} at (555,0) size 229x19 - text run at (555,0) width 229: "This sentence should be right-justified." + RenderText {#text} at (541,0) size 243x19 + text run at (541,0) width 243: "This sentence should be right-justified." RenderBlock {P} at (0,219) size 784x20 - RenderText {#text} at (290,0) size 204x19 - text run at (290,0) width 204: "This sentence should be centered." - RenderBlock {P} at (0,255) size 784x40 - RenderText {#text} at (0,0) size 784x39 - text run at (0,0) width 784: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no matter how" - text run at (0,20) width 723: "long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in Western languages." - RenderTable {TABLE} at (0,311) size 784x186 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x184 + RenderText {#text} at (286,0) size 212x19 + text run at (286,0) width 212: "This sentence should be centered." + RenderBlock {P} at (0,255) size 784x60 + RenderText {#text} at (0,0) size 784x59 + text run at (0,0) width 784: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no" + text run at (0,20) width 784: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in Western" + text run at (0,40) width 67: "languages." + RenderTable {TABLE} at (0,331) size 784x206 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 782x204 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 782x156 - RenderTableCell {TD} at (0,92) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 782x176 + RenderTableCell {TD} at (0,102) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 770x156 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 770x176 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x20 - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This sentence should be left-justified." + RenderText {#text} at (0,0) size 234x19 + text run at (0,0) width 234: "This sentence should be left-justified." RenderBlock {P} at (4,40) size 762x20 - RenderText {#text} at (533,0) size 229x19 - text run at (533,0) width 229: "This sentence should be right-justified." + RenderText {#text} at (519,0) size 243x19 + text run at (519,0) width 243: "This sentence should be right-justified." RenderBlock {P} at (4,76) size 762x20 - RenderText {#text} at (279,0) size 204x19 - text run at (279,0) width 204: "This sentence should be centered." - RenderBlock {P} at (4,112) size 762x40 - RenderText {#text} at (0,0) size 762x39 - text run at (0,0) width 762: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no matter" - text run at (0,20) width 753: "how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in Western languages." + RenderText {#text} at (275,0) size 212x19 + text run at (275,0) width 212: "This sentence should be centered." + RenderBlock {P} at (4,112) size 762x60 + RenderText {#text} at (0,0) size 762x59 + text run at (0,0) width 762: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no" + text run at (0,20) width 762: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in" + text run at (0,40) width 122: "Western languages." layer at (8,137) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,129) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/text_properties/text_decoration-expected.txt b/LayoutTests/platform/wincairo/css1/text_properties/text_decoration-expected.txt index 687d8349977d..71572038e98b 100644 --- a/LayoutTests/platform/wincairo/css1/text_properties/text_decoration-expected.txt +++ b/LayoutTests/platform/wincairo/css1/text_properties/text_decoration-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1205 +layer at (0,0) size 785x1225 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1205 - RenderBlock {HTML} at (0,0) size 785x1205 - RenderBody {BODY} at (8,8) size 769x1189 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1225 + RenderBlock {HTML} at (0,0) size 785x1225 + RenderBody {BODY} at (8,8) size 769x1209 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x128 RenderText {#text} at (0,0) size 464x128 text run at (0,0) width 272: ".one {text-decoration: underline;}" @@ -24,176 +24,176 @@ layer at (0,0) size 785x1205 text run at (464,96) width 0: " " text run at (0,112) width 0: " " RenderBlock {P} at (0,195) size 769x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "This sentence should be underlined." + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "This sentence should be underlined." RenderBlock {P} at (0,231) size 769x20 - RenderText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "This sentence should be overlined." + RenderText {#text} at (0,0) size 218x19 + text run at (0,0) width 218: "This sentence should be overlined." RenderBlock {P} at (0,267) size 769x20 - RenderText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This sentence should have stricken text (linethrough)." + RenderText {#text} at (0,0) size 336x19 + text run at (0,0) width 336: "This sentence should have stricken text (linethrough)." RenderBlock {P} at (0,303) size 769x20 - RenderText {#text} at (0,0) size 560x19 - text run at (0,0) width 195: "This element should be blinking. " - text run at (195,0) width 365: "(It is not required, however, that UAs support this behavior.)" + RenderText {#text} at (0,0) size 590x19 + text run at (0,0) width 210: "This element should be blinking. " + text run at (210,0) width 380: "(It is not required, however, that UAs support this behavior.)" RenderBlock {P} at (0,339) size 769x40 - RenderText {#text} at (0,0) size 478x19 - text run at (0,0) width 273: "The text in this element should be underlined. " - text run at (273,0) width 205: "The boldfaced text in this element " - RenderInline {B} at (0,0) size 168x19 - RenderText {#text} at (478,0) size 168x19 - text run at (478,0) width 168: "should also be underlined" - RenderText {#text} at (646,0) size 767x39 - text run at (646,0) width 8: ". " - text run at (654,0) width 113: "This is because the" - text run at (0,20) width 600: "parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." + RenderText {#text} at (0,0) size 508x19 + text run at (0,0) width 291: "The text in this element should be underlined. " + text run at (291,0) width 217: "The boldfaced text in this element " + RenderInline {B} at (0,0) size 173x19 + RenderText {#text} at (508,0) size 173x19 + text run at (508,0) width 173: "should also be underlined" + RenderText {#text} at (681,0) size 731x39 + text run at (681,0) width 8: ". " + text run at (689,0) width 42: "This is" + text run at (0,20) width 716: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." RenderBlock {P} at (0,395) size 769x20 - RenderText {#text} at (0,0) size 298x19 - text run at (0,0) width 298: "This sentence should be underlined and overlined." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "This sentence should be underlined and overlined." RenderBlock {P} at (0,431) size 769x20 - RenderText {#text} at (0,0) size 357x19 - text run at (0,0) width 357: "This sentence should be underlined, overlined, and stricken." + RenderText {#text} at (0,0) size 377x19 + text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken." RenderBlock {P} at (0,467) size 769x0 RenderBlock {P} at (0,467) size 769x40 - RenderText {#text} at (0,0) size 739x39 - text run at (0,0) width 739: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with class of" - text run at (0,20) width 43: "seven)." - RenderBlock {P} at (0,523) size 769x40 - RenderText {#text} at (0,0) size 604x19 - text run at (0,0) width 604: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " - RenderInline {EM} at (0,0) size 21x19 - RenderText {#text} at (604,0) size 21x19 - text run at (604,0) width 21: "not" - RenderText {#text} at (625,0) size 81x19 - text run at (625,0) width 81: " be overlined:" - RenderImage {IMG} at (706,0) size 15x15 - RenderText {#text} at (721,0) size 752x39 - text run at (721,0) width 8: ". " - text run at (729,0) width 23: "The" - text run at (0,20) width 726: "underline of the parent element should hold true beneath the image, however, since text-decoration 'spans' child elements." - RenderBlock {P} at (0,579) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 95x19 - text run at (0,0) width 95: "The underlining " - RenderInline {SPAN} at (0,0) size 90x19 [color=#0000FF] - RenderText {#text} at (95,0) size 90x19 - text run at (95,0) width 90: "in this sentence" - RenderText {#text} at (185,0) size 223x19 - text run at (185,0) width 223: " should be green, no matter what the " - RenderInline {SPAN} at (0,0) size 105x19 [color=#000000] - RenderText {#text} at (408,0) size 105x19 - text run at (408,0) width 105: "text color may be" - RenderText {#text} at (513,0) size 4x19 - text run at (513,0) width 4: "." - RenderBlock {P} at (0,615) size 769x40 - RenderText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "The colors of the " - RenderInline {SPAN} at (0,0) size 64x19 [color=#800080] - RenderText {#text} at (106,0) size 64x19 - text run at (106,0) width 64: "underlining" - RenderText {#text} at (170,0) size 18x19 - text run at (170,0) width 18: " in " - RenderInline {SPAN} at (0,0) size 76x19 [color=#0000FF] - RenderText {#text} at (188,0) size 76x19 - text run at (188,0) width 76: "this sentence" - RenderText {#text} at (264,0) size 66x19 - text run at (264,0) width 66: " should be " - RenderInline {SPAN} at (0,0) size 202x19 [color=#808080] - RenderText {#text} at (330,0) size 202x19 - text run at (330,0) width 202: "the same as that of the parent text" - RenderText {#text} at (532,0) size 760x39 - text run at (532,0) width 228: " (that is, the first word in the sentence," - text run at (0,20) width 143: "which should be black)." - RenderTable {TABLE} at (0,671) size 769x518 [border: (1px outset #808080)] + RenderText {#text} at (0,0) size 761x39 + text run at (0,0) width 761: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with class" + text run at (0,20) width 62: "of seven)." + RenderBlock {P} at (0,523) size 769x60 + RenderText {#text} at (0,0) size 633x19 + text run at (0,0) width 633: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " + RenderInline {EM} at (0,0) size 20x19 + RenderText {#text} at (633,0) size 20x19 + text run at (633,0) width 20: "not" + RenderText {#text} at (653,0) size 86x19 + text run at (653,0) width 86: " be overlined:" + RenderImage {IMG} at (739,0) size 15x15 + RenderText {#text} at (754,0) size 758x59 + text run at (754,0) width 4: "." + text run at (0,20) width 729: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans' child" + text run at (0,40) width 59: "elements." + RenderBlock {P} at (0,599) size 769x20 [color=#008000] + RenderText {#text} at (0,0) size 105x19 + text run at (0,0) width 105: "The underlining " + RenderInline {SPAN} at (0,0) size 96x19 [color=#0000FF] + RenderText {#text} at (105,0) size 96x19 + text run at (105,0) width 96: "in this sentence" + RenderText {#text} at (201,0) size 233x19 + text run at (201,0) width 233: " should be green, no matter what the " + RenderInline {SPAN} at (0,0) size 109x19 [color=#000000] + RenderText {#text} at (434,0) size 109x19 + text run at (434,0) width 109: "text color may be" + RenderText {#text} at (543,0) size 4x19 + text run at (543,0) width 4: "." + RenderBlock {P} at (0,635) size 769x40 + RenderText {#text} at (0,0) size 111x19 + text run at (0,0) width 111: "The colors of the " + RenderInline {SPAN} at (0,0) size 72x19 [color=#800080] + RenderText {#text} at (111,0) size 72x19 + text run at (111,0) width 72: "underlining" + RenderText {#text} at (183,0) size 20x19 + text run at (183,0) width 20: " in " + RenderInline {SPAN} at (0,0) size 80x19 [color=#0000FF] + RenderText {#text} at (203,0) size 80x19 + text run at (203,0) width 80: "this sentence" + RenderText {#text} at (283,0) size 69x19 + text run at (283,0) width 69: " should be " + RenderInline {SPAN} at (0,0) size 209x19 [color=#808080] + RenderText {#text} at (352,0) size 209x19 + text run at (352,0) width 209: "the same as that of the parent text" + RenderText {#text} at (561,0) size 738x39 + text run at (561,0) width 177: " (that is, the first word in the" + text run at (0,20) width 213: "sentence, which should be black)." + RenderTable {TABLE} at (0,691) size 769x518 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x516 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x488 RenderTableCell {TD} at (0,258) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x488 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "This sentence should be underlined." + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "This sentence should be underlined." RenderBlock {P} at (4,40) size 747x20 - RenderText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "This sentence should be overlined." + RenderText {#text} at (0,0) size 218x19 + text run at (0,0) width 218: "This sentence should be overlined." RenderBlock {P} at (4,76) size 747x20 - RenderText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This sentence should have stricken text (linethrough)." + RenderText {#text} at (0,0) size 336x19 + text run at (0,0) width 336: "This sentence should have stricken text (linethrough)." RenderBlock {P} at (4,112) size 747x20 - RenderText {#text} at (0,0) size 560x19 - text run at (0,0) width 195: "This element should be blinking. " - text run at (195,0) width 365: "(It is not required, however, that UAs support this behavior.)" + RenderText {#text} at (0,0) size 590x19 + text run at (0,0) width 210: "This element should be blinking. " + text run at (210,0) width 380: "(It is not required, however, that UAs support this behavior.)" RenderBlock {P} at (4,148) size 747x40 - RenderText {#text} at (0,0) size 478x19 - text run at (0,0) width 273: "The text in this element should be underlined. " - text run at (273,0) width 205: "The boldfaced text in this element " - RenderInline {B} at (0,0) size 168x19 - RenderText {#text} at (478,0) size 168x19 - text run at (478,0) width 168: "should also be underlined" - RenderText {#text} at (646,0) size 745x39 - text run at (646,0) width 8: ". " - text run at (654,0) width 91: "This is because" - text run at (0,20) width 622: "the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." + RenderText {#text} at (0,0) size 508x19 + text run at (0,0) width 291: "The text in this element should be underlined. " + text run at (291,0) width 217: "The boldfaced text in this element " + RenderInline {B} at (0,0) size 173x19 + RenderText {#text} at (508,0) size 173x19 + text run at (508,0) width 173: "should also be underlined" + RenderText {#text} at (681,0) size 731x39 + text run at (681,0) width 8: ". " + text run at (689,0) width 42: "This is" + text run at (0,20) width 716: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." RenderBlock {P} at (4,204) size 747x20 - RenderText {#text} at (0,0) size 298x19 - text run at (0,0) width 298: "This sentence should be underlined and overlined." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "This sentence should be underlined and overlined." RenderBlock {P} at (4,240) size 747x20 - RenderText {#text} at (0,0) size 357x19 - text run at (0,0) width 357: "This sentence should be underlined, overlined, and stricken." + RenderText {#text} at (0,0) size 377x19 + text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken." RenderBlock {P} at (4,276) size 747x0 RenderBlock {P} at (4,276) size 747x40 - RenderText {#text} at (0,0) size 739x39 - text run at (0,0) width 739: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with class of" - text run at (0,20) width 43: "seven)." + RenderText {#text} at (0,0) size 727x39 + text run at (0,0) width 727: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with" + text run at (0,20) width 96: "class of seven)." RenderBlock {P} at (4,332) size 747x60 - RenderText {#text} at (0,0) size 604x19 - text run at (0,0) width 604: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " - RenderInline {EM} at (0,0) size 21x19 - RenderText {#text} at (604,0) size 21x19 - text run at (604,0) width 21: "not" - RenderText {#text} at (625,0) size 85x19 - text run at (625,0) width 85: " be overlined: " - RenderImage {IMG} at (710,0) size 15x15 - RenderText {#text} at (725,0) size 729x59 - text run at (725,0) width 4: "." - text run at (0,20) width 693: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans' child" - text run at (0,40) width 56: "elements." + RenderText {#text} at (0,0) size 633x19 + text run at (0,0) width 633: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " + RenderInline {EM} at (0,0) size 20x19 + RenderText {#text} at (633,0) size 20x19 + text run at (633,0) width 20: "not" + RenderText {#text} at (653,0) size 86x19 + text run at (653,0) width 86: " be overlined:" + RenderImage {IMG} at (0,20) size 15x15 + RenderText {#text} at (15,20) size 717x39 + text run at (15,20) width 8: ". " + text run at (23,20) width 694: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans'" + text run at (0,40) width 94: "child elements." RenderBlock {P} at (4,408) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 95x19 - text run at (0,0) width 95: "The underlining " - RenderInline {SPAN} at (0,0) size 90x19 [color=#0000FF] - RenderText {#text} at (95,0) size 90x19 - text run at (95,0) width 90: "in this sentence" - RenderText {#text} at (185,0) size 223x19 - text run at (185,0) width 223: " should be green, no matter what the " - RenderInline {SPAN} at (0,0) size 105x19 [color=#000000] - RenderText {#text} at (408,0) size 105x19 - text run at (408,0) width 105: "text color may be" - RenderText {#text} at (513,0) size 4x19 - text run at (513,0) width 4: "." + RenderText {#text} at (0,0) size 105x19 + text run at (0,0) width 105: "The underlining " + RenderInline {SPAN} at (0,0) size 96x19 [color=#0000FF] + RenderText {#text} at (105,0) size 96x19 + text run at (105,0) width 96: "in this sentence" + RenderText {#text} at (201,0) size 233x19 + text run at (201,0) width 233: " should be green, no matter what the " + RenderInline {SPAN} at (0,0) size 109x19 [color=#000000] + RenderText {#text} at (434,0) size 109x19 + text run at (434,0) width 109: "text color may be" + RenderText {#text} at (543,0) size 4x19 + text run at (543,0) width 4: "." RenderBlock {P} at (4,444) size 747x40 - RenderText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "The colors of the " - RenderInline {SPAN} at (0,0) size 64x19 [color=#800080] - RenderText {#text} at (106,0) size 64x19 - text run at (106,0) width 64: "underlining" - RenderText {#text} at (170,0) size 18x19 - text run at (170,0) width 18: " in " - RenderInline {SPAN} at (0,0) size 76x19 [color=#0000FF] - RenderText {#text} at (188,0) size 76x19 - text run at (188,0) width 76: "this sentence" - RenderText {#text} at (264,0) size 66x19 - text run at (264,0) width 66: " should be " - RenderInline {SPAN} at (0,0) size 202x19 [color=#808080] - RenderText {#text} at (330,0) size 202x19 - text run at (330,0) width 202: "the same as that of the parent text" - RenderText {#text} at (532,0) size 700x39 - text run at (532,0) width 168: " (that is, the first word in the" - text run at (0,20) width 203: "sentence, which should be black)." + RenderText {#text} at (0,0) size 111x19 + text run at (0,0) width 111: "The colors of the " + RenderInline {SPAN} at (0,0) size 72x19 [color=#800080] + RenderText {#text} at (111,0) size 72x19 + text run at (111,0) width 72: "underlining" + RenderText {#text} at (183,0) size 20x19 + text run at (183,0) width 20: " in " + RenderInline {SPAN} at (0,0) size 80x19 [color=#0000FF] + RenderText {#text} at (203,0) size 80x19 + text run at (203,0) width 80: "this sentence" + RenderText {#text} at (283,0) size 69x19 + text run at (283,0) width 69: " should be " + RenderInline {SPAN} at (0,0) size 209x19 [color=#808080] + RenderText {#text} at (352,0) size 209x19 + text run at (352,0) width 209: "the same as that of the parent text" + RenderText {#text} at (561,0) size 738x39 + text run at (561,0) width 177: " (that is, the first word in the" + text run at (0,20) width 213: "sentence, which should be black)." layer at (8,185) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,177) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/text_properties/text_indent-expected.txt b/LayoutTests/platform/wincairo/css1/text_properties/text_indent-expected.txt index 67dfbbdac3a2..99f2a51ad89b 100644 --- a/LayoutTests/platform/wincairo/css1/text_properties/text_indent-expected.txt +++ b/LayoutTests/platform/wincairo/css1/text_properties/text_indent-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1329 RenderBlock {HTML} at (0,0) size 785x1329 RenderBody {BODY} at (8,8) size 769x1313 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x176 RenderText {#text} at (0,0) size 384x176 text run at (0,0) width 352: ".one {text-indent: 0.5in; background: aqua;}" @@ -30,108 +30,108 @@ layer at (0,0) size 785x1329 text run at (384,144) width 0: " " text run at (0,160) width 0: " " RenderBlock {P} at (0,243) size 769x20 [bgcolor=#00FFFF] - RenderText {#text} at (48,0) size 361x19 - text run at (48,0) width 361: "The first line of this sentence should be indented half an inch." + RenderText {#text} at (48,0) size 386x19 + text run at (48,0) width 386: "The first line of this sentence should be indented half an inch." RenderBlock {P} at (0,279) size 769x20 [bgcolor=#00FFFF] - RenderText {#text} at (75,0) size 390x19 - text run at (75,0) width 390: "The first line of this sentence should be indented two centimeters." + RenderText {#text} at (75,0) size 412x19 + text run at (75,0) width 412: "The first line of this sentence should be indented two centimeters." RenderBlock {P} at (0,315) size 769x20 [bgcolor=#00FFFF] - RenderText {#text} at (75,0) size 402x19 - text run at (75,0) width 402: "The first line of this sentence should be indented twenty millimeters." + RenderText {#text} at (75,0) size 429x19 + text run at (75,0) width 429: "The first line of this sentence should be indented twenty millimeters." RenderBlock {P} at (0,351) size 769x20 [bgcolor=#00FFFF] - RenderText {#text} at (32,0) size 404x19 - text run at (32,0) width 404: "The first line of this sentence should be indented twenty-four points." + RenderText {#text} at (32,0) size 428x19 + text run at (32,0) width 428: "The first line of this sentence should be indented twenty-four points." RenderBlock {P} at (0,387) size 769x20 [bgcolor=#00FFFF] - RenderText {#text} at (32,0) size 352x19 - text run at (32,0) width 352: "The first line of this sentence should be indented two picas." + RenderText {#text} at (32,0) size 372x19 + text run at (32,0) width 372: "The first line of this sentence should be indented two picas." RenderBlock {P} at (0,423) size 769x20 [bgcolor=#00FFFF] - RenderText {#text} at (32,0) size 339x19 - text run at (32,0) width 339: "The first line of this sentence should be indented two em." + RenderText {#text} at (32,0) size 359x19 + text run at (32,0) width 359: "The first line of this sentence should be indented two em." RenderBlock {P} at (0,459) size 769x20 [bgcolor=#00FFFF] - RenderText {#text} at (14,0) size 335x19 - text run at (14,0) width 335: "The first line of this sentence should be indented two ex." + RenderText {#text} at (14,0) size 355x19 + text run at (14,0) width 355: "The first line of this sentence should be indented two ex." RenderBlock {P} at (0,495) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (384,0) size 764x39 - text run at (384,0) width 380: "The first line of this sentence should be indented halfway across" - text run at (0,20) width 483: "the page, but the rest of it should be flush with the normal left margin of the page." + RenderText {#text} at (384,0) size 744x39 + text run at (384,0) width 360: "The first line of this sentence should be indented halfway" + text run at (0,20) width 555: "across the page, but the rest of it should be flush with the normal left margin of the page." RenderBlock {P} at (0,551) size 769x40 [bgcolor=#00FFFF] - RenderText {#text} at (25,0) size 764x39 - text run at (25,0) width 739: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left margin of the" - text run at (0,20) width 33: "page." + RenderText {#text} at (25,0) size 723x39 + text run at (25,0) width 698: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left" + text run at (0,20) width 122: "margin of the page." RenderBlock {P} at (0,607) size 769x60 [bgcolor=#00FFFF] - RenderText {#text} at (48,0) size 389x19 - text run at (48,0) width 389: "Only the first line of this sentence should be indented half an inch," - RenderBR {BR} at (437,0) size 0x19 - RenderText {#text} at (0,20) size 246x19 - text run at (0,20) width 246: "no matter where the lines might start, and" - RenderBR {BR} at (246,20) size 0x19 - RenderInline {EM} at (0,0) size 202x19 - RenderText {#text} at (0,40) size 202x19 - text run at (0,40) width 202: "regardless of any other markup" - RenderText {#text} at (202,40) size 139x19 - text run at (202,40) width 139: " which may be present." + RenderText {#text} at (48,0) size 416x19 + text run at (48,0) width 416: "Only the first line of this sentence should be indented half an inch," + RenderBR {BR} at (464,0) size 0x19 + RenderText {#text} at (0,20) size 259x19 + text run at (0,20) width 259: "no matter where the lines might start, and" + RenderBR {BR} at (259,20) size 0x19 + RenderInline {EM} at (0,0) size 199x19 + RenderText {#text} at (0,40) size 199x19 + text run at (0,40) width 199: "regardless of any other markup" + RenderText {#text} at (199,40) size 146x19 + text run at (199,40) width 146: " which may be present." RenderBlock {BLOCKQUOTE} at (40,683) size 689x60 [bgcolor=#00FFFF] - RenderText {#text} at (344,0) size 686x59 - text run at (344,0) width 321: "In the first half of the test page, this BLOCKQUOTE" - text run at (0,20) width 686: "element should have a text indent equal to 50% of the BODY element's width, since BLOCKQUOTE is a child of" - text run at (0,40) width 299: "BODY; in the second half, it is a child of TABLE." + RenderText {#text} at (344,0) size 682x59 + text run at (344,0) width 338: "In the first half of the test page, this BLOCKQUOTE" + text run at (0,20) width 670: "element should have a text indent equal to 50% of the BODY element's width, since BLOCKQUOTE is a" + text run at (0,40) width 369: "child of BODY; in the second half, it is a child of TABLE." RenderTable {TABLE} at (0,759) size 769x554 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x552 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x524 RenderTableCell {TD} at (0,276) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x524 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 [bgcolor=#00FFFF] - RenderText {#text} at (48,0) size 361x19 - text run at (48,0) width 361: "The first line of this sentence should be indented half an inch." + RenderText {#text} at (48,0) size 386x19 + text run at (48,0) width 386: "The first line of this sentence should be indented half an inch." RenderBlock {P} at (4,40) size 747x20 [bgcolor=#00FFFF] - RenderText {#text} at (75,0) size 390x19 - text run at (75,0) width 390: "The first line of this sentence should be indented two centimeters." + RenderText {#text} at (75,0) size 412x19 + text run at (75,0) width 412: "The first line of this sentence should be indented two centimeters." RenderBlock {P} at (4,76) size 747x20 [bgcolor=#00FFFF] - RenderText {#text} at (75,0) size 402x19 - text run at (75,0) width 402: "The first line of this sentence should be indented twenty millimeters." + RenderText {#text} at (75,0) size 429x19 + text run at (75,0) width 429: "The first line of this sentence should be indented twenty millimeters." RenderBlock {P} at (4,112) size 747x20 [bgcolor=#00FFFF] - RenderText {#text} at (32,0) size 404x19 - text run at (32,0) width 404: "The first line of this sentence should be indented twenty-four points." + RenderText {#text} at (32,0) size 428x19 + text run at (32,0) width 428: "The first line of this sentence should be indented twenty-four points." RenderBlock {P} at (4,148) size 747x20 [bgcolor=#00FFFF] - RenderText {#text} at (32,0) size 352x19 - text run at (32,0) width 352: "The first line of this sentence should be indented two picas." + RenderText {#text} at (32,0) size 372x19 + text run at (32,0) width 372: "The first line of this sentence should be indented two picas." RenderBlock {P} at (4,184) size 747x20 [bgcolor=#00FFFF] - RenderText {#text} at (32,0) size 339x19 - text run at (32,0) width 339: "The first line of this sentence should be indented two em." + RenderText {#text} at (32,0) size 359x19 + text run at (32,0) width 359: "The first line of this sentence should be indented two em." RenderBlock {P} at (4,220) size 747x20 [bgcolor=#00FFFF] - RenderText {#text} at (14,0) size 335x19 - text run at (14,0) width 335: "The first line of this sentence should be indented two ex." + RenderText {#text} at (14,0) size 355x19 + text run at (14,0) width 355: "The first line of this sentence should be indented two ex." RenderBlock {P} at (4,256) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (373,0) size 710x39 - text run at (373,0) width 337: "The first line of this sentence should be indented halfway" - text run at (0,20) width 526: "across the page, but the rest of it should be flush with the normal left margin of the page." + RenderText {#text} at (373,0) size 733x39 + text run at (373,0) width 360: "The first line of this sentence should be indented halfway" + text run at (0,20) width 555: "across the page, but the rest of it should be flush with the normal left margin of the page." RenderBlock {P} at (4,312) size 747x40 [bgcolor=#00FFFF] - RenderText {#text} at (25,0) size 742x39 - text run at (25,0) width 717: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left margin of" - text run at (0,20) width 55: "the page." + RenderText {#text} at (25,0) size 723x39 + text run at (25,0) width 698: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left" + text run at (0,20) width 122: "margin of the page." RenderBlock {P} at (4,368) size 747x60 [bgcolor=#00FFFF] - RenderText {#text} at (48,0) size 389x19 - text run at (48,0) width 389: "Only the first line of this sentence should be indented half an inch," - RenderBR {BR} at (437,0) size 0x19 - RenderText {#text} at (0,20) size 246x19 - text run at (0,20) width 246: "no matter where the lines might start, and" - RenderBR {BR} at (246,20) size 0x19 - RenderInline {EM} at (0,0) size 202x19 - RenderText {#text} at (0,40) size 202x19 - text run at (0,40) width 202: "regardless of any other markup" - RenderText {#text} at (202,40) size 139x19 - text run at (202,40) width 139: " which may be present." + RenderText {#text} at (48,0) size 416x19 + text run at (48,0) width 416: "Only the first line of this sentence should be indented half an inch," + RenderBR {BR} at (464,0) size 0x19 + RenderText {#text} at (0,20) size 259x19 + text run at (0,20) width 259: "no matter where the lines might start, and" + RenderBR {BR} at (259,20) size 0x19 + RenderInline {EM} at (0,0) size 199x19 + RenderText {#text} at (0,40) size 199x19 + text run at (0,40) width 199: "regardless of any other markup" + RenderText {#text} at (199,40) size 146x19 + text run at (199,40) width 146: " which may be present." RenderBlock {BLOCKQUOTE} at (44,444) size 667x60 [bgcolor=#00FFFF] - RenderText {#text} at (333,0) size 654x59 - text run at (333,0) width 321: "In the first half of the test page, this BLOCKQUOTE" - text run at (0,20) width 638: "element should have a text indent equal to 50% of the BODY element's width, since BLOCKQUOTE is a" - text run at (0,40) width 347: "child of BODY; in the second half, it is a child of TABLE." + RenderText {#text} at (333,0) size 645x59 + text run at (333,0) width 222: "In the first half of the test page, this" + text run at (0,20) width 645: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" + text run at (0,40) width 510: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." layer at (8,233) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,225) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/text_properties/text_transform-expected.txt b/LayoutTests/platform/wincairo/css1/text_properties/text_transform-expected.txt index fe0a2155cfe5..d919ed73fd9c 100644 --- a/LayoutTests/platform/wincairo/css1/text_properties/text_transform-expected.txt +++ b/LayoutTests/platform/wincairo/css1/text_properties/text_transform-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x745 +layer at (0,0) size 785x785 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x745 - RenderBlock {HTML} at (0,0) size 785x745 - RenderBody {BODY} at (8,8) size 769x729 [bgcolor=#CCCCCC] +layer at (0,0) size 785x785 + RenderBlock {HTML} at (0,0) size 785x785 + RenderBody {BODY} at (8,8) size 769x769 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x80 RenderText {#text} at (0,0) size 272x80 text run at (0,0) width 224: ".ttn {text-transform: none;}" @@ -17,89 +17,91 @@ layer at (0,0) size 785x745 text run at (0,48) width 264: ".low {text-transform: lowercase;}" text run at (264,48) width 0: " " text run at (0,64) width 0: " " - RenderBlock {P} at (0,147) size 769x20 - RenderText {#text} at (0,0) size 740x19 - text run at (0,0) width 740: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear normal." - RenderBlock {P} at (0,183) size 769x60 - RenderText {#text} at (0,0) size 764x59 - text run at (0,0) width 764: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That Are In" - text run at (0,20) width 744: "Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A Non-Breaking Space" - text run at (0,40) width 420: "(&Nbsp;). Both Those Characters Appear In The Previous Sentence." - RenderBlock {P} at (0,259) size 769x40 - RenderText {#text} at (0,0) size 766x39 - text run at (0,0) width 766: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in this sentence" - text run at (0,20) width 233: "should have one, and only one, capital " - RenderInline {SPAN} at (0,0) size 36x19 - RenderText {#text} at (233,20) size 16x19 - text run at (233,20) width 16: "Le" + RenderBlock {P} at (0,147) size 769x40 + RenderText {#text} at (0,0) size 718x39 + text run at (0,0) width 718: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear" + text run at (0,20) width 48: "normal." + RenderBlock {P} at (0,203) size 769x60 + RenderText {#text} at (0,0) size 748x59 + text run at (0,0) width 748: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That" + text run at (0,20) width 720: "Are In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A Non-" + text run at (0,40) width 538: "Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." + RenderBlock {P} at (0,279) size 769x40 + RenderText {#text} at (0,0) size 752x39 + text run at (0,0) width 752: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in this" + text run at (0,20) width 304: "sentence should have one, and only one, capital " + RenderInline {SPAN} at (0,0) size 37x19 + RenderText {#text} at (304,20) size 17x19 + text run at (304,20) width 17: "Le" RenderInline {SPAN} at (0,0) size 8x19 - RenderText {#text} at (249,20) size 8x19 - text run at (249,20) width 8: "tt" - RenderText {#text} at (257,20) size 12x19 - text run at (257,20) width 12: "er" - RenderText {#text} at (269,20) size 4x19 - text run at (269,20) width 4: "." - RenderBlock {P} at (0,315) size 769x60 - RenderText {#text} at (0,0) size 749x39 - text run at (0,0) width 749: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5}) SHOULD" - text run at (0,20) width 272: "THEREFORE APPEAR IN UPPERCASE. " - text run at (272,20) width 269: "IN THE LAST SENTENCE, HOWEVER, " - RenderInline {SPAN} at (0,0) size 742x39 - RenderText {#text} at (541,20) size 742x39 - text run at (541,20) width 201: "the last eight words should not be" - text run at (0,40) width 62: "uppercase" - RenderText {#text} at (62,40) size 4x19 - text run at (62,40) width 4: "." - RenderBlock {P} at (0,391) size 769x20 - RenderText {#text} at (0,0) size 700x19 - text run at (0,0) width 700: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." - RenderTable {TABLE} at (0,427) size 769x302 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x300 + RenderText {#text} at (321,20) size 8x19 + text run at (321,20) width 8: "tt" + RenderText {#text} at (329,20) size 12x19 + text run at (329,20) width 12: "er" + RenderText {#text} at (341,20) size 4x19 + text run at (341,20) width 4: "." + RenderBlock {P} at (0,335) size 769x60 + RenderText {#text} at (0,0) size 717x39 + text run at (0,0) width 717: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" + text run at (0,20) width 359: "SHOULD THEREFORE APPEAR IN UPPERCASE. " + text run at (359,20) width 284: "IN THE LAST SENTENCE, HOWEVER, " + RenderInline {SPAN} at (0,0) size 765x39 + RenderText {#text} at (643,20) size 765x39 + text run at (643,20) width 122: "the last eight words" + text run at (0,40) width 152: "should not be uppercase" + RenderText {#text} at (152,40) size 4x19 + text run at (152,40) width 4: "." + RenderBlock {P} at (0,411) size 769x20 + RenderText {#text} at (0,0) size 726x19 + text run at (0,0) width 726: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." + RenderTable {TABLE} at (0,447) size 769x322 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x320 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x272 - RenderTableCell {TD} at (0,150) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x292 + RenderTableCell {TD} at (0,160) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x272 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 740x19 - text run at (0,0) width 740: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear normal." - RenderBlock {P} at (4,40) size 747x60 - RenderText {#text} at (0,0) size 721x59 - text run at (0,0) width 721: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That" - text run at (0,20) width 691: "Are In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A Non-" - text run at (0,40) width 520: "Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." - RenderBlock {P} at (4,116) size 747x40 - RenderText {#text} at (0,0) size 710x39 - text run at (0,0) width 710: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in this" - text run at (0,20) width 289: "sentence should have one, and only one, capital " - RenderInline {SPAN} at (0,0) size 36x19 - RenderText {#text} at (289,20) size 16x19 - text run at (289,20) width 16: "Le" + RenderTableCell {TD} at (12,28) size 755x292 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {P} at (4,4) size 747x40 + RenderText {#text} at (0,0) size 718x39 + text run at (0,0) width 718: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear" + text run at (0,20) width 48: "normal." + RenderBlock {P} at (4,60) size 747x60 + RenderText {#text} at (0,0) size 716x59 + text run at (0,0) width 715: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words" + text run at (0,20) width 716: "That Are In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A" + text run at (0,40) width 571: "Non-Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." + RenderBlock {P} at (4,136) size 747x40 + RenderText {#text} at (0,0) size 726x39 + text run at (0,0) width 726: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in" + text run at (0,20) width 330: "this sentence should have one, and only one, capital " + RenderInline {SPAN} at (0,0) size 37x19 + RenderText {#text} at (330,20) size 17x19 + text run at (330,20) width 17: "Le" RenderInline {SPAN} at (0,0) size 8x19 - RenderText {#text} at (305,20) size 8x19 - text run at (305,20) width 8: "tt" - RenderText {#text} at (313,20) size 12x19 - text run at (313,20) width 12: "er" - RenderText {#text} at (325,20) size 4x19 - text run at (325,20) width 4: "." - RenderBlock {P} at (4,172) size 747x60 - RenderText {#text} at (0,0) size 682x39 - text run at (0,0) width 682: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" - text run at (0,20) width 339: "SHOULD THEREFORE APPEAR IN UPPERCASE. " - text run at (339,20) width 269: "IN THE LAST SENTENCE, HOWEVER, " - RenderInline {SPAN} at (0,0) size 724x39 - RenderText {#text} at (608,20) size 724x39 - text run at (608,20) width 116: "the last eight words" - text run at (0,40) width 147: "should not be uppercase" - RenderText {#text} at (147,40) size 4x19 - text run at (147,40) width 4: "." - RenderBlock {P} at (4,248) size 747x20 - RenderText {#text} at (0,0) size 700x19 - text run at (0,0) width 700: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." + RenderText {#text} at (347,20) size 8x19 + text run at (347,20) width 8: "tt" + RenderText {#text} at (355,20) size 12x19 + text run at (355,20) width 12: "er" + RenderText {#text} at (367,20) size 4x19 + text run at (367,20) width 4: "." + RenderBlock {P} at (4,192) size 747x60 + RenderText {#text} at (0,0) size 717x39 + text run at (0,0) width 717: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" + text run at (0,20) width 359: "SHOULD THEREFORE APPEAR IN UPPERCASE. " + text run at (359,20) width 284: "IN THE LAST SENTENCE, HOWEVER, " + RenderInline {SPAN} at (0,0) size 722x39 + RenderText {#text} at (643,20) size 722x39 + text run at (643,20) width 79: "the last eight" + text run at (0,40) width 195: "words should not be uppercase" + RenderText {#text} at (195,40) size 4x19 + text run at (195,40) width 4: "." + RenderBlock {P} at (4,268) size 747x20 + RenderText {#text} at (0,0) size 726x19 + text run at (0,0) width 726: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." layer at (8,137) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,129) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/text_properties/vertical_align-expected.txt b/LayoutTests/platform/wincairo/css1/text_properties/vertical_align-expected.txt index cd66a20b76ce..ccce64ceb19d 100644 --- a/LayoutTests/platform/wincairo/css1/text_properties/vertical_align-expected.txt +++ b/LayoutTests/platform/wincairo/css1/text_properties/vertical_align-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x4501 RenderBlock {HTML} at (0,0) size 785x4501 RenderBody {BODY} at (8,8) size 769x4485 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x288 RenderText {#text} at (0,0) size 512x288 text run at (0,0) width 160: "P {font-size: 12pt;}" @@ -44,340 +44,343 @@ layer at (0,0) size 785x4501 text run at (0,272) width 0: " " RenderBlock {P} at (0,355) size 769x80 RenderImage {IMG} at (0,0) size 15x50 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (15,39) size 119x19 - text run at (15,39) width 119: "The first four words" - RenderText {#text} at (134,35) size 767x44 - text run at (134,35) width 270: " in this sentence should be subscript-aligned. " - text run at (404,35) width 363: "The font size of the superscripted text should not be different" - text run at (0,59) width 188: "from that of the parent element." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (15,39) size 126x19 + text run at (15,39) width 126: "The first four words" + RenderText {#text} at (141,35) size 750x44 + text run at (141,35) width 284: " in this sentence should be subscript-aligned. " + text run at (425,35) width 325: "The font size of the superscripted text should not be" + text run at (0,59) width 254: "different from that of the parent element." RenderBlock {P} at (0,450) size 769x76 RenderImage {IMG} at (0,0) size 15x50 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (15,29) size 119x19 - text run at (15,29) width 119: "The first four words" - RenderText {#text} at (134,35) size 767x39 - text run at (134,35) width 282: " in this sentence should be superscript-aligned. " - text run at (416,35) width 351: "The font size of the subscripted text should not be different" - text run at (0,55) width 188: "from that of the parent element." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (15,29) size 126x19 + text run at (15,29) width 126: "The first four words" + RenderText {#text} at (141,35) size 750x39 + text run at (141,35) width 296: " in this sentence should be superscript-aligned. " + text run at (437,35) width 313: "The font size of the subscripted text should not be" + text run at (0,55) width 254: "different from that of the parent element." RenderBlock {P} at (0,541) size 769x76 RenderImage {IMG} at (0,0) size 15x50 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (15,0) size 119x19 - text run at (15,0) width 119: "The first four words" - RenderText {#text} at (134,35) size 757x39 - text run at (134,35) width 623: " in this sentence should be top-aligned, which will align their tops with the top of the tallest element in the" - text run at (0,55) width 217: "line (probably the orange rectangle)." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (15,0) size 126x19 + text run at (15,0) width 126: "The first four words" + RenderText {#text} at (141,35) size 765x39 + text run at (141,35) width 624: " in this sentence should be top-aligned, which will align their tops with the top of the tallest element" + text run at (0,55) width 267: "in the line (probably the orange rectangle)." RenderBlock {P} at (0,632) size 769x134 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,35) size 4x19 text run at (15,35) width 4: " " - RenderInline {SPAN} at (0,0) size 764x110 + RenderInline {SPAN} at (0,0) size 754x110 RenderText {#text} at (0,0) size 0x0 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (19,22) size 119x19 - text run at (19,22) width 119: "The first four words" - RenderText {#text} at (138,22) size 764x110 - text run at (138,22) width 626: " in this sentence should be text-top-aligned, which" - text run at (0,59) width 733: "should align their tops with the top of the tallest text in the" - text run at (0,96) width 55: "line." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (19,22) size 126x19 + text run at (19,22) width 126: "The first four words" + RenderText {#text} at (145,22) size 754x110 + text run at (145,22) width 556: " in this sentence should be text-top-aligned," + text run at (0,59) width 754: "which should align their tops with the top of the tallest text" + text run at (0,96) width 136: "in the line." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,781) size 769x71 RenderImage {IMG} at (0,0) size 15x50 - RenderText {#text} at (15,14) size 756x55 - text run at (15,14) width 741: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point defined as" - text run at (0,50) width 227: "the text baseline plus half the x-height." + RenderText {#text} at (15,14) size 739x55 + text run at (15,14) width 724: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point" + text run at (0,50) width 310: "defined as the text baseline plus half the x-height." RenderBlock {P} at (0,867) size 769x125 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,13) size 4x19 text run at (15,13) width 4: " " - RenderInline {SPAN} at (0,0) size 716x123 + RenderInline {SPAN} at (0,0) size 733x123 RenderText {#text} at (0,0) size 0x0 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (19,30) size 119x19 - text run at (19,30) width 119: "The first four words" - RenderText {#text} at (138,0) size 716x123 - text run at (138,0) width 532: " in this sentence should be 12pt in size and" - text run at (0,50) width 716: "bottom-aligned, which should align their bottom with the" - text run at (0,87) width 506: "bottom of the lowest element in the line." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (19,30) size 126x19 + text run at (19,30) width 126: "The first four words" + RenderText {#text} at (145,0) size 733x123 + text run at (145,0) width 544: " in this sentence should be 12pt in size and" + text run at (0,50) width 733: "bottom-aligned, which should align their bottom with the" + text run at (0,87) width 517: "bottom of the lowest element in the line." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,1007) size 769x162 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,13) size 4x19 text run at (15,13) width 4: " " - RenderInline {SPAN} at (0,0) size 718x160 + RenderInline {SPAN} at (0,0) size 745x160 RenderText {#text} at (0,0) size 0x0 - RenderInline {SPAN} at (0,0) size 276x19 - RenderText {#text} at (19,16) size 276x19 - text run at (19,16) width 276: "The first eight words (\"eight\" has a descender)" - RenderText {#text} at (295,0) size 718x160 - text run at (295,0) width 423: " in this sentence should be 12pt in" - text run at (0,50) width 675: "size and text-bottom-aligned, which should align their" - text run at (0,87) width 657: "bottom with the bottom of the lowest text (including" - text run at (0,124) width 288: "descenders) in the line." + RenderInline {SPAN} at (0,0) size 293x19 + RenderText {#text} at (19,16) size 293x19 + text run at (19,16) width 293: "The first eight words (\"eight\" has a descender)" + RenderText {#text} at (312,0) size 745x160 + text run at (312,0) width 433: " in this sentence should be 12pt in" + text run at (0,50) width 692: "size and text-bottom-aligned, which should align their" + text run at (0,87) width 671: "bottom with the bottom of the lowest text (including" + text run at (0,124) width 294: "descenders) in the line." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,1184) size 769x134 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,35) size 4x19 text run at (15,35) width 4: " " - RenderInline {SPAN} at (0,0) size 742x110 + RenderInline {SPAN} at (0,0) size 759x110 RenderText {#text} at (0,0) size 0x0 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (19,35) size 119x19 - text run at (19,35) width 119: "The first four words" - RenderText {#text} at (138,22) size 742x110 - text run at (138,22) width 532: " in this sentence should be 12pt in size and" - text run at (0,59) width 742: "baseline-aligned, which should align their baseline with the" - text run at (0,96) width 511: "baseline of the rest of the text in the line." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (19,35) size 126x19 + text run at (19,35) width 126: "The first four words" + RenderText {#text} at (145,22) size 759x110 + text run at (145,22) width 544: " in this sentence should be 12pt in size and" + text run at (0,59) width 759: "baseline-aligned, which should align their baseline with the" + text run at (0,96) width 522: "baseline of the rest of the text in the line." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,1333) size 769x76 RenderImage {IMG} at (0,0) size 15x50 - RenderInline {SPAN} at (0,0) size 98x15 - RenderText {#text} at (15,30) size 98x15 - text run at (15,30) width 98: "The first four words" - RenderText {#text} at (113,35) size 760x39 - text run at (113,35) width 647: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned, which" - text run at (0,55) width 316: "should raise them 8px relative to the natural baseline." + RenderInline {SPAN} at (0,0) size 96x15 + RenderText {#text} at (15,30) size 96x15 + text run at (15,30) width 96: "The first four words" + RenderText {#text} at (111,35) size 750x39 + text run at (111,35) width 639: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned," + text run at (0,55) width 376: "which should raise them 8px relative to the natural baseline." RenderBlock {P} at (0,1424) size 769x41 - RenderText {#text} at (0,0) size 761x39 - text run at (0,0) width 761: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first section of" - text run at (0,20) width 561: "text, whereas any size text should be aligned with the text baseline (which is the default value)." + RenderText {#text} at (0,0) size 742x39 + text run at (0,0) width 742: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first" + text run at (0,20) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." RenderBlock {P} at (0,1482) size 769x329 - RenderText {#text} at (0,27) size 117x21 - text run at (0,27) width 117: "This paragraph " - RenderImage {IMG} at (117,27) size 9x30 - RenderText {#text} at (126,27) size 5x21 - text run at (126,27) width 5: " " - RenderInline {SPAN} at (0,0) size 413x53 - RenderText {#text} at (131,1) size 413x53 - text run at (131,1) width 413: "contains many images" - RenderText {#text} at (544,27) size 5x21 - text run at (544,27) width 5: " " - RenderImage {IMG} at (549,27) size 15x50 - RenderText {#text} at (564,27) size 5x21 - text run at (564,27) width 5: " " - RenderInline {BIG} at (0,0) size 148x23 - RenderText {#text} at (569,25) size 148x23 - text run at (569,25) width 148: "of varying heights" - RenderText {#text} at (717,27) size 5x21 - text run at (717,27) width 5: " " - RenderImage {IMG} at (722,27) size 3x10 - RenderText {#text} at (725,27) size 5x21 - text run at (725,27) width 5: " " - RenderInline {SMALL} at (0,0) size 752x117 - RenderText {#text} at (730,28) size 752x117 - text run at (730,28) width 22: "and" - text run at (0,126) width 39: "widths" - RenderText {#text} at (39,125) size 5x21 - text run at (39,125) width 5: " " - RenderImage {IMG} at (44,125) size 6x20 - RenderText {#text} at (50,125) size 96x21 - text run at (50,125) width 96: " all of which " - RenderImage {IMG} at (146,125) size 20x65 - RenderText {#text} at (165,125) size 6x21 - text run at (165,125) width 6: " " - RenderInline {SPAN} at (0,0) size 255x42 - RenderText {#text} at (170,108) size 255x42 - text run at (170,108) width 255: "should be aligned" - RenderText {#text} at (424,125) size 6x21 - text run at (424,125) width 6: " " - RenderImage {IMG} at (429,125) size 11x35 - RenderText {#text} at (440,125) size 119x21 - text run at (440,125) width 119: " with the top of " - RenderImage {IMG} at (559,125) size 9x30 - RenderText {#text} at (568,125) size 5x21 - text run at (568,125) width 5: " " - RenderInline {SPAN} at (0,0) size 685x146 - RenderText {#text} at (573,115) size 19x33 - text run at (573,115) width 19: "a " - RenderInline {SPAN} at (0,0) size 685x193 - RenderText {#text} at (592,78) size 685x193 - text run at (592,78) width 93: "14-" - text run at (0,191) width 142: "point" - RenderText {#text} at (142,228) size 142x33 - text run at (142,228) width 142: " text element" - RenderText {#text} at (284,238) size 5x21 - text run at (284,238) width 5: " " - RenderImage {IMG} at (289,238) size 15x50 - RenderText {#text} at (304,238) size 5x21 - text run at (304,238) width 5: " " - RenderInline {SMALL} at (0,0) size 176x19 - RenderText {#text} at (309,239) size 176x19 - text run at (309,239) width 176: "regardless of the line in which" - RenderText {#text} at (485,238) size 5x21 - text run at (485,238) width 5: " " - RenderImage {IMG} at (490,238) size 5x15 - RenderText {#text} at (494,238) size 6x21 - text run at (494,238) width 6: " " - RenderInline {BIG} at (0,0) size 153x23 - RenderText {#text} at (499,236) size 153x23 - text run at (499,236) width 153: "the images appear." - RenderText {#text} at (651,238) size 6x21 - text run at (651,238) width 6: " " - RenderImage {IMG} at (656,238) size 28x90 + RenderText {#text} at (0,27) size 120x21 + text run at (0,27) width 120: "This paragraph " + RenderImage {IMG} at (120,27) size 9x30 + RenderText {#text} at (129,27) size 5x21 + text run at (129,27) width 5: " " + RenderInline {SPAN} at (0,0) size 422x53 + RenderText {#text} at (134,1) size 422x53 + text run at (134,1) width 422: "contains many images" + RenderText {#text} at (556,27) size 5x21 + text run at (556,27) width 5: " " + RenderImage {IMG} at (561,27) size 15x50 + RenderText {#text} at (576,27) size 5x21 + text run at (576,27) width 5: " " + RenderInline {BIG} at (0,0) size 156x23 + RenderText {#text} at (581,25) size 156x23 + text run at (581,25) width 156: "of varying heights" + RenderText {#text} at (737,27) size 5x21 + text run at (737,27) width 5: " " + RenderImage {IMG} at (742,27) size 3x10 + RenderText {#text} at (0,0) size 0x0 + RenderInline {SMALL} at (0,0) size 69x19 + RenderText {#text} at (0,126) size 69x19 + text run at (0,126) width 69: "and widths" + RenderText {#text} at (69,125) size 5x21 + text run at (69,125) width 5: " " + RenderImage {IMG} at (74,125) size 6x20 + RenderText {#text} at (80,125) size 101x21 + text run at (80,125) width 101: " all of which " + RenderImage {IMG} at (181,125) size 20x65 + RenderText {#text} at (200,125) size 6x21 + text run at (200,125) width 6: " " + RenderInline {SPAN} at (0,0) size 263x42 + RenderText {#text} at (205,108) size 263x42 + text run at (205,108) width 263: "should be aligned" + RenderText {#text} at (467,125) size 6x21 + text run at (467,125) width 6: " " + RenderImage {IMG} at (472,125) size 11x35 + RenderText {#text} at (483,125) size 123x21 + text run at (483,125) width 123: " with the top of " + RenderImage {IMG} at (606,125) size 9x30 + RenderText {#text} at (615,125) size 5x21 + text run at (615,125) width 5: " " + RenderInline {SPAN} at (0,0) size 732x146 + RenderText {#text} at (620,115) size 19x33 + text run at (620,115) width 19: "a " + RenderInline {SPAN} at (0,0) size 732x193 + RenderText {#text} at (639,78) size 732x193 + text run at (639,78) width 93: "14-" + text run at (0,191) width 143: "point" + RenderText {#text} at (143,228) size 144x33 + text run at (143,228) width 144: " text element" + RenderText {#text} at (287,238) size 5x21 + text run at (287,238) width 5: " " + RenderImage {IMG} at (292,238) size 15x50 + RenderText {#text} at (307,238) size 5x21 + text run at (307,238) width 5: " " + RenderInline {SMALL} at (0,0) size 189x19 + RenderText {#text} at (312,239) size 189x19 + text run at (312,239) width 189: "regardless of the line in which" + RenderText {#text} at (501,238) size 5x21 + text run at (501,238) width 5: " " + RenderImage {IMG} at (506,238) size 5x15 + RenderText {#text} at (510,238) size 6x21 + text run at (510,238) width 6: " " + RenderInline {BIG} at (0,0) size 156x23 + RenderText {#text} at (515,236) size 156x23 + text run at (515,236) width 156: "the images appear." + RenderText {#text} at (670,238) size 6x21 + text run at (670,238) width 6: " " + RenderImage {IMG} at (675,238) size 28x90 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,1829) size 769x41 - RenderText {#text} at (0,0) size 751x39 - text run at (0,0) width 751: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be aligned" - text run at (0,20) width 292: "with the text baseline (which is the default value)." + RenderText {#text} at (0,0) size 749x39 + text run at (0,0) width 749: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be" + text run at (0,20) width 362: "aligned with the text baseline (which is the default value)." RenderBlock {P} at (0,1885) size 769x233 - RenderText {#text} at (0,22) size 94x19 - text run at (0,22) width 94: "This paragraph " - RenderImage {IMG} at (94,18) size 9x30 - RenderText {#text} at (103,22) size 4x19 - text run at (103,22) width 4: " " - RenderInline {SPAN} at (0,0) size 352x46 - RenderText {#text} at (107,1) size 352x46 - text run at (107,1) width 352: "contains many images" - RenderText {#text} at (459,22) size 4x19 - text run at (459,22) width 4: " " - RenderImage {IMG} at (463,8) size 15x50 - RenderText {#text} at (478,22) size 112x19 - text run at (478,22) width 112: " of varying heights " - RenderImage {IMG} at (590,29) size 3x10 - RenderText {#text} at (593,22) size 4x19 - text run at (593,22) width 4: " " - RenderInline {SMALL} at (0,0) size 65x19 - RenderText {#text} at (597,22) size 65x19 - text run at (597,22) width 65: "and widths" - RenderText {#text} at (662,22) size 4x19 - text run at (662,22) width 4: " " - RenderImage {IMG} at (666,24) size 6x20 - RenderText {#text} at (672,22) size 76x19 - text run at (672,22) width 76: " all of which " - RenderImage {IMG} at (748,1) size 20x65 - RenderText {#text} at (0,106) size 108x19 - text run at (0,106) width 108: "should be aligned " - RenderImage {IMG} at (108,100) size 11x35 - RenderText {#text} at (118,106) size 5x19 - text run at (118,106) width 5: " " - RenderInline {SPAN} at (0,0) size 232x36 - RenderText {#text} at (122,93) size 232x36 - text run at (122,93) width 232: "with the middle of" - RenderText {#text} at (353,106) size 5x19 - text run at (353,106) width 5: " " - RenderImage {IMG} at (357,92) size 16x50 - RenderText {#text} at (372,106) size 5x19 - text run at (372,106) width 5: " " - RenderInline {SPAN} at (0,0) size 346x27 - RenderText {#text} at (376,100) size 18x27 - text run at (376,100) width 18: "a " - RenderInline {SPAN} at (0,0) size 204x68 - RenderText {#text} at (393,67) size 204x68 - text run at (393,67) width 204: "14-point" - RenderText {#text} at (596,100) size 126x27 - text run at (596,100) width 126: " text element" - RenderText {#text} at (721,106) size 5x19 - text run at (721,106) width 5: " " - RenderImage {IMG} at (725,92) size 16x50 - RenderText {#text} at (0,0) size 0x0 - RenderInline {SMALL} at (0,0) size 176x20 - RenderText {#text} at (0,176) size 176x20 - text run at (0,176) width 176: "regardless of the line in which" - RenderText {#text} at (176,176) size 4x20 - text run at (176,176) width 4: " " - RenderImage {IMG} at (180,180) size 5x16 - RenderText {#text} at (184,176) size 5x20 - text run at (184,176) width 5: " " - RenderInline {BIG} at (0,0) size 153x24 - RenderText {#text} at (188,173) size 153x24 - text run at (188,173) width 153: "the images appear." - RenderText {#text} at (340,176) size 5x20 - text run at (340,176) width 5: " " - RenderImage {IMG} at (344,142) size 28x91 + RenderText {#text} at (0,22) size 99x19 + text run at (0,22) width 99: "This paragraph " + RenderImage {IMG} at (99,18) size 9x30 + RenderText {#text} at (108,22) size 4x19 + text run at (108,22) width 4: " " + RenderInline {SPAN} at (0,0) size 357x46 + RenderText {#text} at (112,1) size 357x46 + text run at (112,1) width 357: "contains many images" + RenderText {#text} at (469,22) size 4x19 + text run at (469,22) width 4: " " + RenderImage {IMG} at (473,8) size 15x50 + RenderText {#text} at (488,22) size 122x19 + text run at (488,22) width 122: " of varying heights " + RenderImage {IMG} at (610,29) size 3x10 + RenderText {#text} at (613,22) size 4x19 + text run at (613,22) width 4: " " + RenderInline {SMALL} at (0,0) size 69x19 + RenderText {#text} at (617,22) size 69x19 + text run at (617,22) width 69: "and widths" + RenderText {#text} at (686,22) size 4x19 + text run at (686,22) width 4: " " + RenderImage {IMG} at (690,24) size 6x20 + RenderText {#text} at (696,22) size 732x96 + text run at (696,22) width 36: " all of" + text run at (0,98) width 43: "which " + RenderImage {IMG} at (43,77) size 20x66 + RenderText {#text} at (62,98) size 120x20 + text run at (62,98) width 120: " should be aligned " + RenderImage {IMG} at (181,92) size 11x36 + RenderText {#text} at (192,98) size 4x20 + text run at (192,98) width 4: " " + RenderInline {SPAN} at (0,0) size 236x37 + RenderText {#text} at (196,85) size 236x37 + text run at (196,85) width 236: "with the middle of" + RenderText {#text} at (432,98) size 4x20 + text run at (432,98) width 4: " " + RenderImage {IMG} at (436,84) size 15x51 + RenderText {#text} at (451,98) size 4x20 + text run at (451,98) width 4: " " + RenderInline {SPAN} at (0,0) size 719x106 + RenderText {#text} at (455,92) size 17x28 + text run at (455,92) width 17: "a " + RenderInline {SPAN} at (0,0) size 204x69 + RenderText {#text} at (472,59) size 204x69 + text run at (472,59) width 204: "14-point" + RenderText {#text} at (676,92) size 719x106 + text run at (676,92) width 43: " text" + text run at (0,170) width 78: "element" + RenderText {#text} at (78,176) size 4x20 + text run at (78,176) width 4: " " + RenderImage {IMG} at (82,162) size 15x51 + RenderText {#text} at (97,176) size 4x20 + text run at (97,176) width 4: " " + RenderInline {SMALL} at (0,0) size 189x20 + RenderText {#text} at (101,176) size 189x20 + text run at (101,176) width 189: "regardless of the line in which" + RenderText {#text} at (290,176) size 4x20 + text run at (290,176) width 4: " " + RenderImage {IMG} at (294,180) size 5x16 + RenderText {#text} at (298,176) size 5x20 + text run at (298,176) width 5: " " + RenderInline {BIG} at (0,0) size 156x24 + RenderText {#text} at (302,173) size 156x24 + text run at (302,173) width 156: "the images appear." + RenderText {#text} at (457,176) size 5x20 + text run at (457,176) width 5: " " + RenderImage {IMG} at (461,142) size 28x91 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,2134) size 769x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that element is" - text run at (0,20) width 101: "an image or not. " - text run at (101,20) width 533: "Each fragment of text has been SPANned appropriately in order to cause this to happen." + RenderText {#text} at (0,0) size 733x39 + text run at (0,0) width 733: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that" + text run at (0,20) width 173: "element is an image or not. " + text run at (173,20) width 553: "Each fragment of text has been SPANned appropriately in order to cause this to happen." RenderBlock {P} at (0,2190) size 769x203 - RenderInline {SPAN} at (0,0) size 90x19 - RenderText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "This paragraph" - RenderText {#text} at (90,0) size 4x19 - text run at (90,0) width 4: " " - RenderImage {IMG} at (94,0) size 3x10 - RenderText {#text} at (97,0) size 4x19 - text run at (97,0) width 4: " " - RenderInline {SPAN} at (0,0) size 352x46 - RenderText {#text} at (101,1) size 352x46 - text run at (101,1) width 352: "contains many images" - RenderText {#text} at (453,0) size 4x19 - text run at (453,0) width 4: " " - RenderImage {IMG} at (457,0) size 3x10 - RenderText {#text} at (460,0) size 4x19 - text run at (460,0) width 4: " " - RenderInline {SPAN} at (0,0) size 84x19 - RenderText {#text} at (464,0) size 84x19 - text run at (464,0) width 84: "and some text" - RenderText {#text} at (548,0) size 4x19 - text run at (548,0) width 4: " " - RenderImage {IMG} at (552,0) size 3x10 - RenderText {#text} at (555,0) size 4x19 - text run at (555,0) width 4: " " - RenderInline {SPAN} at (0,0) size 104x19 - RenderText {#text} at (559,0) size 104x19 - text run at (559,0) width 104: "of varying heights" - RenderText {#text} at (663,0) size 4x19 - text run at (663,0) width 4: " " - RenderImage {IMG} at (667,0) size 3x10 - RenderText {#text} at (670,0) size 4x19 - text run at (670,0) width 4: " " - RenderInline {BIG} at (0,0) size 89x23 - RenderText {#text} at (674,0) size 89x23 - text run at (674,0) width 89: "and widths" - RenderText {#text} at (0,0) size 0x0 - RenderImage {IMG} at (0,48) size 6x20 - RenderText {#text} at (6,48) size 4x19 - text run at (6,48) width 4: " " - RenderInline {SPAN} at (0,0) size 68x19 - RenderText {#text} at (10,48) size 68x19 - text run at (10,48) width 68: "all of which" - RenderText {#text} at (78,48) size 4x19 - text run at (78,48) width 4: " " - RenderImage {IMG} at (82,48) size 20x65 - RenderText {#text} at (101,48) size 5x19 - text run at (101,48) width 5: " " - RenderInline {SPAN} at (0,0) size 105x19 - RenderText {#text} at (105,48) size 105x19 - text run at (105,48) width 105: "should be aligned" - RenderText {#text} at (209,48) size 5x19 - text run at (209,48) width 5: " " - RenderImage {IMG} at (213,48) size 11x35 - RenderText {#text} at (224,48) size 4x19 - text run at (224,48) width 4: " " - RenderInline {SPAN} at (0,0) size 185x36 - RenderText {#text} at (228,48) size 185x36 - text run at (228,48) width 185: "with the top of" - RenderText {#text} at (413,48) size 4x19 - text run at (413,48) width 4: " " - RenderImage {IMG} at (417,48) size 15x50 - RenderText {#text} at (432,48) size 4x19 - text run at (432,48) width 4: " " - RenderInline {SPAN} at (0,0) size 120x19 - RenderText {#text} at (436,48) size 120x19 - text run at (436,48) width 120: "the tallest element in" - RenderText {#text} at (556,48) size 4x19 - text run at (556,48) width 4: " " - RenderImage {IMG} at (560,48) size 5x15 - RenderText {#text} at (564,48) size 5x19 - text run at (564,48) width 5: " " - RenderInline {BIG} at (0,0) size 720x88 - RenderText {#text} at (568,48) size 720x88 - text run at (568,48) width 152: "whichever line the" - text run at (0,113) width 137: "elements appear." - RenderText {#text} at (137,113) size 4x19 - text run at (137,113) width 4: " " - RenderImage {IMG} at (141,113) size 27x90 + RenderInline {SPAN} at (0,0) size 95x19 + RenderText {#text} at (0,0) size 95x19 + text run at (0,0) width 95: "This paragraph" + RenderText {#text} at (95,0) size 4x19 + text run at (95,0) width 4: " " + RenderImage {IMG} at (99,0) size 3x10 + RenderText {#text} at (102,0) size 4x19 + text run at (102,0) width 4: " " + RenderInline {SPAN} at (0,0) size 357x46 + RenderText {#text} at (106,1) size 357x46 + text run at (106,1) width 357: "contains many images" + RenderText {#text} at (463,0) size 4x19 + text run at (463,0) width 4: " " + RenderImage {IMG} at (467,0) size 3x10 + RenderText {#text} at (470,0) size 4x19 + text run at (470,0) width 4: " " + RenderInline {SPAN} at (0,0) size 87x19 + RenderText {#text} at (474,0) size 87x19 + text run at (474,0) width 87: "and some text" + RenderText {#text} at (561,0) size 4x19 + text run at (561,0) width 4: " " + RenderImage {IMG} at (565,0) size 3x10 + RenderText {#text} at (568,0) size 4x19 + text run at (568,0) width 4: " " + RenderInline {SPAN} at (0,0) size 114x19 + RenderText {#text} at (572,0) size 114x19 + text run at (572,0) width 114: "of varying heights" + RenderText {#text} at (686,0) size 4x19 + text run at (686,0) width 4: " " + RenderImage {IMG} at (690,0) size 3x10 + RenderText {#text} at (693,0) size 4x19 + text run at (693,0) width 4: " " + RenderInline {BIG} at (0,0) size 728x71 + RenderText {#text} at (697,0) size 728x71 + text run at (697,0) width 31: "and" + text run at (0,48) width 57: "widths" + RenderText {#text} at (57,48) size 4x19 + text run at (57,48) width 4: " " + RenderImage {IMG} at (61,48) size 6x20 + RenderText {#text} at (67,48) size 4x19 + text run at (67,48) width 4: " " + RenderInline {SPAN} at (0,0) size 75x19 + RenderText {#text} at (71,48) size 75x19 + text run at (71,48) width 75: "all of which" + RenderText {#text} at (146,48) size 4x19 + text run at (146,48) width 4: " " + RenderImage {IMG} at (150,48) size 20x65 + RenderText {#text} at (169,48) size 5x19 + text run at (169,48) width 5: " " + RenderInline {SPAN} at (0,0) size 112x19 + RenderText {#text} at (173,48) size 112x19 + text run at (173,48) width 112: "should be aligned" + RenderText {#text} at (284,48) size 5x19 + text run at (284,48) width 5: " " + RenderImage {IMG} at (288,48) size 11x35 + RenderText {#text} at (299,48) size 4x19 + text run at (299,48) width 4: " " + RenderInline {SPAN} at (0,0) size 188x36 + RenderText {#text} at (303,48) size 188x36 + text run at (303,48) width 188: "with the top of" + RenderText {#text} at (491,48) size 4x19 + text run at (491,48) width 4: " " + RenderImage {IMG} at (495,48) size 15x50 + RenderText {#text} at (510,48) size 4x19 + text run at (510,48) width 4: " " + RenderInline {SPAN} at (0,0) size 128x19 + RenderText {#text} at (514,48) size 128x19 + text run at (514,48) width 128: "the tallest element in" + RenderText {#text} at (642,48) size 4x19 + text run at (642,48) width 4: " " + RenderImage {IMG} at (646,48) size 5x15 + RenderText {#text} at (650,48) size 5x19 + text run at (650,48) width 5: " " + RenderInline {BIG} at (0,0) size 743x88 + RenderText {#text} at (654,48) size 743x88 + text run at (654,48) width 89: "whichever" + text run at (0,113) width 207: "line the elements appear." + RenderText {#text} at (207,113) size 4x19 + text run at (207,113) width 4: " " + RenderImage {IMG} at (211,113) size 27x90 RenderText {#text} at (0,0) size 0x0 RenderTable {TABLE} at (0,2409) size 769x2076 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x2074 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x2046 RenderTableCell {TD} at (0,1037) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 @@ -385,332 +388,335 @@ layer at (0,0) size 785x4501 RenderTableCell {TD} at (12,28) size 755x2046 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x80 RenderImage {IMG} at (0,0) size 15x50 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (15,39) size 119x19 - text run at (15,39) width 119: "The first four words" - RenderText {#text} at (134,35) size 714x44 - text run at (134,35) width 270: " in this sentence should be subscript-aligned. " - text run at (404,35) width 310: "The font size of the superscripted text should not be" - text run at (0,59) width 241: "different from that of the parent element." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (15,39) size 126x19 + text run at (15,39) width 126: "The first four words" + RenderText {#text} at (141,35) size 731x44 + text run at (141,35) width 284: " in this sentence should be subscript-aligned. " + text run at (425,35) width 306: "The font size of the superscripted text should not" + text run at (0,59) width 273: "be different from that of the parent element." RenderBlock {P} at (4,99) size 747x76 RenderImage {IMG} at (0,0) size 15x50 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (15,29) size 119x19 - text run at (15,29) width 119: "The first four words" - RenderText {#text} at (134,35) size 714x39 - text run at (134,35) width 282: " in this sentence should be superscript-aligned. " - text run at (416,35) width 298: "The font size of the subscripted text should not be" - text run at (0,55) width 241: "different from that of the parent element." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (15,29) size 126x19 + text run at (15,29) width 126: "The first four words" + RenderText {#text} at (141,35) size 731x39 + text run at (141,35) width 296: " in this sentence should be superscript-aligned. " + text run at (437,35) width 294: "The font size of the subscripted text should not" + text run at (0,55) width 273: "be different from that of the parent element." RenderBlock {P} at (4,190) size 747x76 RenderImage {IMG} at (0,0) size 15x50 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (15,0) size 119x19 - text run at (15,0) width 119: "The first four words" - RenderText {#text} at (134,35) size 735x39 - text run at (134,35) width 601: " in this sentence should be top-aligned, which will align their tops with the top of the tallest element in" - text run at (0,55) width 239: "the line (probably the orange rectangle)." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (15,0) size 126x19 + text run at (15,0) width 126: "The first four words" + RenderText {#text} at (141,35) size 712x39 + text run at (141,35) width 571: " in this sentence should be top-aligned, which will align their tops with the top of the tallest" + text run at (0,55) width 320: "element in the line (probably the orange rectangle)." RenderBlock {P} at (4,281) size 747x134 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,35) size 4x19 text run at (15,35) width 4: " " - RenderInline {SPAN} at (0,0) size 739x110 + RenderInline {SPAN} at (0,0) size 701x110 RenderText {#text} at (0,0) size 0x0 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (19,22) size 119x19 - text run at (19,22) width 119: "The first four words" - RenderText {#text} at (138,22) size 739x110 - text run at (138,22) width 542: " in this sentence should be text-top-aligned," - text run at (0,59) width 739: "which should align their tops with the top of the tallest text" - text run at (0,96) width 133: "in the line." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (19,22) size 126x19 + text run at (19,22) width 126: "The first four words" + RenderText {#text} at (145,22) size 701x110 + text run at (145,22) width 556: " in this sentence should be text-top-aligned," + text run at (0,59) width 698: "which should align their tops with the top of the tallest" + text run at (0,96) width 192: "text in the line." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,430) size 747x71 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,14) size 739x55 - text run at (15,14) width 724: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point defined" - text run at (0,50) width 244: "as the text baseline plus half the x-height." + text run at (15,14) width 724: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point" + text run at (0,50) width 310: "defined as the text baseline plus half the x-height." RenderBlock {P} at (4,516) size 747x125 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,13) size 4x19 text run at (15,13) width 4: " " - RenderInline {SPAN} at (0,0) size 716x123 + RenderInline {SPAN} at (0,0) size 733x123 RenderText {#text} at (0,0) size 0x0 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (19,30) size 119x19 - text run at (19,30) width 119: "The first four words" - RenderText {#text} at (138,0) size 716x123 - text run at (138,0) width 532: " in this sentence should be 12pt in size and" - text run at (0,50) width 716: "bottom-aligned, which should align their bottom with the" - text run at (0,87) width 506: "bottom of the lowest element in the line." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (19,30) size 126x19 + text run at (19,30) width 126: "The first four words" + RenderText {#text} at (145,0) size 733x123 + text run at (145,0) width 544: " in this sentence should be 12pt in size and" + text run at (0,50) width 733: "bottom-aligned, which should align their bottom with the" + text run at (0,87) width 517: "bottom of the lowest element in the line." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,656) size 747x162 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,13) size 4x19 text run at (15,13) width 4: " " - RenderInline {SPAN} at (0,0) size 718x160 + RenderInline {SPAN} at (0,0) size 745x160 RenderText {#text} at (0,0) size 0x0 - RenderInline {SPAN} at (0,0) size 276x19 - RenderText {#text} at (19,16) size 276x19 - text run at (19,16) width 276: "The first eight words (\"eight\" has a descender)" - RenderText {#text} at (295,0) size 718x160 - text run at (295,0) width 423: " in this sentence should be 12pt in" - text run at (0,50) width 675: "size and text-bottom-aligned, which should align their" - text run at (0,87) width 657: "bottom with the bottom of the lowest text (including" - text run at (0,124) width 288: "descenders) in the line." + RenderInline {SPAN} at (0,0) size 293x19 + RenderText {#text} at (19,16) size 293x19 + text run at (19,16) width 293: "The first eight words (\"eight\" has a descender)" + RenderText {#text} at (312,0) size 745x160 + text run at (312,0) width 433: " in this sentence should be 12pt in" + text run at (0,50) width 692: "size and text-bottom-aligned, which should align their" + text run at (0,87) width 671: "bottom with the bottom of the lowest text (including" + text run at (0,124) width 294: "descenders) in the line." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,833) size 747x134 RenderImage {IMG} at (0,0) size 15x50 RenderText {#text} at (15,35) size 4x19 text run at (15,35) width 4: " " - RenderInline {SPAN} at (0,0) size 742x110 + RenderInline {SPAN} at (0,0) size 712x110 RenderText {#text} at (0,0) size 0x0 - RenderInline {SPAN} at (0,0) size 119x19 - RenderText {#text} at (19,35) size 119x19 - text run at (19,35) width 119: "The first four words" - RenderText {#text} at (138,22) size 742x110 - text run at (138,22) width 532: " in this sentence should be 12pt in size and" - text run at (0,59) width 742: "baseline-aligned, which should align their baseline with the" - text run at (0,96) width 511: "baseline of the rest of the text in the line." + RenderInline {SPAN} at (0,0) size 126x19 + RenderText {#text} at (19,35) size 126x19 + text run at (19,35) width 126: "The first four words" + RenderText {#text} at (145,22) size 712x110 + text run at (145,22) width 544: " in this sentence should be 12pt in size and" + text run at (0,59) width 712: "baseline-aligned, which should align their baseline with" + text run at (0,96) width 569: "the baseline of the rest of the text in the line." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,982) size 747x76 RenderImage {IMG} at (0,0) size 15x50 - RenderInline {SPAN} at (0,0) size 98x15 - RenderText {#text} at (15,30) size 98x15 - text run at (15,30) width 98: "The first four words" - RenderText {#text} at (113,35) size 721x39 - text run at (113,35) width 608: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned," - text run at (0,55) width 355: "which should raise them 8px relative to the natural baseline." + RenderInline {SPAN} at (0,0) size 96x15 + RenderText {#text} at (15,30) size 96x15 + text run at (15,30) width 96: "The first four words" + RenderText {#text} at (111,35) size 700x39 + text run at (111,35) width 589: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-" + text run at (0,55) width 430: "aligned, which should raise them 8px relative to the natural baseline." RenderBlock {P} at (4,1073) size 747x41 - RenderText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first section" - text run at (0,20) width 577: "of text, whereas any size text should be aligned with the text baseline (which is the default value)." + RenderText {#text} at (0,0) size 742x39 + text run at (0,0) width 742: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first" + text run at (0,20) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." RenderBlock {P} at (4,1131) size 747x329 - RenderText {#text} at (0,27) size 117x21 - text run at (0,27) width 117: "This paragraph " - RenderImage {IMG} at (117,27) size 9x30 - RenderText {#text} at (126,27) size 5x21 - text run at (126,27) width 5: " " - RenderInline {SPAN} at (0,0) size 413x53 - RenderText {#text} at (131,1) size 413x53 - text run at (131,1) width 413: "contains many images" - RenderText {#text} at (544,27) size 5x21 - text run at (544,27) width 5: " " - RenderImage {IMG} at (549,27) size 15x50 - RenderText {#text} at (564,27) size 5x21 - text run at (564,27) width 5: " " - RenderInline {BIG} at (0,0) size 148x23 - RenderText {#text} at (569,25) size 148x23 - text run at (569,25) width 148: "of varying heights" - RenderText {#text} at (717,27) size 5x21 - text run at (717,27) width 5: " " - RenderImage {IMG} at (722,27) size 3x10 + RenderText {#text} at (0,27) size 120x21 + text run at (0,27) width 120: "This paragraph " + RenderImage {IMG} at (120,27) size 9x30 + RenderText {#text} at (129,27) size 5x21 + text run at (129,27) width 5: " " + RenderInline {SPAN} at (0,0) size 422x53 + RenderText {#text} at (134,1) size 422x53 + text run at (134,1) width 422: "contains many images" + RenderText {#text} at (556,27) size 5x21 + text run at (556,27) width 5: " " + RenderImage {IMG} at (561,27) size 15x50 + RenderText {#text} at (576,27) size 5x21 + text run at (576,27) width 5: " " + RenderInline {BIG} at (0,0) size 156x23 + RenderText {#text} at (581,25) size 156x23 + text run at (581,25) width 156: "of varying heights" + RenderText {#text} at (737,27) size 5x21 + text run at (737,27) width 5: " " + RenderImage {IMG} at (742,27) size 3x10 RenderText {#text} at (0,0) size 0x0 - RenderInline {SMALL} at (0,0) size 65x19 - RenderText {#text} at (0,126) size 65x19 - text run at (0,126) width 65: "and widths" - RenderText {#text} at (65,125) size 5x21 - text run at (65,125) width 5: " " - RenderImage {IMG} at (70,125) size 6x20 - RenderText {#text} at (76,125) size 96x21 - text run at (76,125) width 96: " all of which " - RenderImage {IMG} at (172,125) size 20x65 - RenderText {#text} at (191,125) size 6x21 - text run at (191,125) width 6: " " - RenderInline {SPAN} at (0,0) size 255x42 - RenderText {#text} at (196,108) size 255x42 - text run at (196,108) width 255: "should be aligned" - RenderText {#text} at (450,125) size 6x21 - text run at (450,125) width 6: " " - RenderImage {IMG} at (455,125) size 11x35 - RenderText {#text} at (466,125) size 119x21 - text run at (466,125) width 119: " with the top of " - RenderImage {IMG} at (585,125) size 9x30 - RenderText {#text} at (594,125) size 5x21 - text run at (594,125) width 5: " " - RenderInline {SPAN} at (0,0) size 711x146 - RenderText {#text} at (599,115) size 19x33 - text run at (599,115) width 19: "a " - RenderInline {SPAN} at (0,0) size 711x193 - RenderText {#text} at (618,78) size 711x193 - text run at (618,78) width 93: "14-" - text run at (0,191) width 142: "point" - RenderText {#text} at (142,228) size 142x33 - text run at (142,228) width 142: " text element" - RenderText {#text} at (284,238) size 5x21 - text run at (284,238) width 5: " " - RenderImage {IMG} at (289,238) size 15x50 - RenderText {#text} at (304,238) size 5x21 - text run at (304,238) width 5: " " - RenderInline {SMALL} at (0,0) size 176x19 - RenderText {#text} at (309,239) size 176x19 - text run at (309,239) width 176: "regardless of the line in which" - RenderText {#text} at (485,238) size 5x21 - text run at (485,238) width 5: " " - RenderImage {IMG} at (490,238) size 5x15 - RenderText {#text} at (494,238) size 6x21 - text run at (494,238) width 6: " " - RenderInline {BIG} at (0,0) size 153x23 - RenderText {#text} at (499,236) size 153x23 - text run at (499,236) width 153: "the images appear." - RenderText {#text} at (651,238) size 6x21 - text run at (651,238) width 6: " " - RenderImage {IMG} at (656,238) size 28x90 + RenderInline {SMALL} at (0,0) size 69x19 + RenderText {#text} at (0,126) size 69x19 + text run at (0,126) width 69: "and widths" + RenderText {#text} at (69,125) size 5x21 + text run at (69,125) width 5: " " + RenderImage {IMG} at (74,125) size 6x20 + RenderText {#text} at (80,125) size 101x21 + text run at (80,125) width 101: " all of which " + RenderImage {IMG} at (181,125) size 20x65 + RenderText {#text} at (200,125) size 6x21 + text run at (200,125) width 6: " " + RenderInline {SPAN} at (0,0) size 263x42 + RenderText {#text} at (205,108) size 263x42 + text run at (205,108) width 263: "should be aligned" + RenderText {#text} at (467,125) size 6x21 + text run at (467,125) width 6: " " + RenderImage {IMG} at (472,125) size 11x35 + RenderText {#text} at (483,125) size 123x21 + text run at (483,125) width 123: " with the top of " + RenderImage {IMG} at (606,125) size 9x30 + RenderText {#text} at (615,125) size 5x21 + text run at (615,125) width 5: " " + RenderInline {SPAN} at (0,0) size 732x146 + RenderText {#text} at (620,115) size 19x33 + text run at (620,115) width 19: "a " + RenderInline {SPAN} at (0,0) size 732x193 + RenderText {#text} at (639,78) size 732x193 + text run at (639,78) width 93: "14-" + text run at (0,191) width 143: "point" + RenderText {#text} at (143,228) size 144x33 + text run at (143,228) width 144: " text element" + RenderText {#text} at (287,238) size 5x21 + text run at (287,238) width 5: " " + RenderImage {IMG} at (292,238) size 15x50 + RenderText {#text} at (307,238) size 5x21 + text run at (307,238) width 5: " " + RenderInline {SMALL} at (0,0) size 189x19 + RenderText {#text} at (312,239) size 189x19 + text run at (312,239) width 189: "regardless of the line in which" + RenderText {#text} at (501,238) size 5x21 + text run at (501,238) width 5: " " + RenderImage {IMG} at (506,238) size 5x15 + RenderText {#text} at (510,238) size 6x21 + text run at (510,238) width 6: " " + RenderInline {BIG} at (0,0) size 156x23 + RenderText {#text} at (515,236) size 156x23 + text run at (515,236) width 156: "the images appear." + RenderText {#text} at (670,238) size 6x21 + text run at (670,238) width 6: " " + RenderImage {IMG} at (675,238) size 28x90 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,1478) size 747x41 - RenderText {#text} at (0,0) size 705x39 - text run at (0,0) width 705: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be" - text run at (0,20) width 338: "aligned with the text baseline (which is the default value)." + RenderText {#text} at (0,0) size 730x39 + text run at (0,0) width 730: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should" + text run at (0,20) width 381: "be aligned with the text baseline (which is the default value)." RenderBlock {P} at (4,1534) size 747x233 - RenderText {#text} at (0,22) size 94x19 - text run at (0,22) width 94: "This paragraph " - RenderImage {IMG} at (94,18) size 9x30 - RenderText {#text} at (103,22) size 4x19 - text run at (103,22) width 4: " " - RenderInline {SPAN} at (0,0) size 352x46 - RenderText {#text} at (107,1) size 352x46 - text run at (107,1) width 352: "contains many images" - RenderText {#text} at (459,22) size 4x19 - text run at (459,22) width 4: " " - RenderImage {IMG} at (463,8) size 15x50 - RenderText {#text} at (478,22) size 112x19 - text run at (478,22) width 112: " of varying heights " - RenderImage {IMG} at (590,29) size 3x10 - RenderText {#text} at (593,22) size 4x19 - text run at (593,22) width 4: " " - RenderInline {SMALL} at (0,0) size 65x19 - RenderText {#text} at (597,22) size 65x19 - text run at (597,22) width 65: "and widths" - RenderText {#text} at (662,22) size 4x19 - text run at (662,22) width 4: " " - RenderImage {IMG} at (666,24) size 6x20 - RenderText {#text} at (672,22) size 72x19 - text run at (672,22) width 72: " all of which" - RenderImage {IMG} at (0,77) size 20x66 - RenderText {#text} at (19,98) size 113x20 - text run at (19,98) width 113: " should be aligned " - RenderImage {IMG} at (131,92) size 11x36 - RenderText {#text} at (142,98) size 4x20 - text run at (142,98) width 4: " " - RenderInline {SPAN} at (0,0) size 231x37 - RenderText {#text} at (146,85) size 231x37 - text run at (146,85) width 231: "with the middle of" - RenderText {#text} at (377,98) size 4x20 - text run at (377,98) width 4: " " - RenderImage {IMG} at (381,84) size 15x51 - RenderText {#text} at (396,98) size 4x20 - text run at (396,98) width 4: " " - RenderInline {SPAN} at (0,0) size 345x28 - RenderText {#text} at (400,92) size 17x28 - text run at (400,92) width 17: "a " - RenderInline {SPAN} at (0,0) size 203x69 - RenderText {#text} at (417,59) size 203x69 - text run at (417,59) width 203: "14-point" - RenderText {#text} at (620,92) size 125x28 - text run at (620,92) width 125: " text element" - RenderText {#text} at (0,0) size 0x0 - RenderImage {IMG} at (0,162) size 15x51 - RenderText {#text} at (15,176) size 4x20 - text run at (15,176) width 4: " " - RenderInline {SMALL} at (0,0) size 176x20 - RenderText {#text} at (19,176) size 176x20 - text run at (19,176) width 176: "regardless of the line in which" - RenderText {#text} at (195,176) size 4x20 - text run at (195,176) width 4: " " - RenderImage {IMG} at (199,180) size 5x16 - RenderText {#text} at (203,176) size 5x20 - text run at (203,176) width 5: " " - RenderInline {BIG} at (0,0) size 153x24 - RenderText {#text} at (207,173) size 153x24 - text run at (207,173) width 153: "the images appear." - RenderText {#text} at (359,176) size 5x20 - text run at (359,176) width 5: " " - RenderImage {IMG} at (363,142) size 28x91 + RenderText {#text} at (0,22) size 99x19 + text run at (0,22) width 99: "This paragraph " + RenderImage {IMG} at (99,18) size 9x30 + RenderText {#text} at (108,22) size 4x19 + text run at (108,22) width 4: " " + RenderInline {SPAN} at (0,0) size 357x46 + RenderText {#text} at (112,1) size 357x46 + text run at (112,1) width 357: "contains many images" + RenderText {#text} at (469,22) size 4x19 + text run at (469,22) width 4: " " + RenderImage {IMG} at (473,8) size 15x50 + RenderText {#text} at (488,22) size 122x19 + text run at (488,22) width 122: " of varying heights " + RenderImage {IMG} at (610,29) size 3x10 + RenderText {#text} at (613,22) size 4x19 + text run at (613,22) width 4: " " + RenderInline {SMALL} at (0,0) size 69x19 + RenderText {#text} at (617,22) size 69x19 + text run at (617,22) width 69: "and widths" + RenderText {#text} at (686,22) size 4x19 + text run at (686,22) width 4: " " + RenderImage {IMG} at (690,24) size 6x20 + RenderText {#text} at (696,22) size 732x96 + text run at (696,22) width 36: " all of" + text run at (0,98) width 43: "which " + RenderImage {IMG} at (43,77) size 20x66 + RenderText {#text} at (62,98) size 120x20 + text run at (62,98) width 120: " should be aligned " + RenderImage {IMG} at (181,92) size 11x36 + RenderText {#text} at (192,98) size 4x20 + text run at (192,98) width 4: " " + RenderInline {SPAN} at (0,0) size 236x37 + RenderText {#text} at (196,85) size 236x37 + text run at (196,85) width 236: "with the middle of" + RenderText {#text} at (432,98) size 4x20 + text run at (432,98) width 4: " " + RenderImage {IMG} at (436,84) size 15x51 + RenderText {#text} at (451,98) size 4x20 + text run at (451,98) width 4: " " + RenderInline {SPAN} at (0,0) size 719x106 + RenderText {#text} at (455,92) size 17x28 + text run at (455,92) width 17: "a " + RenderInline {SPAN} at (0,0) size 204x69 + RenderText {#text} at (472,59) size 204x69 + text run at (472,59) width 204: "14-point" + RenderText {#text} at (676,92) size 719x106 + text run at (676,92) width 43: " text" + text run at (0,170) width 78: "element" + RenderText {#text} at (78,176) size 4x20 + text run at (78,176) width 4: " " + RenderImage {IMG} at (82,162) size 15x51 + RenderText {#text} at (97,176) size 4x20 + text run at (97,176) width 4: " " + RenderInline {SMALL} at (0,0) size 189x20 + RenderText {#text} at (101,176) size 189x20 + text run at (101,176) width 189: "regardless of the line in which" + RenderText {#text} at (290,176) size 4x20 + text run at (290,176) width 4: " " + RenderImage {IMG} at (294,180) size 5x16 + RenderText {#text} at (298,176) size 5x20 + text run at (298,176) width 5: " " + RenderInline {BIG} at (0,0) size 156x24 + RenderText {#text} at (302,173) size 156x24 + text run at (302,173) width 156: "the images appear." + RenderText {#text} at (457,176) size 5x20 + text run at (457,176) width 5: " " + RenderImage {IMG} at (461,142) size 28x91 RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (4,1783) size 747x40 - RenderText {#text} at (0,0) size 740x39 - text run at (0,0) width 740: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that element" - text run at (0,20) width 114: "is an image or not. " - text run at (114,20) width 533: "Each fragment of text has been SPANned appropriately in order to cause this to happen." + RenderText {#text} at (0,0) size 733x39 + text run at (0,0) width 733: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that" + text run at (0,20) width 173: "element is an image or not. " + text run at (173,20) width 553: "Each fragment of text has been SPANned appropriately in order to cause this to happen." RenderBlock {P} at (4,1839) size 747x203 - RenderInline {SPAN} at (0,0) size 90x19 - RenderText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "This paragraph" - RenderText {#text} at (90,0) size 4x19 - text run at (90,0) width 4: " " - RenderImage {IMG} at (94,0) size 3x10 - RenderText {#text} at (97,0) size 4x19 - text run at (97,0) width 4: " " - RenderInline {SPAN} at (0,0) size 352x46 - RenderText {#text} at (101,1) size 352x46 - text run at (101,1) width 352: "contains many images" - RenderText {#text} at (453,0) size 4x19 - text run at (453,0) width 4: " " - RenderImage {IMG} at (457,0) size 3x10 - RenderText {#text} at (460,0) size 4x19 - text run at (460,0) width 4: " " - RenderInline {SPAN} at (0,0) size 84x19 - RenderText {#text} at (464,0) size 84x19 - text run at (464,0) width 84: "and some text" - RenderText {#text} at (548,0) size 4x19 - text run at (548,0) width 4: " " - RenderImage {IMG} at (552,0) size 3x10 - RenderText {#text} at (555,0) size 4x19 - text run at (555,0) width 4: " " - RenderInline {SPAN} at (0,0) size 104x19 - RenderText {#text} at (559,0) size 104x19 - text run at (559,0) width 104: "of varying heights" - RenderText {#text} at (663,0) size 4x19 - text run at (663,0) width 4: " " - RenderImage {IMG} at (667,0) size 3x10 - RenderText {#text} at (670,0) size 4x19 - text run at (670,0) width 4: " " - RenderInline {BIG} at (0,0) size 703x71 - RenderText {#text} at (674,0) size 703x71 - text run at (674,0) width 29: "and" - text run at (0,48) width 55: "widths" - RenderText {#text} at (55,48) size 4x19 - text run at (55,48) width 4: " " - RenderImage {IMG} at (59,48) size 6x20 - RenderText {#text} at (65,48) size 4x19 - text run at (65,48) width 4: " " - RenderInline {SPAN} at (0,0) size 68x19 - RenderText {#text} at (69,48) size 68x19 - text run at (69,48) width 68: "all of which" - RenderText {#text} at (137,48) size 4x19 - text run at (137,48) width 4: " " - RenderImage {IMG} at (141,48) size 20x65 - RenderText {#text} at (160,48) size 5x19 - text run at (160,48) width 5: " " - RenderInline {SPAN} at (0,0) size 105x19 - RenderText {#text} at (164,48) size 105x19 - text run at (164,48) width 105: "should be aligned" - RenderText {#text} at (268,48) size 5x19 - text run at (268,48) width 5: " " - RenderImage {IMG} at (272,48) size 11x35 - RenderText {#text} at (283,48) size 4x19 - text run at (283,48) width 4: " " - RenderInline {SPAN} at (0,0) size 185x36 - RenderText {#text} at (287,48) size 185x36 - text run at (287,48) width 185: "with the top of" - RenderText {#text} at (472,48) size 4x19 - text run at (472,48) width 4: " " - RenderImage {IMG} at (476,48) size 15x50 + RenderInline {SPAN} at (0,0) size 95x19 + RenderText {#text} at (0,0) size 95x19 + text run at (0,0) width 95: "This paragraph" + RenderText {#text} at (95,0) size 4x19 + text run at (95,0) width 4: " " + RenderImage {IMG} at (99,0) size 3x10 + RenderText {#text} at (102,0) size 4x19 + text run at (102,0) width 4: " " + RenderInline {SPAN} at (0,0) size 357x46 + RenderText {#text} at (106,1) size 357x46 + text run at (106,1) width 357: "contains many images" + RenderText {#text} at (463,0) size 4x19 + text run at (463,0) width 4: " " + RenderImage {IMG} at (467,0) size 3x10 + RenderText {#text} at (470,0) size 4x19 + text run at (470,0) width 4: " " + RenderInline {SPAN} at (0,0) size 87x19 + RenderText {#text} at (474,0) size 87x19 + text run at (474,0) width 87: "and some text" + RenderText {#text} at (561,0) size 4x19 + text run at (561,0) width 4: " " + RenderImage {IMG} at (565,0) size 3x10 + RenderText {#text} at (568,0) size 4x19 + text run at (568,0) width 4: " " + RenderInline {SPAN} at (0,0) size 114x19 + RenderText {#text} at (572,0) size 114x19 + text run at (572,0) width 114: "of varying heights" + RenderText {#text} at (686,0) size 4x19 + text run at (686,0) width 4: " " + RenderImage {IMG} at (690,0) size 3x10 + RenderText {#text} at (693,0) size 4x19 + text run at (693,0) width 4: " " + RenderInline {BIG} at (0,0) size 728x71 + RenderText {#text} at (697,0) size 728x71 + text run at (697,0) width 31: "and" + text run at (0,48) width 57: "widths" + RenderText {#text} at (57,48) size 4x19 + text run at (57,48) width 4: " " + RenderImage {IMG} at (61,48) size 6x20 + RenderText {#text} at (67,48) size 4x19 + text run at (67,48) width 4: " " + RenderInline {SPAN} at (0,0) size 75x19 + RenderText {#text} at (71,48) size 75x19 + text run at (71,48) width 75: "all of which" + RenderText {#text} at (146,48) size 4x19 + text run at (146,48) width 4: " " + RenderImage {IMG} at (150,48) size 20x65 + RenderText {#text} at (169,48) size 5x19 + text run at (169,48) width 5: " " + RenderInline {SPAN} at (0,0) size 112x19 + RenderText {#text} at (173,48) size 112x19 + text run at (173,48) width 112: "should be aligned" + RenderText {#text} at (284,48) size 5x19 + text run at (284,48) width 5: " " + RenderImage {IMG} at (288,48) size 11x35 + RenderText {#text} at (299,48) size 4x19 + text run at (299,48) width 4: " " + RenderInline {SPAN} at (0,0) size 188x36 + RenderText {#text} at (303,48) size 188x36 + text run at (303,48) width 188: "with the top of" RenderText {#text} at (491,48) size 4x19 text run at (491,48) width 4: " " - RenderInline {SPAN} at (0,0) size 120x19 - RenderText {#text} at (495,48) size 120x19 - text run at (495,48) width 120: "the tallest element in" - RenderText {#text} at (615,48) size 4x19 - text run at (615,48) width 4: " " - RenderImage {IMG} at (619,48) size 5x15 - RenderText {#text} at (623,48) size 5x19 - text run at (623,48) width 5: " " - RenderInline {BIG} at (0,0) size 713x88 - RenderText {#text} at (627,48) size 713x88 - text run at (627,48) width 86: "whichever" - text run at (0,113) width 203: "line the elements appear." - RenderText {#text} at (203,113) size 4x19 - text run at (203,113) width 4: " " - RenderImage {IMG} at (207,113) size 27x90 + RenderImage {IMG} at (495,48) size 15x50 + RenderText {#text} at (510,48) size 4x19 + text run at (510,48) width 4: " " + RenderInline {SPAN} at (0,0) size 128x19 + RenderText {#text} at (514,48) size 128x19 + text run at (514,48) width 128: "the tallest element in" + RenderText {#text} at (642,48) size 4x19 + text run at (642,48) width 4: " " + RenderImage {IMG} at (646,48) size 5x15 + RenderText {#text} at (650,48) size 5x19 + text run at (650,48) width 5: " " + RenderInline {BIG} at (0,0) size 743x88 + RenderText {#text} at (654,48) size 743x88 + text run at (654,48) width 89: "whichever" + text run at (0,113) width 207: "line the elements appear." + RenderText {#text} at (207,113) size 4x19 + text run at (207,113) width 4: " " + RenderImage {IMG} at (211,113) size 27x90 RenderText {#text} at (0,0) size 0x0 layer at (8,345) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,337) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/text_properties/word_spacing-expected.txt b/LayoutTests/platform/wincairo/css1/text_properties/word_spacing-expected.txt index 9381ad4e6b29..9940cba0b254 100644 --- a/LayoutTests/platform/wincairo/css1/text_properties/word_spacing-expected.txt +++ b/LayoutTests/platform/wincairo/css1/text_properties/word_spacing-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x969 RenderBlock {HTML} at (0,0) size 785x969 RenderBody {BODY} at (8,8) size 769x953 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x176 RenderText {#text} at (0,0) size 232x176 text run at (0,0) width 216: ".one {word-spacing: 0.3in;}" @@ -30,294 +30,293 @@ layer at (0,0) size 785x969 text run at (224,144) width 0: " " text run at (0,160) width 0: " " RenderBlock {P} at (0,243) size 769x20 - RenderText {#text} at (0,0) size 689x19 - text run at (0,0) width 25: "This" - text run at (53,0) width 43: " words" - text run at (124,0) width 15: " in" - text run at (167,0) width 25: " this" - text run at (220,0) width 57: " sentence" - text run at (305,0) width 43: " should" - text run at (376,0) width 33: " have" - text run at (437,0) width 35: " extra" - text run at (500,0) width 40: " space" - text run at (568,0) width 56: " between" - text run at (651,0) width 38: " them." + RenderText {#text} at (0,0) size 709x19 + text run at (0,0) width 28: "This" + text run at (56,0) width 44: " words" + text run at (128,0) width 17: " in" + text run at (173,0) width 27: " this" + text run at (228,0) width 59: " sentence" + text run at (315,0) width 46: " should" + text run at (389,0) width 35: " have" + text run at (452,0) width 36: " extra" + text run at (516,0) width 40: " space" + text run at (584,0) width 58: " between" + text run at (669,0) width 40: " them." RenderBlock {P} at (0,279) size 769x20 - RenderText {#text} at (0,0) size 590x19 - text run at (0,0) width 25: "This" - text run at (43,0) width 43: " words" - text run at (104,0) width 15: " in" - text run at (137,0) width 25: " this" - text run at (180,0) width 57: " sentence" - text run at (255,0) width 44: " should" - text run at (317,0) width 33: " have" - text run at (368,0) width 35: " extra" - text run at (421,0) width 40: " space" - text run at (479,0) width 56: " between" - text run at (552,0) width 38: " them." + RenderText {#text} at (0,0) size 610x19 + text run at (0,0) width 28: "This" + text run at (46,0) width 44: " words" + text run at (108,0) width 17: " in" + text run at (143,0) width 27: " this" + text run at (188,0) width 59: " sentence" + text run at (265,0) width 47: " should" + text run at (330,0) width 35: " have" + text run at (383,0) width 36: " extra" + text run at (437,0) width 40: " space" + text run at (495,0) width 58: " between" + text run at (570,0) width 40: " them." RenderBlock {P} at (0,315) size 769x20 - RenderText {#text} at (0,0) size 590x19 - text run at (0,0) width 25: "This" - text run at (43,0) width 43: " words" - text run at (104,0) width 15: " in" - text run at (137,0) width 25: " this" - text run at (180,0) width 57: " sentence" - text run at (255,0) width 44: " should" - text run at (317,0) width 33: " have" - text run at (368,0) width 35: " extra" - text run at (421,0) width 40: " space" - text run at (479,0) width 56: " between" - text run at (552,0) width 38: " them." + RenderText {#text} at (0,0) size 610x19 + text run at (0,0) width 28: "This" + text run at (46,0) width 44: " words" + text run at (108,0) width 17: " in" + text run at (143,0) width 27: " this" + text run at (188,0) width 59: " sentence" + text run at (265,0) width 47: " should" + text run at (330,0) width 35: " have" + text run at (383,0) width 36: " extra" + text run at (437,0) width 40: " space" + text run at (495,0) width 58: " between" + text run at (570,0) width 40: " them." RenderBlock {P} at (0,351) size 769x20 - RenderText {#text} at (0,0) size 441x19 - text run at (0,0) width 25: "This" - text run at (29,0) width 42: " words" - text run at (75,0) width 14: " in" - text run at (93,0) width 24: " this" - text run at (121,0) width 56: " sentence" - text run at (181,0) width 43: " should" - text run at (228,0) width 32: " have" - text run at (264,0) width 34: " extra" - text run at (302,0) width 39: " space" - text run at (345,0) width 55: " between" - text run at (404,0) width 37: " them." + RenderText {#text} at (0,0) size 461x19 + text run at (0,0) width 28: "This" + text run at (32,0) width 43: " words" + text run at (79,0) width 16: " in" + text run at (99,0) width 26: " this" + text run at (129,0) width 58: " sentence" + text run at (191,0) width 46: " should" + text run at (241,0) width 34: " have" + text run at (279,0) width 35: " extra" + text run at (318,0) width 39: " space" + text run at (361,0) width 57: " between" + text run at (422,0) width 39: " them." RenderBlock {P} at (0,387) size 769x20 - RenderText {#text} at (0,0) size 441x19 - text run at (0,0) width 25: "This" - text run at (29,0) width 42: " words" - text run at (75,0) width 14: " in" - text run at (93,0) width 24: " this" - text run at (121,0) width 56: " sentence" - text run at (181,0) width 43: " should" - text run at (228,0) width 32: " have" - text run at (264,0) width 34: " extra" - text run at (302,0) width 39: " space" - text run at (345,0) width 55: " between" - text run at (404,0) width 37: " them." + RenderText {#text} at (0,0) size 461x19 + text run at (0,0) width 28: "This" + text run at (32,0) width 43: " words" + text run at (79,0) width 16: " in" + text run at (99,0) width 26: " this" + text run at (129,0) width 58: " sentence" + text run at (191,0) width 46: " should" + text run at (241,0) width 34: " have" + text run at (279,0) width 35: " extra" + text run at (318,0) width 39: " space" + text run at (361,0) width 57: " between" + text run at (422,0) width 39: " them." RenderBlock {P} at (0,423) size 769x20 - RenderText {#text} at (0,0) size 561x19 - text run at (0,0) width 25: "This" - text run at (41,0) width 42: " words" - text run at (99,0) width 14: " in" - text run at (129,0) width 24: " this" - text run at (169,0) width 56: " sentence" - text run at (241,0) width 43: " should" - text run at (300,0) width 32: " have" - text run at (348,0) width 34: " extra" - text run at (398,0) width 39: " space" - text run at (453,0) width 55: " between" - text run at (524,0) width 37: " them." + RenderText {#text} at (0,0) size 581x19 + text run at (0,0) width 28: "This" + text run at (44,0) width 43: " words" + text run at (103,0) width 16: " in" + text run at (135,0) width 26: " this" + text run at (177,0) width 58: " sentence" + text run at (251,0) width 46: " should" + text run at (313,0) width 34: " have" + text run at (363,0) width 35: " extra" + text run at (414,0) width 39: " space" + text run at (469,0) width 57: " between" + text run at (542,0) width 39: " them." RenderBlock {P} at (0,459) size 769x20 - RenderText {#text} at (0,0) size 471x19 - text run at (0,0) width 25: "This" - text run at (32,0) width 42: " words" - text run at (81,0) width 14: " in" - text run at (102,0) width 24: " this" - text run at (133,0) width 56: " sentence" - text run at (196,0) width 43: " should" - text run at (246,0) width 32: " have" - text run at (285,0) width 34: " extra" - text run at (326,0) width 39: " space" - text run at (372,0) width 55: " between" - text run at (434,0) width 37: " them." + RenderText {#text} at (0,0) size 491x19 + text run at (0,0) width 28: "This" + text run at (35,0) width 43: " words" + text run at (85,0) width 16: " in" + text run at (108,0) width 26: " this" + text run at (141,0) width 58: " sentence" + text run at (206,0) width 46: " should" + text run at (259,0) width 34: " have" + text run at (300,0) width 35: " extra" + text run at (342,0) width 39: " space" + text run at (388,0) width 57: " between" + text run at (452,0) width 39: " them." RenderBlock {P} at (0,495) size 769x40 - RenderText {#text} at (0,0) size 729x19 - text run at (0,0) width 25: "This" - text run at (30,0) width 42: " words" - text run at (77,0) width 14: " in" - text run at (96,0) width 24: " this" - text run at (125,0) width 56: " sentence" - text run at (186,0) width 43: " should" - text run at (234,0) width 32: " have" - text run at (271,0) width 34: " extra" - text run at (310,0) width 39: " space" - text run at (354,0) width 55: " between" - text run at (414,0) width 37: " them," - text run at (456,0) width 23: " but" - text run at (484,0) width 22: " the" - text run at (511,0) width 24: " last" - text run at (540,0) width 26: " few" - text run at (571,0) width 42: " words" - text run at (618,0) width 14: " in" - text run at (637,0) width 22: " the" - text run at (664,0) width 56: " sentence" - text run at (725,0) width 4: " " - RenderInline {SPAN} at (0,0) size 768x39 - RenderText {#text} at (729,0) size 768x39 - text run at (729,0) width 39: "should" - text run at (0,20) width 122: "have normal spacing" - RenderText {#text} at (122,20) size 4x19 - text run at (122,20) width 4: "." + RenderText {#text} at (0,0) size 751x19 + text run at (0,0) width 28: "This" + text run at (33,0) width 43: " words" + text run at (81,0) width 16: " in" + text run at (102,0) width 26: " this" + text run at (133,0) width 58: " sentence" + text run at (196,0) width 46: " should" + text run at (247,0) width 34: " have" + text run at (286,0) width 35: " extra" + text run at (326,0) width 39: " space" + text run at (370,0) width 57: " between" + text run at (432,0) width 39: " them," + text run at (476,0) width 24: " but" + text run at (505,0) width 23: " the" + text run at (533,0) width 25: " last" + text run at (563,0) width 28: " few" + text run at (596,0) width 43: " words" + text run at (644,0) width 16: " in" + text run at (665,0) width 23: " the" + text run at (693,0) width 58: " sentence" + RenderInline {SPAN} at (0,0) size 176x19 + RenderText {#text} at (0,20) size 176x19 + text run at (0,20) width 176: "should have normal spacing" + RenderText {#text} at (176,20) size 4x19 + text run at (176,20) width 4: "." RenderBlock {P} at (0,551) size 769x20 - RenderText {#text} at (0,0) size 668x19 - text run at (0,0) width 25: "This" - text run at (21,0) width 43: " words" - text run at (60,0) width 15: " in" - text run at (71,0) width 25: " this" - text run at (92,0) width 57: " sentence" - text run at (145,0) width 44: " should" - text run at (184,0) width 33: " have" - text run at (213,0) width 54: " reduced" - text run at (263,0) width 40: " space" - text run at (299,0) width 56: " between" - text run at (351,0) width 37: " them," - text run at (384,0) width 35: " since" - text run at (415,0) width 54: " negative" - text run at (465,0) width 42: " values" - text run at (503,0) width 24: " are" - text run at (522,0) width 52: " allowed" - text run at (570,0) width 20: " on" - text run at (586,0) width 25: " this" - text run at (607,0) width 61: " property." + RenderText {#text} at (0,0) size 703x19 + text run at (0,0) width 28: "This" + text run at (24,0) width 44: " words" + text run at (64,0) width 17: " in" + text run at (77,0) width 27: " this" + text run at (100,0) width 59: " sentence" + text run at (155,0) width 47: " should" + text run at (197,0) width 35: " have" + text run at (228,0) width 55: " reduced" + text run at (279,0) width 40: " space" + text run at (315,0) width 58: " between" + text run at (369,0) width 39: " them," + text run at (404,0) width 37: " since" + text run at (437,0) width 58: " negative" + text run at (491,0) width 45: " values" + text run at (532,0) width 24: " are" + text run at (551,0) width 55: " allowed" + text run at (602,0) width 21: " on" + text run at (619,0) width 27: " this" + text run at (642,0) width 61: " property." RenderTable {TABLE} at (0,587) size 769x366 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x364 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x336 RenderTableCell {TD} at (0,182) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x336 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 689x19 - text run at (0,0) width 25: "This" - text run at (53,0) width 43: " words" - text run at (124,0) width 15: " in" - text run at (167,0) width 25: " this" - text run at (220,0) width 57: " sentence" - text run at (305,0) width 43: " should" - text run at (376,0) width 33: " have" - text run at (437,0) width 35: " extra" - text run at (500,0) width 40: " space" - text run at (568,0) width 56: " between" - text run at (651,0) width 38: " them." + RenderText {#text} at (0,0) size 709x19 + text run at (0,0) width 28: "This" + text run at (56,0) width 44: " words" + text run at (128,0) width 17: " in" + text run at (173,0) width 27: " this" + text run at (228,0) width 59: " sentence" + text run at (315,0) width 46: " should" + text run at (389,0) width 35: " have" + text run at (452,0) width 36: " extra" + text run at (516,0) width 40: " space" + text run at (584,0) width 58: " between" + text run at (669,0) width 40: " them." RenderBlock {P} at (4,40) size 747x20 - RenderText {#text} at (0,0) size 590x19 - text run at (0,0) width 25: "This" - text run at (43,0) width 43: " words" - text run at (104,0) width 15: " in" - text run at (137,0) width 25: " this" - text run at (180,0) width 57: " sentence" - text run at (255,0) width 44: " should" - text run at (317,0) width 33: " have" - text run at (368,0) width 35: " extra" - text run at (421,0) width 40: " space" - text run at (479,0) width 56: " between" - text run at (552,0) width 38: " them." + RenderText {#text} at (0,0) size 610x19 + text run at (0,0) width 28: "This" + text run at (46,0) width 44: " words" + text run at (108,0) width 17: " in" + text run at (143,0) width 27: " this" + text run at (188,0) width 59: " sentence" + text run at (265,0) width 47: " should" + text run at (330,0) width 35: " have" + text run at (383,0) width 36: " extra" + text run at (437,0) width 40: " space" + text run at (495,0) width 58: " between" + text run at (570,0) width 40: " them." RenderBlock {P} at (4,76) size 747x20 - RenderText {#text} at (0,0) size 590x19 - text run at (0,0) width 25: "This" - text run at (43,0) width 43: " words" - text run at (104,0) width 15: " in" - text run at (137,0) width 25: " this" - text run at (180,0) width 57: " sentence" - text run at (255,0) width 44: " should" - text run at (317,0) width 33: " have" - text run at (368,0) width 35: " extra" - text run at (421,0) width 40: " space" - text run at (479,0) width 56: " between" - text run at (552,0) width 38: " them." + RenderText {#text} at (0,0) size 610x19 + text run at (0,0) width 28: "This" + text run at (46,0) width 44: " words" + text run at (108,0) width 17: " in" + text run at (143,0) width 27: " this" + text run at (188,0) width 59: " sentence" + text run at (265,0) width 47: " should" + text run at (330,0) width 35: " have" + text run at (383,0) width 36: " extra" + text run at (437,0) width 40: " space" + text run at (495,0) width 58: " between" + text run at (570,0) width 40: " them." RenderBlock {P} at (4,112) size 747x20 - RenderText {#text} at (0,0) size 441x19 - text run at (0,0) width 25: "This" - text run at (29,0) width 42: " words" - text run at (75,0) width 14: " in" - text run at (93,0) width 24: " this" - text run at (121,0) width 56: " sentence" - text run at (181,0) width 43: " should" - text run at (228,0) width 32: " have" - text run at (264,0) width 34: " extra" - text run at (302,0) width 39: " space" - text run at (345,0) width 55: " between" - text run at (404,0) width 37: " them." + RenderText {#text} at (0,0) size 461x19 + text run at (0,0) width 28: "This" + text run at (32,0) width 43: " words" + text run at (79,0) width 16: " in" + text run at (99,0) width 26: " this" + text run at (129,0) width 58: " sentence" + text run at (191,0) width 46: " should" + text run at (241,0) width 34: " have" + text run at (279,0) width 35: " extra" + text run at (318,0) width 39: " space" + text run at (361,0) width 57: " between" + text run at (422,0) width 39: " them." RenderBlock {P} at (4,148) size 747x20 - RenderText {#text} at (0,0) size 441x19 - text run at (0,0) width 25: "This" - text run at (29,0) width 42: " words" - text run at (75,0) width 14: " in" - text run at (93,0) width 24: " this" - text run at (121,0) width 56: " sentence" - text run at (181,0) width 43: " should" - text run at (228,0) width 32: " have" - text run at (264,0) width 34: " extra" - text run at (302,0) width 39: " space" - text run at (345,0) width 55: " between" - text run at (404,0) width 37: " them." + RenderText {#text} at (0,0) size 461x19 + text run at (0,0) width 28: "This" + text run at (32,0) width 43: " words" + text run at (79,0) width 16: " in" + text run at (99,0) width 26: " this" + text run at (129,0) width 58: " sentence" + text run at (191,0) width 46: " should" + text run at (241,0) width 34: " have" + text run at (279,0) width 35: " extra" + text run at (318,0) width 39: " space" + text run at (361,0) width 57: " between" + text run at (422,0) width 39: " them." RenderBlock {P} at (4,184) size 747x20 - RenderText {#text} at (0,0) size 561x19 - text run at (0,0) width 25: "This" - text run at (41,0) width 42: " words" - text run at (99,0) width 14: " in" - text run at (129,0) width 24: " this" - text run at (169,0) width 56: " sentence" - text run at (241,0) width 43: " should" - text run at (300,0) width 32: " have" - text run at (348,0) width 34: " extra" - text run at (398,0) width 39: " space" - text run at (453,0) width 55: " between" - text run at (524,0) width 37: " them." + RenderText {#text} at (0,0) size 581x19 + text run at (0,0) width 28: "This" + text run at (44,0) width 43: " words" + text run at (103,0) width 16: " in" + text run at (135,0) width 26: " this" + text run at (177,0) width 58: " sentence" + text run at (251,0) width 46: " should" + text run at (313,0) width 34: " have" + text run at (363,0) width 35: " extra" + text run at (414,0) width 39: " space" + text run at (469,0) width 57: " between" + text run at (542,0) width 39: " them." RenderBlock {P} at (4,220) size 747x20 - RenderText {#text} at (0,0) size 471x19 - text run at (0,0) width 25: "This" - text run at (32,0) width 42: " words" - text run at (81,0) width 14: " in" - text run at (102,0) width 24: " this" - text run at (133,0) width 56: " sentence" - text run at (196,0) width 43: " should" - text run at (246,0) width 32: " have" - text run at (285,0) width 34: " extra" - text run at (326,0) width 39: " space" - text run at (372,0) width 55: " between" - text run at (434,0) width 37: " them." + RenderText {#text} at (0,0) size 491x19 + text run at (0,0) width 28: "This" + text run at (35,0) width 43: " words" + text run at (85,0) width 16: " in" + text run at (108,0) width 26: " this" + text run at (141,0) width 58: " sentence" + text run at (206,0) width 46: " should" + text run at (259,0) width 34: " have" + text run at (300,0) width 35: " extra" + text run at (342,0) width 39: " space" + text run at (388,0) width 57: " between" + text run at (452,0) width 39: " them." RenderBlock {P} at (4,256) size 747x40 - RenderText {#text} at (0,0) size 720x19 - text run at (0,0) width 25: "This" - text run at (30,0) width 42: " words" - text run at (77,0) width 14: " in" - text run at (96,0) width 24: " this" - text run at (125,0) width 56: " sentence" - text run at (186,0) width 43: " should" - text run at (234,0) width 32: " have" - text run at (271,0) width 34: " extra" - text run at (310,0) width 39: " space" - text run at (354,0) width 55: " between" - text run at (414,0) width 37: " them," - text run at (456,0) width 23: " but" - text run at (484,0) width 22: " the" - text run at (511,0) width 24: " last" - text run at (540,0) width 26: " few" - text run at (571,0) width 42: " words" - text run at (618,0) width 14: " in" - text run at (637,0) width 22: " the" - text run at (664,0) width 56: " sentence" - RenderInline {SPAN} at (0,0) size 165x19 - RenderText {#text} at (0,20) size 165x19 - text run at (0,20) width 165: "should have normal spacing" - RenderText {#text} at (165,20) size 4x19 - text run at (165,20) width 4: "." + RenderText {#text} at (0,0) size 688x39 + text run at (0,0) width 28: "This" + text run at (33,0) width 43: " words" + text run at (81,0) width 16: " in" + text run at (102,0) width 26: " this" + text run at (133,0) width 58: " sentence" + text run at (196,0) width 46: " should" + text run at (247,0) width 34: " have" + text run at (286,0) width 35: " extra" + text run at (326,0) width 39: " space" + text run at (370,0) width 57: " between" + text run at (432,0) width 39: " them," + text run at (476,0) width 24: " but" + text run at (505,0) width 23: " the" + text run at (533,0) width 25: " last" + text run at (563,0) width 28: " few" + text run at (596,0) width 43: " words" + text run at (644,0) width 16: " in" + text run at (665,0) width 23: " the" + text run at (0,20) width 54: "sentence" + text run at (59,20) width 4: " " + RenderInline {SPAN} at (0,0) size 176x19 + RenderText {#text} at (63,20) size 176x19 + text run at (63,20) width 176: "should have normal spacing" + RenderText {#text} at (239,20) size 4x19 + text run at (239,20) width 4: "." RenderBlock {P} at (4,312) size 747x20 - RenderText {#text} at (0,0) size 668x19 - text run at (0,0) width 25: "This" - text run at (21,0) width 43: " words" - text run at (60,0) width 15: " in" - text run at (71,0) width 25: " this" - text run at (92,0) width 57: " sentence" - text run at (145,0) width 44: " should" - text run at (184,0) width 33: " have" - text run at (213,0) width 54: " reduced" - text run at (263,0) width 40: " space" - text run at (299,0) width 56: " between" - text run at (351,0) width 37: " them," - text run at (384,0) width 35: " since" - text run at (415,0) width 54: " negative" - text run at (465,0) width 42: " values" - text run at (503,0) width 24: " are" - text run at (522,0) width 52: " allowed" - text run at (570,0) width 20: " on" - text run at (586,0) width 25: " this" - text run at (607,0) width 61: " property." + RenderText {#text} at (0,0) size 703x19 + text run at (0,0) width 28: "This" + text run at (24,0) width 44: " words" + text run at (64,0) width 17: " in" + text run at (77,0) width 27: " this" + text run at (100,0) width 59: " sentence" + text run at (155,0) width 47: " should" + text run at (197,0) width 35: " have" + text run at (228,0) width 55: " reduced" + text run at (279,0) width 40: " space" + text run at (315,0) width 58: " between" + text run at (369,0) width 39: " them," + text run at (404,0) width 37: " since" + text run at (437,0) width 58: " negative" + text run at (491,0) width 45: " values" + text run at (532,0) width 24: " are" + text run at (551,0) width 55: " allowed" + text run at (602,0) width 21: " on" + text run at (619,0) width 27: " this" + text run at (642,0) width 61: " property." layer at (8,233) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,225) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/units/color_units-expected.txt b/LayoutTests/platform/wincairo/css1/units/color_units-expected.txt index 1e03b4077af7..90592006a362 100644 --- a/LayoutTests/platform/wincairo/css1/units/color_units-expected.txt +++ b/LayoutTests/platform/wincairo/css1/units/color_units-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 785x1745 +layer at (0,0) size 785x1805 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x1745 - RenderBlock {HTML} at (0,0) size 785x1745 - RenderBody {BODY} at (8,8) size 769x1729 [bgcolor=#CCCCCC] +layer at (0,0) size 785x1805 + RenderBlock {HTML} at (0,0) size 785x1805 + RenderBody {BODY} at (8,8) size 769x1789 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x192 RenderText {#text} at (0,0) size 288x192 text run at (0,0) width 160: "BODY {color: black;}" @@ -33,204 +33,207 @@ layer at (0,0) size 785x1745 text run at (0,176) width 264: ".eleven {color: rgb(50%,0%,60%);}" text run at (264,176) width 0: " " RenderBlock {P} at (0,259) size 769x20 - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." + RenderText {#text} at (0,0) size 193x19 + text run at (0,0) width 193: "This sentence should be black." RenderBlock {P} at (0,295) size 769x20 [color=#008800] - RenderText {#text} at (0,0) size 474x19 - text run at (0,0) width 474: "This sentence should be green, although slightly different from those that follow." + RenderText {#text} at (0,0) size 506x19 + text run at (0,0) width 506: "This sentence should be green, although slightly different from those that follow." RenderBlock {P} at (0,331) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,367) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,403) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,439) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,475) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,511) size 769x20 - RenderText {#text} at (0,0) size 387x19 - text run at (0,0) width 387: "This sentence should be black, because the value given for class " + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "This sentence should be black, because the value given for class " RenderInline {CODE} at (0,0) size 48x16 - RenderText {#text} at (387,3) size 48x16 - text run at (387,3) width 48: ".seven" - RenderText {#text} at (435,0) size 59x19 - text run at (435,0) width 59: " is invalid." - RenderBlock {P} at (0,547) size 769x20 [color=#0080FF] - RenderText {#text} at (0,0) size 758x19 - text run at (0,0) width 758: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next paragraph." - RenderBlock {P} at (0,583) size 769x40 [color=#0080FF] - RenderText {#text} at (0,0) size 715x39 - text run at (0,0) width 715: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the previous" - text run at (0,20) width 65: "paragraph." - RenderBlock {P} at (0,639) size 769x20 [color=#800099] - RenderText {#text} at (0,0) size 732x19 - text run at (0,0) width 732: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next paragraph." - RenderBlock {P} at (0,675) size 769x20 [color=#800099] - RenderText {#text} at (0,0) size 758x19 - text run at (0,0) width 758: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous paragraph." - RenderBlock {P} at (0,711) size 769x20 - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - RenderBlock {P} at (0,747) size 769x20 [color=#008800] - RenderText {#text} at (0,0) size 376x19 - text run at (0,0) width 376: "This sentence should be a slightly different green, and used the " + RenderText {#text} at (407,3) size 48x16 + text run at (407,3) width 48: ".seven" + RenderText {#text} at (455,0) size 65x19 + text run at (455,0) width 65: " is invalid." + RenderBlock {P} at (0,547) size 769x40 [color=#0080FF] + RenderText {#text} at (0,0) size 725x39 + text run at (0,0) width 725: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" + text run at (0,20) width 67: "paragraph." + RenderBlock {P} at (0,603) size 769x40 [color=#0080FF] + RenderText {#text} at (0,0) size 752x39 + text run at (0,0) width 752: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the previous" + text run at (0,20) width 67: "paragraph." + RenderBlock {P} at (0,659) size 769x20 [color=#800099] + RenderText {#text} at (0,0) size 769x19 + text run at (0,0) width 769: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next paragraph." + RenderBlock {P} at (0,695) size 769x40 [color=#800099] + RenderText {#text} at (0,0) size 725x39 + text run at (0,0) width 725: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" + text run at (0,20) width 67: "paragraph." + RenderBlock {P} at (0,751) size 769x20 + RenderText {#text} at (0,0) size 193x19 + text run at (0,0) width 193: "This sentence should be black." + RenderBlock {P} at (0,787) size 769x20 [color=#008800] + RenderText {#text} at (0,0) size 399x19 + text run at (0,0) width 399: "This sentence should be a slightly different green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (376,3) size 40x16 - text run at (376,3) width 40: "style" - RenderText {#text} at (416,0) size 57x19 - text run at (416,0) width 57: " attribute." - RenderBlock {P} at (0,783) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (399,3) size 40x16 + text run at (399,3) width 40: "style" + RenderText {#text} at (439,0) size 59x19 + text run at (439,0) width 59: " attribute." + RenderBlock {P} at (0,823) size 769x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - RenderBlock {P} at (0,819) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." + RenderBlock {P} at (0,859) size 769x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - RenderBlock {P} at (0,855) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." + RenderBlock {P} at (0,895) size 769x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - RenderBlock {P} at (0,891) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." + RenderBlock {P} at (0,931) size 769x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - RenderBlock {P} at (0,927) size 769x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." + RenderBlock {P} at (0,967) size 769x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - RenderTable {TABLE} at (0,963) size 769x766 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 767x764 + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." + RenderTable {TABLE} at (0,1003) size 769x786 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x784 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 767x736 - RenderTableCell {TD} at (0,382) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x756 + RenderTableCell {TD} at (0,392) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 755x736 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (12,28) size 755x756 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x20 - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." + RenderText {#text} at (0,0) size 193x19 + text run at (0,0) width 193: "This sentence should be black." RenderBlock {P} at (4,40) size 747x20 [color=#008800] - RenderText {#text} at (0,0) size 474x19 - text run at (0,0) width 474: "This sentence should be green, although slightly different from those that follow." + RenderText {#text} at (0,0) size 506x19 + text run at (0,0) width 506: "This sentence should be green, although slightly different from those that follow." RenderBlock {P} at (4,76) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (4,112) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (4,148) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (4,184) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (4,220) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (4,256) size 747x20 - RenderText {#text} at (0,0) size 387x19 - text run at (0,0) width 387: "This sentence should be black, because the value given for class " + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "This sentence should be black, because the value given for class " RenderInline {CODE} at (0,0) size 48x16 - RenderText {#text} at (387,3) size 48x16 - text run at (387,3) width 48: ".seven" - RenderText {#text} at (435,0) size 59x19 - text run at (435,0) width 59: " is invalid." + RenderText {#text} at (407,3) size 48x16 + text run at (407,3) width 48: ".seven" + RenderText {#text} at (455,0) size 65x19 + text run at (455,0) width 65: " is invalid." RenderBlock {P} at (4,292) size 747x40 [color=#0080FF] - RenderText {#text} at (0,0) size 689x39 - text run at (0,0) width 689: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" - text run at (0,20) width 65: "paragraph." + RenderText {#text} at (0,0) size 725x39 + text run at (0,0) width 725: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" + text run at (0,20) width 67: "paragraph." RenderBlock {P} at (4,348) size 747x40 [color=#0080FF] - RenderText {#text} at (0,0) size 715x39 - text run at (0,0) width 715: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the previous" - text run at (0,20) width 65: "paragraph." - RenderBlock {P} at (4,404) size 747x20 [color=#800099] - RenderText {#text} at (0,0) size 732x19 - text run at (0,0) width 732: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next paragraph." - RenderBlock {P} at (4,440) size 747x40 [color=#800099] - RenderText {#text} at (0,0) size 689x39 - text run at (0,0) width 689: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" - text run at (0,20) width 65: "paragraph." - RenderBlock {P} at (4,496) size 747x20 - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - RenderBlock {P} at (4,532) size 747x20 [color=#008800] - RenderText {#text} at (0,0) size 376x19 - text run at (0,0) width 376: "This sentence should be a slightly different green, and used the " + RenderText {#text} at (0,0) size 694x39 + text run at (0,0) width 694: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the" + text run at (0,20) width 125: "previous paragraph." + RenderBlock {P} at (4,404) size 747x40 [color=#800099] + RenderText {#text} at (0,0) size 698x39 + text run at (0,0) width 698: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next" + text run at (0,20) width 67: "paragraph." + RenderBlock {P} at (4,460) size 747x40 [color=#800099] + RenderText {#text} at (0,0) size 725x39 + text run at (0,0) width 725: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" + text run at (0,20) width 67: "paragraph." + RenderBlock {P} at (4,516) size 747x20 + RenderText {#text} at (0,0) size 193x19 + text run at (0,0) width 193: "This sentence should be black." + RenderBlock {P} at (4,552) size 747x20 [color=#008800] + RenderText {#text} at (0,0) size 399x19 + text run at (0,0) width 399: "This sentence should be a slightly different green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (376,3) size 40x16 - text run at (376,3) width 40: "style" - RenderText {#text} at (416,0) size 57x19 - text run at (416,0) width 57: " attribute." - RenderBlock {P} at (4,568) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (399,3) size 40x16 + text run at (399,3) width 40: "style" + RenderText {#text} at (439,0) size 59x19 + text run at (439,0) width 59: " attribute." + RenderBlock {P} at (4,588) size 747x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - RenderBlock {P} at (4,604) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." + RenderBlock {P} at (4,624) size 747x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - RenderBlock {P} at (4,640) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." + RenderBlock {P} at (4,660) size 747x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - RenderBlock {P} at (4,676) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." + RenderBlock {P} at (4,696) size 747x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - RenderBlock {P} at (4,712) size 747x20 [color=#008000] - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." + RenderBlock {P} at (4,732) size 747x20 [color=#008000] + RenderText {#text} at (0,0) size 281x19 + text run at (0,0) width 281: "This sentence should be green, and used the " RenderInline {TT} at (0,0) size 40x16 - RenderText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - RenderText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." + RenderText {#text} at (281,3) size 40x16 + text run at (281,3) width 40: "style" + RenderText {#text} at (321,0) size 59x19 + text run at (321,0) width 59: " attribute." layer at (8,249) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,241) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/units/length_units-expected.txt b/LayoutTests/platform/wincairo/css1/units/length_units-expected.txt index a0654775fad0..74fe217b30fc 100644 --- a/LayoutTests/platform/wincairo/css1/units/length_units-expected.txt +++ b/LayoutTests/platform/wincairo/css1/units/length_units-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x1673 RenderBlock {HTML} at (0,0) size 785x1673 RenderBody {BODY} at (8,8) size 769x1657 [bgcolor=#CCCCCC] RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 769x176 RenderText {#text} at (0,0) size 624x176 text run at (0,0) width 184: ".zero {margin-left: 0;}" @@ -31,143 +31,143 @@ layer at (0,0) size 785x1673 text run at (0,160) width 624: ".ten {font-size: 40px; border-left: 1ex solid purple; background-color: aqua;}" text run at (624,160) width 0: " " RenderBlock {P} at (0,243) size 769x40 - RenderText {#text} at (0,0) size 758x39 - text run at (0,0) width 758: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer) edges should" - text run at (0,20) width 288: "therefore be appropriately shifted to the right of " - RenderInline {EM} at (0,0) size 23x19 - RenderText {#text} at (288,20) size 23x19 - text run at (288,20) width 23: "this" - RenderText {#text} at (311,20) size 133x19 - text run at (311,20) width 133: " paragraph's left edge." + RenderText {#text} at (0,0) size 761x39 + text run at (0,0) width 761: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer) edges" + text run at (0,20) width 347: "should therefore be appropriately shifted to the right of " + RenderInline {EM} at (0,0) size 22x19 + RenderText {#text} at (347,20) size 22x19 + text run at (347,20) width 22: "this" + RenderText {#text} at (369,20) size 138x19 + text run at (369,20) width 138: " paragraph's left edge." RenderBlock {P} at (48,299) size 721x20 - RenderText {#text} at (0,0) size 292x19 - text run at (0,0) width 292: "This paragraph should have a left margin of 3em." + RenderText {#text} at (0,0) size 310x19 + text run at (0,0) width 310: "This paragraph should have a left margin of 3em." RenderBlock {P} at (21,335) size 748x20 - RenderText {#text} at (0,0) size 288x19 - text run at (0,0) width 288: "This paragraph should have a left margin of 3ex." + RenderText {#text} at (0,0) size 306x19 + text run at (0,0) width 306: "This paragraph should have a left margin of 3ex." RenderBlock {P} at (36,371) size 733x20 - RenderText {#text} at (0,0) size 320x19 - text run at (0,0) width 320: "This paragraph should have a left margin of 36 pixels." + RenderText {#text} at (0,0) size 340x19 + text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels." RenderBlock {P} at (48,407) size 721x20 - RenderText {#text} at (0,0) size 333x19 - text run at (0,0) width 333: "This paragraph should have a left margin of half an inch." + RenderText {#text} at (0,0) size 357x19 + text run at (0,0) width 357: "This paragraph should have a left margin of half an inch." RenderBlock {P} at (48,443) size 721x20 - RenderText {#text} at (0,0) size 312x19 - text run at (0,0) width 312: "This paragraph should have a left margin of 1.27cm." + RenderText {#text} at (0,0) size 330x19 + text run at (0,0) width 330: "This paragraph should have a left margin of 1.27cm." RenderBlock {P} at (48,479) size 721x20 - RenderText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This paragraph should have a left margin of 12.7mm." + RenderText {#text} at (0,0) size 335x19 + text run at (0,0) width 335: "This paragraph should have a left margin of 12.7mm." RenderBlock {P} at (48,515) size 721x20 - RenderText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This paragraph should have a left margin of 36 points." + RenderText {#text} at (0,0) size 341x19 + text run at (0,0) width 341: "This paragraph should have a left margin of 36 points." RenderBlock {P} at (48,551) size 721x20 - RenderText {#text} at (0,0) size 309x19 - text run at (0,0) width 309: "This paragraph should have a left margin of 3 picas." + RenderText {#text} at (0,0) size 327x19 + text run at (0,0) width 327: "This paragraph should have a left margin of 3 picas." RenderBlock {P} at (48,587) size 721x20 - RenderText {#text} at (0,0) size 558x19 - text run at (0,0) width 558: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." + RenderText {#text} at (0,0) size 591x19 + text run at (0,0) width 591: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." RenderBlock {P} at (0,647) size 769x240 [bgcolor=#00FFFF] [border: none (18px solid #800080)] - RenderText {#text} at (18,1) size 306x46 - text run at (18,1) width 306: "This element has a " + RenderText {#text} at (18,1) size 310x46 + text run at (18,1) width 310: "This element has a " RenderInline {CODE} at (0,0) size 216x42 - RenderText {#text} at (324,6) size 216x42 - text run at (324,6) width 216: "font-size" - RenderText {#text} at (540,1) size 51x46 - text run at (540,1) width 51: " of " + RenderText {#text} at (328,6) size 216x42 + text run at (328,6) width 216: "font-size" + RenderText {#text} at (544,1) size 53x46 + text run at (544,1) width 53: " of " RenderInline {CODE} at (0,0) size 96x42 - RenderText {#text} at (591,6) size 96x42 - text run at (591,6) width 96: "40px" - RenderText {#text} at (687,1) size 737x94 - text run at (687,1) width 68: " and" + RenderText {#text} at (597,6) size 96x42 + text run at (597,6) width 96: "40px" + RenderText {#text} at (693,1) size 743x94 + text run at (693,1) width 68: " and" text run at (18,49) width 28: "a " RenderInline {CODE} at (0,0) size 264x42 RenderText {#text} at (46,54) size 264x42 text run at (46,54) width 264: "border-left" - RenderText {#text} at (310,49) size 51x46 - text run at (310,49) width 51: " of " + RenderText {#text} at (310,49) size 53x46 + text run at (310,49) width 53: " of " RenderInline {CODE} at (0,0) size 384x42 - RenderText {#text} at (361,54) size 384x42 - text run at (361,54) width 384: "1ex solid purple" - RenderText {#text} at (745,49) size 737x190 - text run at (745,49) width 10: "." - text run at (18,97) width 663: "This should make the left border the same" - text run at (18,145) width 700: "number of pixels as the lower-case 'x' in this" - text run at (18,193) width 603: "element's font, as well as solid purple." + RenderText {#text} at (363,54) size 384x42 + text run at (363,54) width 384: "1ex solid purple" + RenderText {#text} at (747,49) size 739x190 + text run at (747,49) width 10: "." + text run at (18,97) width 673: "This should make the left border the same" + text run at (18,145) width 711: "number of pixels as the lower-case 'x' in this" + text run at (18,193) width 611: "element's font, as well as solid purple." RenderTable {TABLE} at (0,927) size 769x730 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 767x728 RenderTableRow {TR} at (0,0) size 767x28 RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 767x700 RenderTableCell {TD} at (0,364) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 755x700 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 747x40 - RenderText {#text} at (0,0) size 715x39 - text run at (0,0) width 715: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer) edges" - text run at (0,20) width 331: "should therefore be appropriately shifted to the right of " - RenderInline {EM} at (0,0) size 23x19 - RenderText {#text} at (331,20) size 23x19 - text run at (331,20) width 23: "this" - RenderText {#text} at (354,20) size 133x19 - text run at (354,20) width 133: " paragraph's left edge." + RenderText {#text} at (0,0) size 721x39 + text run at (0,0) width 721: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer)" + text run at (0,20) width 387: "edges should therefore be appropriately shifted to the right of " + RenderInline {EM} at (0,0) size 22x19 + RenderText {#text} at (387,20) size 22x19 + text run at (387,20) width 22: "this" + RenderText {#text} at (409,20) size 138x19 + text run at (409,20) width 138: " paragraph's left edge." RenderBlock {P} at (52,60) size 699x20 - RenderText {#text} at (0,0) size 292x19 - text run at (0,0) width 292: "This paragraph should have a left margin of 3em." + RenderText {#text} at (0,0) size 310x19 + text run at (0,0) width 310: "This paragraph should have a left margin of 3em." RenderBlock {P} at (25,96) size 726x20 - RenderText {#text} at (0,0) size 288x19 - text run at (0,0) width 288: "This paragraph should have a left margin of 3ex." + RenderText {#text} at (0,0) size 306x19 + text run at (0,0) width 306: "This paragraph should have a left margin of 3ex." RenderBlock {P} at (40,132) size 711x20 - RenderText {#text} at (0,0) size 320x19 - text run at (0,0) width 320: "This paragraph should have a left margin of 36 pixels." + RenderText {#text} at (0,0) size 340x19 + text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels." RenderBlock {P} at (52,168) size 699x20 - RenderText {#text} at (0,0) size 333x19 - text run at (0,0) width 333: "This paragraph should have a left margin of half an inch." + RenderText {#text} at (0,0) size 357x19 + text run at (0,0) width 357: "This paragraph should have a left margin of half an inch." RenderBlock {P} at (52,204) size 699x20 - RenderText {#text} at (0,0) size 312x19 - text run at (0,0) width 312: "This paragraph should have a left margin of 1.27cm." + RenderText {#text} at (0,0) size 330x19 + text run at (0,0) width 330: "This paragraph should have a left margin of 1.27cm." RenderBlock {P} at (52,240) size 699x20 - RenderText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This paragraph should have a left margin of 12.7mm." + RenderText {#text} at (0,0) size 335x19 + text run at (0,0) width 335: "This paragraph should have a left margin of 12.7mm." RenderBlock {P} at (52,276) size 699x20 - RenderText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This paragraph should have a left margin of 36 points." + RenderText {#text} at (0,0) size 341x19 + text run at (0,0) width 341: "This paragraph should have a left margin of 36 points." RenderBlock {P} at (52,312) size 699x20 - RenderText {#text} at (0,0) size 309x19 - text run at (0,0) width 309: "This paragraph should have a left margin of 3 picas." + RenderText {#text} at (0,0) size 327x19 + text run at (0,0) width 327: "This paragraph should have a left margin of 3 picas." RenderBlock {P} at (52,348) size 699x20 - RenderText {#text} at (0,0) size 558x19 - text run at (0,0) width 558: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." + RenderText {#text} at (0,0) size 591x19 + text run at (0,0) width 591: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." RenderBlock {P} at (4,408) size 747x288 [bgcolor=#00FFFF] [border: none (18px solid #800080)] - RenderText {#text} at (18,1) size 306x46 - text run at (18,1) width 306: "This element has a " + RenderText {#text} at (18,1) size 310x46 + text run at (18,1) width 310: "This element has a " RenderInline {CODE} at (0,0) size 216x42 - RenderText {#text} at (324,6) size 216x42 - text run at (324,6) width 216: "font-size" - RenderText {#text} at (540,1) size 51x46 - text run at (540,1) width 51: " of " + RenderText {#text} at (328,6) size 216x42 + text run at (328,6) width 216: "font-size" + RenderText {#text} at (544,1) size 53x46 + text run at (544,1) width 53: " of " RenderInline {CODE} at (0,0) size 96x42 - RenderText {#text} at (591,6) size 96x42 - text run at (591,6) width 96: "40px" + RenderText {#text} at (597,6) size 96x42 + text run at (597,6) width 96: "40px" RenderText {#text} at (18,49) size 96x46 text run at (18,49) width 96: "and a " RenderInline {CODE} at (0,0) size 264x42 RenderText {#text} at (114,54) size 264x42 text run at (114,54) width 264: "border-left" - RenderText {#text} at (378,49) size 51x46 - text run at (378,49) width 51: " of " - RenderInline {CODE} at (0,0) size 627x90 - RenderText {#text} at (429,54) size 627x90 - text run at (429,54) width 216: "1ex solid" + RenderText {#text} at (378,49) size 53x46 + text run at (378,49) width 53: " of " + RenderInline {CODE} at (0,0) size 629x90 + RenderText {#text} at (431,54) size 629x90 + text run at (431,54) width 216: "1ex solid" text run at (18,102) width 144: "purple" - RenderText {#text} at (162,97) size 698x190 + RenderText {#text} at (162,97) size 710x190 text run at (162,97) width 20: ". " - text run at (182,97) width 513: "This should make the left border" - text run at (18,145) width 698: "the same number of pixels as the lower-case" - text run at (18,193) width 634: "'x' in this element's font, as well as solid" - text run at (18,241) width 111: "purple." + text run at (182,97) width 521: "This should make the left border" + text run at (18,145) width 710: "the same number of pixels as the lower-case" + text run at (18,193) width 642: "'x' in this element's font, as well as solid" + text run at (18,241) width 112: "purple." layer at (8,233) size 769x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,225) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/units/percentage_units-expected.txt b/LayoutTests/platform/wincairo/css1/units/percentage_units-expected.txt index 231f0cc9e5f9..8759307af10c 100644 --- a/LayoutTests/platform/wincairo/css1/units/percentage_units-expected.txt +++ b/LayoutTests/platform/wincairo/css1/units/percentage_units-expected.txt @@ -1,12 +1,12 @@ -layer at (0,0) size 800x600 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x600 - RenderBlock {HTML} at (0,0) size 800x600 - RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - RenderBlock {PRE} at (0,36) size 784x80 +layer at (0,0) size 785x601 + RenderView at (0,0) size 785x600 +layer at (0,0) size 785x601 + RenderBlock {HTML} at (0,0) size 785x601 + RenderBody {BODY} at (8,8) size 769x585 [bgcolor=#CCCCCC] + RenderBlock {P} at (0,0) size 769x20 + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" + RenderBlock {PRE} at (0,36) size 769x80 RenderText {#text} at (0,0) size 504x80 text run at (0,0) width 224: ".zero { background: yellow }" text run at (224,0) width 0: " " @@ -17,49 +17,51 @@ layer at (0,0) size 800x600 text run at (0,48) width 208: ".three {margin-left: 25%;}" text run at (208,48) width 0: " " text run at (0,64) width 0: " " - RenderBlock {DIV} at (0,147) size 784x116 [bgcolor=#FFFF00] - RenderBlock {DIV} at (196,0) size 392x40 [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 392x40 - RenderText {#text} at (0,0) size 371x39 - text run at (0,0) width 371: "This paragraph should be centered within its yellow containing" - text run at (0,20) width 345: "block and its width should be half of the containing block." - RenderBlock {DIV} at (392,56) size 392x60 [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 392x60 - RenderText {#text} at (0,0) size 367x59 - text run at (0,0) width 329: "This paragraph should be right-aligned within its yellow" - text run at (0,20) width 367: "containing block and its width should be half of the containing" - text run at (0,40) width 38: "block." - RenderBlock {P} at (196,279) size 588x40 - RenderText {#text} at (0,0) size 561x39 - text run at (0,0) width 561: "This paragraph should have a left margin of 25% the width of its parent element, which should" - text run at (0,20) width 298: "require some extra text in order to test effectively." - RenderTable {TABLE} at (0,335) size 784x210 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 782x208 - RenderTableRow {TR} at (0,0) size 782x28 - RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" - RenderTableRow {TR} at (0,28) size 782x180 - RenderTableCell {TD} at (0,104) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderBlock {DIV} at (0,147) size 769x136 [bgcolor=#FFFF00] + RenderBlock {DIV} at (192,0) size 385x60 [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 385x60 + RenderText {#text} at (0,0) size 326x59 + text run at (0,0) width 326: "This paragraph should be centered within its yellow" + text run at (0,20) width 323: "containing block and its width should be half of the" + text run at (0,40) width 109: "containing block." + RenderBlock {DIV} at (384,76) size 385x60 [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 385x60 + RenderText {#text} at (0,0) size 353x59 + text run at (0,0) width 353: "This paragraph should be right-aligned within its yellow" + text run at (0,20) width 323: "containing block and its width should be half of the" + text run at (0,40) width 109: "containing block." + RenderBlock {P} at (192,299) size 577x40 + RenderText {#text} at (0,0) size 549x39 + text run at (0,0) width 549: "This paragraph should have a left margin of 25% the width of its parent element, which" + text run at (0,20) width 356: "should require some extra text in order to test effectively." + RenderTable {TABLE} at (0,355) size 769x230 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 767x228 + RenderTableRow {TR} at (0,0) size 767x28 + RenderTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" + RenderTableRow {TR} at (0,28) size 767x200 + RenderTableCell {TD} at (0,114) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " - RenderTableCell {TD} at (12,28) size 770x180 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - RenderBlock {DIV} at (4,4) size 762x116 [bgcolor=#FFFF00] - RenderBlock {DIV} at (190,0) size 382x40 [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 381x40 - RenderText {#text} at (0,0) size 371x39 - text run at (0,0) width 371: "This paragraph should be centered within its yellow containing" - text run at (0,20) width 345: "block and its width should be half of the containing block." - RenderBlock {DIV} at (381,56) size 381x60 [bgcolor=#FFFFFF] - RenderBlock {P} at (0,0) size 381x60 - RenderText {#text} at (0,0) size 367x59 - text run at (0,0) width 329: "This paragraph should be right-aligned within its yellow" - text run at (0,20) width 367: "containing block and its width should be half of the containing" - text run at (0,40) width 38: "block." - RenderBlock {P} at (194,136) size 572x40 - RenderText {#text} at (0,0) size 561x39 - text run at (0,0) width 561: "This paragraph should have a left margin of 25% the width of its parent element, which should" - text run at (0,20) width 298: "require some extra text in order to test effectively." -layer at (8,137) size 784x2 clip at (0,0) size 0x0 - RenderBlock {HR} at (0,129) size 784x2 [border: (1px inset #000000)] + RenderTableCell {TD} at (12,28) size 755x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderBlock {DIV} at (4,4) size 747x136 [bgcolor=#FFFF00] + RenderBlock {DIV} at (186,0) size 375x60 [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 374x60 + RenderText {#text} at (0,0) size 326x59 + text run at (0,0) width 326: "This paragraph should be centered within its yellow" + text run at (0,20) width 323: "containing block and its width should be half of the" + text run at (0,40) width 109: "containing block." + RenderBlock {DIV} at (373,76) size 374x60 [bgcolor=#FFFFFF] + RenderBlock {P} at (0,0) size 374x60 + RenderText {#text} at (0,0) size 353x59 + text run at (0,0) width 353: "This paragraph should be right-aligned within its yellow" + text run at (0,20) width 323: "containing block and its width should be half of the" + text run at (0,40) width 109: "containing block." + RenderBlock {P} at (190,156) size 561x40 + RenderText {#text} at (0,0) size 549x39 + text run at (0,0) width 549: "This paragraph should have a left margin of 25% the width of its parent element, which" + text run at (0,20) width 356: "should require some extra text in order to test effectively." +layer at (8,137) size 769x2 clip at (0,0) size 0x0 + RenderBlock {HR} at (0,129) size 769x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css1/units/urls-expected.txt b/LayoutTests/platform/wincairo/css1/units/urls-expected.txt index ccf4d20d6859..473466bc75aa 100644 --- a/LayoutTests/platform/wincairo/css1/units/urls-expected.txt +++ b/LayoutTests/platform/wincairo/css1/units/urls-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" + RenderText {#text} at (0,0) size 355x19 + text run at (0,0) width 355: "The style declarations which apply to the text below are:" RenderBlock {PRE} at (0,36) size 784x64 RenderText {#text} at (0,0) size 648x64 text run at (0,0) width 648: "" @@ -16,46 +16,46 @@ layer at (0,0) size 800x600 text run at (352,32) width 0: " " text run at (0,48) width 0: " " RenderBlock {P} at (0,131) size 784x20 - RenderText {#text} at (0,0) size 368x19 - text run at (0,0) width 368: "This page should have a green grid pattern as its background." + RenderText {#text} at (0,0) size 386x19 + text run at (0,0) width 386: "This page should have a green grid pattern as its background." RenderBlock {P} at (0,167) size 784x60 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 778x59 - text run at (0,0) width 591: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (591,0) width 174: "If an image, in this case a red" - text run at (0,20) width 778: "square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the document's" - text run at (0,40) width 188: "URL, not the stylesheet's URL." + RenderText {#text} at (0,0) size 779x59 + text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " + text run at (620,0) width 159: "If an image, in this case a" + text run at (0,20) width 755: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" + text run at (0,40) width 274: "document's URL, not the stylesheet's URL." RenderBlock {P} at (0,243) size 784x60 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 778x59 - text run at (0,0) width 591: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (591,0) width 174: "If an image, in this case a red" - text run at (0,20) width 778: "square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the document's" - text run at (0,40) width 188: "URL, not the stylesheet's URL." + RenderText {#text} at (0,0) size 779x59 + text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " + text run at (620,0) width 159: "If an image, in this case a" + text run at (0,20) width 755: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" + text run at (0,40) width 274: "document's URL, not the stylesheet's URL." RenderTable {TABLE} at (0,319) size 784x210 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 782x208 RenderTableRow {TR} at (0,0) size 782x28 RenderTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - RenderInline {STRONG} at (0,0) size 159x19 - RenderText {#text} at (4,4) size 159x19 - text run at (4,4) width 159: "TABLE Testing Section" + RenderInline {STRONG} at (0,0) size 160x19 + RenderText {#text} at (4,4) size 160x19 + text run at (4,4) width 160: "TABLE Testing Section" RenderTableRow {TR} at (0,28) size 782x180 RenderTableCell {TD} at (0,104) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 4x19 text run at (4,4) width 4: " " RenderTableCell {TD} at (12,28) size 770x180 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderBlock {P} at (4,4) size 762x20 - RenderText {#text} at (0,0) size 368x19 - text run at (0,0) width 368: "This page should have a green grid pattern as its background." + RenderText {#text} at (0,0) size 386x19 + text run at (0,0) width 386: "This page should have a green grid pattern as its background." RenderBlock {P} at (4,40) size 762x60 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 741x59 - text run at (0,0) width 591: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (591,0) width 150: "If an image, in this case a" - text run at (0,20) width 730: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,40) width 260: "document's URL, not the stylesheet's URL." + RenderText {#text} at (0,0) size 758x59 + text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " + text run at (620,0) width 117: "If an image, in this" + text run at (0,20) width 758: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation" + text run at (0,40) width 313: "to the document's URL, not the stylesheet's URL." RenderBlock {P} at (4,116) size 762x60 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 741x59 - text run at (0,0) width 591: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (591,0) width 150: "If an image, in this case a" - text run at (0,20) width 730: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,40) width 260: "document's URL, not the stylesheet's URL." + RenderText {#text} at (0,0) size 758x59 + text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " + text run at (620,0) width 117: "If an image, in this" + text run at (0,20) width 758: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation" + text run at (0,40) width 313: "to the document's URL, not the stylesheet's URL." layer at (8,121) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,113) size 784x2 [border: (1px inset #000000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-001-expected.txt index fcc4697fa9f4..10e24a33740d 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x20 RenderBlock {HTML} at (0,0) size 800x20 RenderBody {BODY} at (0,0) size 800x20 RenderBlock {P} at (0,0) size 800x20 - RenderText {#text} at (0,0) size 492x19 - text run at (0,0) width 492: "Test passes the a filled blue square touches the upper-left corner of the black box." + RenderText {#text} at (0,0) size 510x19 + text run at (0,0) width 510: "Test passes the a filled blue square touches the upper-left corner of the black box." layer at (0,96) size 294x198 RenderBlock (positioned) {DIV} at (0,96) size 294x198 [border: (3px solid #000000)] layer at (3,99) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-002-expected.txt index 4fb06fe18128..23f58d111cc9 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 692x19 - text run at (0,0) width 692: "Test passes if the blue box below is in the upper-left corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 722x19 + text run at (0,0) width 722: "Test passes if the blue box below is in the upper-left corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (11,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-003-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-004-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-005-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-006-expected.txt index 598ad96c53bb..fa3d1b38381d 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-006-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x380 RenderBlock {HTML} at (0,0) size 800x380 RenderBody {BODY} at (8,16) size 784x356 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 288x19 - text run at (0,0) width 288: "Test passes if there is one blue box on the page." + RenderText {#text} at (0,0) size 299x19 + text run at (0,0) width 299: "Test passes if there is one blue box on the page." layer at (8,52) size 320x320 clip at (18,62) size 300x300 RenderBlock (relative positioned) {DIV} at (0,36) size 320x320 [border: (10px solid #000000)] layer at (18,162) size 150x150 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-007-expected.txt index 7bf26b4acac1..dd45a55314d9 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x444 RenderBlock {HTML} at (0,0) size 800x444 RenderBody {BODY} at (8,16) size 784x420 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the orange and blue boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the orange and blue boxes below are the same height." layer at (8,52) size 192x384 RenderBlock (relative positioned) {DIV} at (0,36) size 192x384 [color=#FFA500] layer at (8,52) size 192x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-008-expected.txt index 697065314e0c..d48233fd0589 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-008-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x348 RenderBlock {HTML} at (0,0) size 800x348 RenderBody {BODY} at (8,16) size 784x324 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "Test passes if there are two boxes below, a blue box below an orange box." + RenderText {#text} at (0,0) size 467x19 + text run at (0,0) width 467: "Test passes if there are two boxes below, a blue box below an orange box." layer at (8,52) size 96x288 RenderBlock (relative positioned) {DIV} at (0,36) size 96x288 [bgcolor=#0000FF] layer at (8,52) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-009-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-009-expected.txt index 3af85c444498..4b7f2f96a6c9 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-009-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-009-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the orange and blue boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the orange and blue boxes below are the same height." layer at (8,76) size 192x96 RenderBlock (positioned) {DIV} at (0,24) size 192x96 [color=#FFA500] [bgcolor=#0000FF] RenderText {#text} at (0,0) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-010-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-010-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-010-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-010-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-011-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-011-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-011-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-011-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-012-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-012-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-012-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-height-012-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt index 3520e71644bf..b0bf7b77e847 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x20 RenderBlock {HTML} at (0,0) size 800x20 RenderBody {BODY} at (0,0) size 800x20 RenderBlock {P} at (0,0) size 800x20 - RenderText {#text} at (0,0) size 409x19 - text run at (0,0) width 409: "Test passes the blue box is in the upper-left corner of the black box." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes the blue box is in the upper-left corner of the black box." layer at (0,20) size 198x198 RenderBlock (positioned) {DIV} at (0,20) size 198x198 [border: (3px solid #000000)] layer at (3,23) size 96x48 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt index d6df7d05a740..c7614663ffcb 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 583x19 - text run at (0,0) width 583: "Test passes if there is blue rectangle, and not a square, in the upper-right corner of the black box." + RenderText {#text} at (0,0) size 606x19 + text run at (0,0) width 606: "Test passes if there is blue rectangle, and not a square, in the upper-right corner of the black box." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (107,55) size 96x48 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt index b8a4801123d7..7a4e68634a58 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,175) size 288x48 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-006-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt index 51cba72aeec3..32e6ca31394e 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x444 RenderBlock {HTML} at (0,0) size 800x444 RenderBody {BODY} at (8,16) size 784x420 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 96x384 RenderBlock (relative positioned) {DIV} at (0,36) size 96x384 layer at (8,100) size 96x48 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt index 1ab763bf0c57..ee64c2f98849 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-008-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x348 RenderBlock {HTML} at (0,0) size 800x348 RenderBody {BODY} at (8,16) size 784x324 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "Test passes if there are two boxes below, a blue box below an orange box." + RenderText {#text} at (0,0) size 467x19 + text run at (0,0) width 467: "Test passes if there are two boxes below, a blue box below an orange box." layer at (8,52) size 96x288 RenderBlock (relative positioned) {DIV} at (0,36) size 96x288 [bgcolor=#0000FF] layer at (8,52) size 96x48 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt index 202afc73152a..bcf73c81f8ce 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-009-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the orange and blue boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the orange and blue boxes below are the same height." layer at (104,76) size 96x48 RenderBlock (positioned) {DIV} at (96,24) size 96x48 [bgcolor=#0000FF] layer at (8,76) size 96x48 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-010-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt index b8a4801123d7..7a4e68634a58 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-011-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,175) size 288x48 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt index 88913423dc37..8cf3bcd6e85a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-max-height-012-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 389x19 - text run at (0,0) width 389: "Test passes if the blue box is vertically centered in the black box." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "Test passes if the blue box is vertically centered in the black box." layer at (8,52) size 294x294 RenderBlock (relative positioned) {DIV} at (0,36) size 294x294 [border: (3px solid #000000)] layer at (11,151) size 288x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-001-expected.txt index c7dc1fc80673..52487e28d6a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 651x19 - text run at (0,0) width 651: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 679x19 + text run at (0,0) width 679: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (11,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-002-expected.txt index 0442b19d1c90..6dbde2d1a312 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 659x19 - text run at (0,0) width 659: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 688x19 + text run at (0,0) width 688: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (107,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-003-expected.txt index f96a6f15425c..f3f984f56566 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 708x19 - text run at (0,0) width 708: "Test passes if the blue square in in the upper-right corner of the black rectangle and there is no red visible on the page." + RenderText {#text} at (0,0) size 740x19 + text run at (0,0) width 740: "Test passes if the blue square in in the upper-right corner of the black rectangle and there is no red visible on the page." layer at (8,52) size 390x198 RenderBlock (relative positioned) {DIV} at (0,36) size 390x198 [border: (3px solid #000000)] layer at (299,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-004-expected.txt index 44c0f44eeb37..d4e3e59ac107 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 655x19 - text run at (0,0) width 655: "Test passes if the blue box fills the upper-right corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 685x19 + text run at (0,0) width 685: "Test passes if the blue box fills the upper-right corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (107,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-005-expected.txt index c0c9460fd035..1a51af2ac6fa 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 647x19 - text run at (0,0) width 647: "Test passes if the blue box fills the upper-left corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 676x19 + text run at (0,0) width 676: "Test passes if the blue box fills the upper-left corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (11,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-006-expected.txt index 0442b19d1c90..6dbde2d1a312 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-006-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 659x19 - text run at (0,0) width 659: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 688x19 + text run at (0,0) width 688: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (107,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-007-expected.txt index c7dc1fc80673..52487e28d6a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 651x19 - text run at (0,0) width 651: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 679x19 + text run at (0,0) width 679: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (11,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-008-expected.txt index c373e896ef02..b10bd5f37b37 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-008-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 699x19 - text run at (0,0) width 699: "Test passes if the blue square is in the upper-left corner of the black rectangle and there is no red visible on the page." + RenderText {#text} at (0,0) size 729x19 + text run at (0,0) width 729: "Test passes if the blue square is in the upper-left corner of the black rectangle and there is no red visible on the page." layer at (8,52) size 294x198 RenderBlock (relative positioned) {DIV} at (0,36) size 294x198 [border: (3px solid #000000)] layer at (11,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-009-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-009-expected.txt index 113671b2cdb7..53f045b47673 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-009-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-009-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 707x19 - text run at (0,0) width 707: "Test passes if the blue square is in the upper-right corner of the black rectangle and there is no red visible on the page." + RenderText {#text} at (0,0) size 738x19 + text run at (0,0) width 738: "Test passes if the blue square is in the upper-right corner of the black rectangle and there is no red visible on the page." layer at (8,52) size 294x198 RenderBlock (relative positioned) {DIV} at (0,36) size 294x198 [border: (3px solid #000000)] layer at (203,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-010-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-010-expected.txt index c7dc1fc80673..52487e28d6a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-010-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-010-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 651x19 - text run at (0,0) width 651: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 679x19 + text run at (0,0) width 679: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (11,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-011-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-011-expected.txt index c7dc1fc80673..52487e28d6a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-011-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-011-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 651x19 - text run at (0,0) width 651: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 679x19 + text run at (0,0) width 679: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (11,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-012-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-012-expected.txt index 0442b19d1c90..6dbde2d1a312 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-012-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-012-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 659x19 - text run at (0,0) width 659: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 688x19 + text run at (0,0) width 688: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (107,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-013-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-013-expected.txt index 0442b19d1c90..6dbde2d1a312 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-013-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-013-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 659x19 - text run at (0,0) width 659: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 688x19 + text run at (0,0) width 688: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (107,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-014-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-014-expected.txt index c7dc1fc80673..52487e28d6a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-014-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-014-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 651x19 - text run at (0,0) width 651: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 679x19 + text run at (0,0) width 679: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (11,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-015-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-015-expected.txt index 30ae0cc54663..2725b3c8c3f5 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-015-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-015-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 637x19 - text run at (0,0) width 637: "Test passes if the blue box is horizontally centered inside black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 668x19 + text run at (0,0) width 668: "Test passes if the blue box is horizontally centered inside black box and there is no red visible on the page." layer at (8,52) size 294x198 RenderBlock (relative positioned) {DIV} at (0,36) size 294x198 [border: (3px solid #000000)] layer at (107,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-016-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-016-expected.txt index 0442b19d1c90..6dbde2d1a312 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-016-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-016-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 659x19 - text run at (0,0) width 659: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 688x19 + text run at (0,0) width 688: "Test passes if the blue box is in the upper-right corner of the black box and there is no red visible on the page." layer at (8,52) size 198x198 RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] layer at (107,55) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-017-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-017-expected.txt index 3adb2d6bf793..8a48fd8de06f 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-017-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-017-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x72 RenderBlock {HTML} at (0,0) size 800x72 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." layer at (8,72) size 128x128 RenderBlock (positioned) {DIV} at (8,72) size 128x128 [bgcolor=#FF0000] RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-018-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-018-expected.txt index 588d8db1f7e0..193af32a61ad 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-018-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-018-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x72 RenderBlock {HTML} at (0,0) size 800x72 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." layer at (8,72) size 128x128 RenderBlock (positioned) {DIV} at (8,72) size 128x128 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-019-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-019-expected.txt index 051ae88d5eed..3ead0a2562ed 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-019-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-019-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x72 RenderBlock {HTML} at (0,0) size 800x72 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." layer at (8,72) size 128x128 RenderBlock (positioned) {DIV} at (8,72) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-020-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-020-expected.txt index 2b9548bf7559..64449ea88c35 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-020-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-020-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x72 RenderBlock {HTML} at (0,0) size 800x72 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." layer at (8,72) size 128x128 RenderBlock (positioned) {DIV} at (8,72) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {SPAN} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-021-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-021-expected.txt index 4313205cef8f..1f2de23ee8b4 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-021-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-021-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x72 RenderBlock {HTML} at (0,0) size 800x72 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 775x39 - text run at (0,0) width 775: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal stripe" - text run at (0,20) width 587: "should be traversing it and protruding out of it toward the left. There should be no red in this page." + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal" + text run at (0,20) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." layer at (664,72) size 128x128 RenderBlock (positioned) {DIV} at (664,72) size 128x128 [bgcolor=#FF0000] RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-022-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-022-expected.txt index f9cdd2f7a135..e06735b63fe4 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-022-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-022-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x72 RenderBlock {HTML} at (0,0) size 800x72 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 775x39 - text run at (0,0) width 775: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal stripe" - text run at (0,20) width 587: "should be traversing it and protruding out of it toward the left. There should be no red in this page." + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal" + text run at (0,20) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." layer at (664,72) size 128x128 RenderBlock (positioned) {DIV} at (664,72) size 128x128 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-023-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-023-expected.txt index 916acbd981a5..ebb4ba7d20a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-023-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-023-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x72 RenderBlock {HTML} at (0,0) size 800x72 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 775x39 - text run at (0,0) width 775: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal stripe" - text run at (0,20) width 587: "should be traversing it and protruding out of it toward the left. There should be no red in this page." + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal" + text run at (0,20) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." layer at (664,72) size 128x128 RenderBlock (positioned) {DIV} at (664,72) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-024-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-024-expected.txt index f106f2b26c5d..78f6e4a1ef17 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-024-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-non-replaced-width-024-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x72 RenderBlock {HTML} at (0,0) size 800x72 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 775x39 - text run at (0,0) width 775: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal stripe" - text run at (0,20) width 587: "should be traversing it and protruding out of it toward the left. There should be no red in this page." + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Below, on the right edge of the page, there should be a green square. In the middle of such green square, a black horizontal" + text run at (0,20) width 656: "stripe should be traversing it and protruding out of it toward the left. There should be no red in this page." layer at (664,72) size 128x128 RenderBlock (positioned) {DIV} at (664,72) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {SPAN} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-001-expected.txt index d530632d4b97..d0995c76f023 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x81 RenderBlock {HTML} at (0,0) size 800x81 RenderBody {BODY} at (8,16) size 784x57 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 523x19 - text run at (0,0) width 523: "Test passes if there is no white space between the blue box below and the orange lines." + RenderText {#text} at (0,0) size 546x19 + text run at (0,0) width 546: "Test passes if there is no white space between the blue box below and the orange lines." RenderBlock {DIV} at (0,36) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] layer at (8,55) size 15x15 RenderImage {IMG} at (8,55) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-002-expected.txt index 7fe1b8d08f52..4fa623246338 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 15x15 RenderImage {IMG} at (0,0) size 15x15 layer at (23,52) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-003-expected.txt index ddc409c158da..986fa0ee3cec 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 96x96 RenderImage {IMG} at (0,0) size 96x96 layer at (104,52) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-004-expected.txt index 9eedf65f16b9..8760788d84f1 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 306x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-005-expected.txt index a30503c3b902..8f25c5f32282 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 layer at (8,52) size 306x102 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-007-expected.txt index 7d9190da6669..236946045701 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 306x6 RenderIFrame {IFRAME} at (0,0) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-008-expected.txt index 7795e01b0e43..a2ca8d49778a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-008-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x78 RenderBlock {HTML} at (0,0) size 800x78 RenderBody {BODY} at (8,16) size 784x54 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x18 RenderBlock (relative positioned) {DIV} at (0,36) size 784x18 [border: (3px solid #000000) none] layer at (8,151) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-009-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-009-expected.txt index 04778a890414..c54cf7250bbb 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-009-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-009-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x63 RenderBlock {HTML} at (0,0) size 800x63 RenderBody {BODY} at (8,16) size 784x39 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x3 RenderBlock (relative positioned) {DIV} at (0,36) size 784x3 [border: (3px solid #000000) none] layer at (8,151) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-010-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-010-expected.txt index 6be882ef7b28..610b207d23db 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-010-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-010-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x63 RenderBlock {HTML} at (0,0) size 800x63 RenderBody {BODY} at (8,16) size 784x39 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x3 RenderBlock (relative positioned) {DIV} at (0,36) size 784x3 [border: (3px solid #000000) none] layer at (8,151) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-011-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-011-expected.txt index 193450c974dd..5ee98503260c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-011-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-011-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,148) size 306x156 RenderIFrame {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-012-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-012-expected.txt index 7df084801d1e..a9e94738bac7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-012-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-012-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 layer at (8,148) size 306x102 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-014-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-014-expected.txt index eb367fd035d3..d83453993190 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-014-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-014-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,148) size 306x6 RenderIFrame {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-016-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-016-expected.txt index 04778a890414..c54cf7250bbb 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-016-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-016-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x63 RenderBlock {HTML} at (0,0) size 800x63 RenderBody {BODY} at (8,16) size 784x39 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x3 RenderBlock (relative positioned) {DIV} at (0,36) size 784x3 [border: (3px solid #000000) none] layer at (8,151) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-017-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-017-expected.txt index 6be882ef7b28..610b207d23db 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-017-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-017-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x63 RenderBlock {HTML} at (0,0) size 800x63 RenderBody {BODY} at (8,16) size 784x39 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x3 RenderBlock (relative positioned) {DIV} at (0,36) size 784x3 [border: (3px solid #000000) none] layer at (8,151) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-018-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-018-expected.txt index 193450c974dd..5ee98503260c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-018-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-018-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,148) size 306x156 RenderIFrame {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-019-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-019-expected.txt index 7df084801d1e..a9e94738bac7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-019-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-019-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 layer at (8,148) size 306x102 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-021-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-021-expected.txt index eb367fd035d3..d83453993190 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-021-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-021-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,148) size 306x6 RenderIFrame {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-022-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-022-expected.txt index 7795e01b0e43..a2ca8d49778a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-022-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-022-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x78 RenderBlock {HTML} at (0,0) size 800x78 RenderBody {BODY} at (8,16) size 784x54 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x18 RenderBlock (relative positioned) {DIV} at (0,36) size 784x18 [border: (3px solid #000000) none] layer at (8,151) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-023-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-023-expected.txt index 04778a890414..c54cf7250bbb 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-023-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-023-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x63 RenderBlock {HTML} at (0,0) size 800x63 RenderBody {BODY} at (8,16) size 784x39 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x3 RenderBlock (relative positioned) {DIV} at (0,36) size 784x3 [border: (3px solid #000000) none] layer at (8,151) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-024-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-024-expected.txt index 6be882ef7b28..610b207d23db 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-024-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-024-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x63 RenderBlock {HTML} at (0,0) size 800x63 RenderBody {BODY} at (8,16) size 784x39 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x3 RenderBlock (relative positioned) {DIV} at (0,36) size 784x3 [border: (3px solid #000000) none] layer at (8,151) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-025-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-025-expected.txt index 193450c974dd..5ee98503260c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-025-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-025-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,148) size 306x156 RenderIFrame {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-026-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-026-expected.txt index 7df084801d1e..a9e94738bac7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-026-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-026-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 layer at (8,148) size 306x102 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-028-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-028-expected.txt index eb367fd035d3..d83453993190 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-028-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-028-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,148) size 306x6 RenderIFrame {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-029-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-029-expected.txt index 7795e01b0e43..a2ca8d49778a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-029-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-029-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x78 RenderBlock {HTML} at (0,0) size 800x78 RenderBody {BODY} at (8,16) size 784x54 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x18 RenderBlock (relative positioned) {DIV} at (0,36) size 784x18 [border: (3px solid #000000) none] layer at (8,151) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-030-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-030-expected.txt index 04778a890414..c54cf7250bbb 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-030-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-030-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x63 RenderBlock {HTML} at (0,0) size 800x63 RenderBody {BODY} at (8,16) size 784x39 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x3 RenderBlock (relative positioned) {DIV} at (0,36) size 784x3 [border: (3px solid #000000) none] layer at (8,151) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-031-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-031-expected.txt index 6be882ef7b28..610b207d23db 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-031-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-031-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x63 RenderBlock {HTML} at (0,0) size 800x63 RenderBody {BODY} at (8,16) size 784x39 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 490x19 - text run at (0,0) width 490: "Test passes if there is a single blue box below and it does not touch the black line." + RenderText {#text} at (0,0) size 513x19 + text run at (0,0) width 513: "Test passes if there is a single blue box below and it does not touch the black line." layer at (8,52) size 784x3 RenderBlock (relative positioned) {DIV} at (0,36) size 784x3 [border: (3px solid #000000) none] layer at (8,151) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-032-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-032-expected.txt index 193450c974dd..5ee98503260c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-032-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-032-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,148) size 306x156 RenderIFrame {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)] layer at (0,0) size 300x150 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-033-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-033-expected.txt index 7df084801d1e..a9e94738bac7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-033-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-033-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 layer at (8,148) size 306x102 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-035-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-035-expected.txt index eb367fd035d3..d83453993190 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-035-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-035-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,148) size 306x6 RenderIFrame {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)] layer at (0,0) size 285x8 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-036-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-036-expected.txt index 9df21d079cfd..b1e6384cc0ac 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-036-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-height-036-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x105 RenderBlock {HTML} at (0,0) size 800x105 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 133x19 - text run at (0,0) width 133: "There must be no red." + RenderText {#text} at (0,0) size 138x19 + text run at (0,0) width 138: "There must be no red." layer at (8,52) size 45x45 RenderBlock (relative positioned) {DIV} at (0,36) size 45x45 RenderBlock {DIV} at (0,0) size 45x15 [border: none (15px solid #FF0000) none] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-001-expected.txt index 534cc97c3fef..cab65b4ef23e 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-001-expected.txt @@ -1,12 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." + RenderBlock {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (3,18) size 15x15 [bgcolor=#FFA500] -layer at (11,55) size 15x15 - RenderImage {IMG} at (11,55) size 15x15 +layer at (11,75) size 15x15 + RenderImage {IMG} at (11,75) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-006-expected.txt index a553cba2d34b..6c1010e1d8d6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-006-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (3,99) size 96x96 [bgcolor=#FFA500] -layer at (11,55) size 96x96 +layer at (11,75) size 96x96 RenderImage {IMG} at (3,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-008-expected.txt index 534cc97c3fef..cab65b4ef23e 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-008-expected.txt @@ -1,12 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." + RenderBlock {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (3,18) size 15x15 [bgcolor=#FFA500] -layer at (11,55) size 15x15 - RenderImage {IMG} at (11,55) size 15x15 +layer at (11,75) size 15x15 + RenderImage {IMG} at (11,75) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-013-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-013-expected.txt index a553cba2d34b..6c1010e1d8d6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-013-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-013-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (3,99) size 96x96 [bgcolor=#FFA500] -layer at (11,55) size 96x96 +layer at (11,75) size 96x96 RenderImage {IMG} at (3,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-015-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-015-expected.txt index 3e360a3785f5..4ec1f23a6ebb 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-015-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-015-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 778x19 - text run at (0,0) width 778: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black box." -layer at (8,52) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 779: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (180,18) size 15x15 [bgcolor=#FFA500] -layer at (188,55) size 15x15 +layer at (188,75) size 15x15 RenderImage {IMG} at (180,3) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-020-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-020-expected.txt index d5ea07d65083..e6bb9e0f2cb2 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-020-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-020-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 778x19 - text run at (0,0) width 778: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 779: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,55) size 96x96 +layer at (107,75) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-022-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-022-expected.txt index 6cbba6f70130..743ec04ad075 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-022-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-022-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 778x19 - text run at (0,0) width 778: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black box." -layer at (8,52) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 779: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,55) size 96x96 +layer at (107,75) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-027-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-027-expected.txt index d5ea07d65083..e6bb9e0f2cb2 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-027-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-027-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 778x19 - text run at (0,0) width 778: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 779: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,55) size 96x96 +layer at (107,75) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-029-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-029-expected.txt index 6cbba6f70130..743ec04ad075 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-029-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-029-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 778x19 - text run at (0,0) width 778: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black box." -layer at (8,52) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 779: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,55) size 96x96 +layer at (107,75) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-034-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-034-expected.txt index d5ea07d65083..e6bb9e0f2cb2 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-034-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-034-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 778x19 - text run at (0,0) width 778: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 779: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (99,99) size 96x96 [bgcolor=#FFA500] -layer at (107,55) size 96x96 +layer at (107,75) size 96x96 RenderImage {IMG} at (99,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-036-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-036-expected.txt index 3edb4006d04e..d75eb122d7f7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-036-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-036-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-041-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-041-expected.txt index ee8228a09cd0..5c23f49115ec 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-041-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-041-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-043-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-043-expected.txt index 3edb4006d04e..d75eb122d7f7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-043-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-043-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-048-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-048-expected.txt index ee8228a09cd0..5c23f49115ec 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-048-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-048-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-050-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-050-expected.txt index 3edb4006d04e..d75eb122d7f7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-050-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-050-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-055-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-055-expected.txt index ee8228a09cd0..5c23f49115ec 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-055-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-055-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-057-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-057-expected.txt index 3edb4006d04e..d75eb122d7f7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-057-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-057-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-062-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-062-expected.txt index ee8228a09cd0..5c23f49115ec 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-062-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-062-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-064-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-064-expected.txt index 3edb4006d04e..d75eb122d7f7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-064-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-064-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-069-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-069-expected.txt index ee8228a09cd0..5c23f49115ec 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-069-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-069-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-071-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-071-expected.txt index 3edb4006d04e..d75eb122d7f7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-071-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-071-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x198 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x198 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-076-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-076-expected.txt index ee8228a09cd0..5c23f49115ec 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-076-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/absolute-replaced-width-076-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 772x19 - text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black box." -layer at (8,52) size 198x294 - RenderBlock (relative positioned) {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black" + text run at (0,20) width 28: "box." +layer at (8,72) size 198x294 + RenderBlock (relative positioned) {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock {DIV} at (51,99) size 96x96 [bgcolor=#FFA500] -layer at (59,55) size 96x96 +layer at (59,75) size 96x96 RenderImage {IMG} at (51,3) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-001-expected.txt index 9092d32821d7..1d46d74c9755 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x284 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 304x19 - text run at (0,0) width 304: "There must be two green boxes below and no red." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "There must be two green boxes below and no red." layer at (16,52) size 120x120 RenderBlock (relative positioned) {DIV} at (8,36) size 120x120 [bgcolor=#008000] layer at (26,62) size 80x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-002-expected.txt index 2c431c7dd70d..0c784f6e6986 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x284 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 304x19 - text run at (0,0) width 304: "There must be two green boxes below and no red." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "There must be two green boxes below and no red." layer at (16,52) size 120x120 RenderBlock (relative positioned) {DIV} at (8,36) size 120x120 [bgcolor=#008000] layer at (26,62) size 60x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-003-expected.txt index 4af3db15f8a6..ca317514125a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x284 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 304x19 - text run at (0,0) width 304: "There must be two green boxes below and no red." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "There must be two green boxes below and no red." layer at (16,52) size 120x120 RenderBlock (relative positioned) {DIV} at (8,36) size 120x120 [bgcolor=#008000] layer at (26,62) size 80x60 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-004-expected.txt index 738038cb8222..c0ca6ac9d644 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x284 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 304x19 - text run at (0,0) width 304: "There must be two green boxes below and no red." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "There must be two green boxes below and no red." layer at (16,52) size 120x120 RenderBlock (relative positioned) {DIV} at (8,36) size 120x120 [bgcolor=#008000] layer at (26,62) size 66x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-005-expected.txt index 144b26776b29..ac7e94707897 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x284 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 304x19 - text run at (0,0) width 304: "There must be two green boxes below and no red." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "There must be two green boxes below and no red." layer at (16,52) size 120x120 RenderBlock (relative positioned) {DIV} at (8,36) size 120x120 [bgcolor=#008000] layer at (26,62) size 80x53 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-006-expected.txt index 25409445ec2e..211966e87377 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-006-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x284 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 304x19 - text run at (0,0) width 304: "There must be two green boxes below and no red." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "There must be two green boxes below and no red." layer at (16,52) size 120x120 RenderBlock (relative positioned) {DIV} at (8,36) size 120x120 [bgcolor=#008000] layer at (26,62) size 32x60 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-007-expected.txt index df0a10af5736..731d92a59ffe 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x284 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 304x19 - text run at (0,0) width 304: "There must be two green boxes below and no red." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "There must be two green boxes below and no red." layer at (16,52) size 120x120 RenderBlock (relative positioned) {DIV} at (8,36) size 120x120 [bgcolor=#008000] layer at (26,62) size 40x60 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-008-expected.txt index df0a10af5736..731d92a59ffe 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-008-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x284 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 304x19 - text run at (0,0) width 304: "There must be two green boxes below and no red." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "There must be two green boxes below and no red." layer at (16,52) size 120x120 RenderBlock (relative positioned) {DIV} at (8,36) size 120x120 [bgcolor=#008000] layer at (26,62) size 40x60 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-009-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-009-expected.txt index df0a10af5736..731d92a59ffe 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-009-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/background-intrinsic-009-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x284 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 304x19 - text run at (0,0) width 304: "There must be two green boxes below and no red." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "There must be two green boxes below and no red." layer at (16,52) size 120x120 RenderBlock (relative positioned) {DIV} at (8,36) size 120x120 [bgcolor=#008000] layer at (26,62) size 40x60 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-001-expected.txt index 0d531a95185c..1633ab4876aa 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-001-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x86 RenderBlock {HTML} at (0,0) size 800x86 RenderBody {BODY} at (8,16) size 784x62 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 523x19 - text run at (0,0) width 523: "Test passes if there is no white space between the blue box below and the orange lines." + RenderText {#text} at (0,0) size 546x19 + text run at (0,0) width 546: "Test passes if there is no white space between the blue box below and the orange lines." RenderBlock {DIV} at (0,36) size 96x26 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderBlock {DIV} at (0,3) size 96x20 [bgcolor=#0000FF] - RenderText {#text} at (0,0) size 61x19 - text run at (0,0) width 61: "Filler Text" + RenderText {#text} at (0,0) size 65x19 + text run at (0,0) width 65: "Filler Text" diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-002-expected.txt index 2adb86d65715..dd6d50eccac6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-002-expected.txt @@ -5,9 +5,9 @@ layer at (0,0) size 785x109 layer at (8,8) size 769x93 clip at (8,8) size 754x78 RenderBody {BODY} at (8,8) size 769x93 RenderBlock {P} at (0,16) size 754x20 - RenderText {#text} at (0,0) size 523x19 - text run at (0,0) width 523: "Test passes if there is no white space between the blue box below and the orange lines." + RenderText {#text} at (0,0) size 546x19 + text run at (0,0) width 546: "Test passes if there is no white space between the blue box below and the orange lines." RenderBlock {DIV} at (0,52) size 96x26 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderBlock {DIV} at (0,3) size 96x20 [bgcolor=#0000FF] - RenderText {#text} at (0,0) size 61x19 - text run at (0,0) width 61: "Filler Text" + RenderText {#text} at (0,0) size 65x19 + text run at (0,0) width 65: "Filler Text" diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-003-expected.txt index ef5f2a6dedb1..7f4275de65c0 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 layer at (8,52) size 96x192 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-004-expected.txt index 17078df5c5a6..7afda5f9fdee 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-004-expected.txt @@ -5,8 +5,8 @@ layer at (0,0) size 785x275 layer at (8,8) size 769x259 clip at (8,8) size 754x244 RenderBody {BODY} at (8,8) size 769x259 RenderBlock {P} at (0,16) size 754x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,60) size 754x192 RenderBlock (relative positioned) {DIV} at (0,52) size 754x192 layer at (8,60) size 96x192 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-005-expected.txt index 90321b2b3620..84b90787e1ba 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "Test passes if the blue and orange boxes below are the same height and there is no red visible on the page." + RenderText {#text} at (0,0) size 666x19 + text run at (0,0) width 666: "Test passes if the blue and orange boxes below are the same height and there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 layer at (8,52) size 192x192 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-006-expected.txt index 4760946aa007..1008b7a8ba2e 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-006-expected.txt @@ -5,8 +5,8 @@ layer at (0,0) size 785x275 layer at (8,8) size 769x259 clip at (8,8) size 754x244 RenderBody {BODY} at (8,8) size 769x259 RenderBlock {P} at (0,16) size 754x20 - RenderText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "Test passes if the blue and orange boxes below are the same height and there is no red visible on the page." + RenderText {#text} at (0,0) size 666x19 + text run at (0,0) width 666: "Test passes if the blue and orange boxes below are the same height and there is no red visible on the page." layer at (8,60) size 754x192 RenderBlock (relative positioned) {DIV} at (0,52) size 754x192 layer at (8,60) size 192x192 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-007-expected.txt index 9125d0f54125..2abdb14b440c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x324 RenderBlock {HTML} at (0,0) size 800x324 RenderBody {BODY} at (8,16) size 784x260 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 257x19 - text run at (0,0) width 257: "Test passes if there is a blue square below." + RenderText {#text} at (0,0) size 265x19 + text run at (0,0) width 265: "Test passes if there is a blue square below." layer at (8,84) size 784x192 RenderBlock (relative positioned) {DIV} at (0,68) size 784x192 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] [border: (48px solid #0000FF) none] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-008-expected.txt index 9cbc1a57a245..5e53522e21e6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-008-expected.txt @@ -5,8 +5,8 @@ layer at (0,0) size 785x355 layer at (8,8) size 769x339 clip at (8,8) size 754x324 RenderBody {BODY} at (8,8) size 769x339 RenderBlock {P} at (0,16) size 754x20 - RenderText {#text} at (0,0) size 257x19 - text run at (0,0) width 257: "Test passes if there is a blue square below." + RenderText {#text} at (0,0) size 265x19 + text run at (0,0) width 265: "Test passes if there is a blue square below." layer at (8,92) size 754x192 RenderBlock (relative positioned) {DIV} at (0,84) size 754x192 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] [border: (48px solid #0000FF) none] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-009-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-009-expected.txt index 776a81a35e70..46014477f2ee 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-009-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-009-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 257x19 - text run at (0,0) width 257: "Test passes if there is a blue square below." + RenderText {#text} at (0,0) size 265x19 + text run at (0,0) width 265: "Test passes if there is a blue square below." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 RenderBlock {DIV} at (0,0) size 96x192 [bgcolor=#0000FF] [border: (24px solid #0000FF) none (24px solid #0000FF) none] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-010-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-010-expected.txt index 1f1fcb9c58f7..4c704fc18bdc 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-010-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-010-expected.txt @@ -5,8 +5,8 @@ layer at (0,0) size 785x275 layer at (8,8) size 769x259 clip at (8,8) size 754x244 RenderBody {BODY} at (8,8) size 769x259 RenderBlock {P} at (0,16) size 754x20 - RenderText {#text} at (0,0) size 257x19 - text run at (0,0) width 257: "Test passes if there is a blue square below." + RenderText {#text} at (0,0) size 265x19 + text run at (0,0) width 265: "Test passes if there is a blue square below." layer at (8,60) size 754x192 RenderBlock (relative positioned) {DIV} at (0,52) size 754x192 RenderBlock {DIV} at (0,0) size 96x192 [bgcolor=#0000FF] [border: (24px solid #0000FF) none (24px solid #0000FF) none] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-011-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-011-expected.txt index 59ac5ac65261..5ae4ac8c0421 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-011-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-011-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x148 RenderBlock {HTML} at (0,0) size 800x148 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." RenderBlock {DIV} at (0,36) size 784x0 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-012-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-012-expected.txt index ab399091acba..2e38857182e7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-012-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-012-expected.txt @@ -5,7 +5,7 @@ layer at (0,0) size 785x179 layer at (8,8) size 769x163 clip at (8,8) size 754x148 RenderBody {BODY} at (8,8) size 769x163 RenderBlock {P} at (0,16) size 754x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." RenderBlock {DIV} at (0,52) size 754x0 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-013-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-013-expected.txt index 62ae2d78a235..335e0dd9c7a9 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-013-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-013-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." RenderBlock {DIV} at (0,36) size 784x0 [bgcolor=#FF0000] layer at (8,52) size 96x96 RenderBlock (positioned) {DIV} at (8,52) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-014-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-014-expected.txt index eb82c98c9be5..35effd898e91 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-014-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-014-expected.txt @@ -5,8 +5,8 @@ layer at (0,0) size 785x83 layer at (8,8) size 769x67 clip at (8,8) size 754x52 RenderBody {BODY} at (8,8) size 769x67 RenderBlock {P} at (0,16) size 754x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." RenderBlock {DIV} at (0,52) size 754x0 [bgcolor=#FF0000] layer at (8,60) size 96x96 RenderBlock (positioned) {DIV} at (8,60) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-015-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-015-expected.txt index 38a7d6f91bda..445f003280f9 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-015-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-015-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x156 RenderBlock {HTML} at (0,0) size 800x156 RenderBody {BODY} at (8,16) size 784x132 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x96 RenderBlock (relative positioned) {DIV} at (0,36) size 784x96 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-016-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-016-expected.txt index e745ef9ec1e6..0bdd954bf2d1 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-016-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-height-016-expected.txt @@ -5,8 +5,8 @@ layer at (0,0) size 785x179 layer at (8,8) size 769x163 clip at (8,8) size 754x148 scrollHeight 244 RenderBody {BODY} at (8,8) size 769x163 RenderBlock {P} at (0,16) size 754x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,60) size 754x96 RenderBlock (relative positioned) {DIV} at (0,52) size 754x96 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-001-expected.txt index 9a15520c9b37..0c530eb3d494 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x95 RenderBlock {HTML} at (0,0) size 800x95 RenderBody {BODY} at (8,16) size 784x71 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 405x19 - text run at (0,0) width 405: "Test passes if the orange and blue boxes below are the same width." + RenderText {#text} at (0,0) size 421x19 + text run at (0,0) width 421: "Test passes if the orange and blue boxes below are the same width." RenderBlock (anonymous) at (0,36) size 784x35 RenderBlock {DIV} at (0,0) size 150x30 [bgcolor=#FFA500] [border: (5px solid #FFA500)] RenderBlock {DIV} at (15,5) size 120x20 [border: none (10px solid #FFA500) none (10px solid #FFA500)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-002-expected.txt index 5bf6b0db737e..309047c47fc0 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x90 RenderBlock {HTML} at (0,0) size 800x90 RenderBody {BODY} at (8,16) size 784x66 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 405x19 - text run at (0,0) width 405: "Test passes if the orange and blue boxes below are the same width." + RenderText {#text} at (0,0) size 421x19 + text run at (0,0) width 421: "Test passes if the orange and blue boxes below are the same width." RenderBlock {DIV} at (0,36) size 100x30 RenderBlock {DIV} at (0,0) size 150x30 [bgcolor=#FFA500] [border: none (10px solid #FFA500) none (10px solid #FFA500)] layer at (8,82) size 150x30 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-003-expected.txt index 02c6ca53558c..ede656e247f1 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x90 RenderBlock {HTML} at (0,0) size 800x90 RenderBody {BODY} at (8,16) size 784x66 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 405x19 - text run at (0,0) width 405: "Test passes if the orange and blue boxes below are the same width." + RenderText {#text} at (0,0) size 421x19 + text run at (0,0) width 421: "Test passes if the orange and blue boxes below are the same width." RenderBlock {DIV} at (0,36) size 100x30 [bgcolor=#FFA500] RenderBlock {DIV} at (10,0) size 140x30 [border: none (10px solid #FFA500) none (10px solid #FFA500)] layer at (8,82) size 150x30 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-004-expected.txt index 80abf48e14be..33624d4ac83a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x90 RenderBlock {HTML} at (0,0) size 800x90 RenderBody {BODY} at (8,16) size 784x66 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 405x19 - text run at (0,0) width 405: "Test passes if the orange and blue boxes below are the same width." + RenderText {#text} at (0,0) size 421x19 + text run at (0,0) width 421: "Test passes if the orange and blue boxes below are the same width." layer at (8,52) size 784x30 RenderBlock (relative positioned) {DIV} at (0,36) size 784x30 layer at (692,52) size 100x30 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-005-expected.txt index b9cbac7b3f24..2dc22b1a8643 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-005-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x92 RenderBlock {HTML} at (0,0) size 800x92 RenderBody {BODY} at (0,16) size 800x76 RenderBlock {P} at (0,0) size 800x20 - RenderText {#text} at (0,0) size 611x19 - text run at (0,0) width 611: "Test passes if the box below spans the entire width of the page and there is no red visible on the page." + RenderText {#text} at (0,0) size 638x19 + text run at (0,0) width 638: "Test passes if the box below spans the entire width of the page and there is no red visible on the page." RenderBlock {DIV} at (0,36) size 800x40 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 800x40 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-006-expected.txt index 6799cefc9d88..49a04fd4ab87 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-006-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x92 RenderBlock {HTML} at (0,0) size 800x92 RenderBody {BODY} at (0,16) size 800x76 RenderBlock {P} at (0,0) size 800x20 - RenderText {#text} at (0,0) size 611x19 - text run at (0,0) width 611: "Test passes if the box below spans the entire width of the page and there is no red visible on the page." + RenderText {#text} at (0,0) size 638x19 + text run at (0,0) width 638: "Test passes if the box below spans the entire width of the page and there is no red visible on the page." RenderBlock {DIV} at (0,36) size 800x40 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 800x40 [bgcolor=#008000] [border: (10px solid #008000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-007-expected.txt index d078997cb53f..d6f4a63dc03f 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 664x19 - text run at (0,0) width 664: "Test passes if the blue and orange boxes are the same width and the blue box is directly below the orange box." + RenderText {#text} at (0,0) size 693x19 + text run at (0,0) width 693: "Test passes if the blue and orange boxes are the same width and the blue box is directly below the orange box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (51,3) size 96x96 [bgcolor=#FFA500] [border: none (24px solid #FFA500) none (24px solid #FFA500)] RenderBlock {DIV} at (3,99) size 192x96 [color=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-008-expected.txt index a69530ddb0c9..4c48da5cfd2c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-non-replaced-width-008-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x260 RenderBlock {HTML} at (0,0) size 800x260 RenderBody {BODY} at (8,16) size 784x236 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 323x19 - text run at (0,0) width 323: "Test passes if there is a filled green square below and " - RenderInline {STRONG} at (0,0) size 42x19 - RenderText {#text} at (323,0) size 42x19 - text run at (323,0) width 42: "no red" - RenderText {#text} at (365,0) size 4x19 - text run at (365,0) width 4: "." + RenderText {#text} at (0,0) size 337x19 + text run at (0,0) width 337: "Test passes if there is a filled green square below and " + RenderInline {STRONG} at (0,0) size 44x19 + RenderText {#text} at (337,0) size 44x19 + text run at (337,0) width 44: "no red" + RenderText {#text} at (381,0) size 4x19 + text run at (381,0) width 4: "." RenderBlock {DIV} at (0,36) size 400x200 [border: none (200px solid #FF0000) none] RenderBlock {DIV} at (0,0) size 400x200 [border: none (200px solid #008000) none] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-001-expected.txt index 565f019133b2..17c04ea15ce9 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-001-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x81 RenderBlock {HTML} at (0,0) size 800x81 RenderBody {BODY} at (8,16) size 784x57 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 523x19 - text run at (0,0) width 523: "Test passes if there is no white space between the blue box below and the orange lines." + RenderText {#text} at (0,0) size 546x19 + text run at (0,0) width 546: "Test passes if there is no white space between the blue box below and the orange lines." RenderBlock {DIV} at (0,36) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderImage {IMG} at (0,3) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-002-expected.txt index bafaca3a2206..473d3f9a70db 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x75 RenderBlock {HTML} at (0,0) size 800x75 RenderBody {BODY} at (8,16) size 784x51 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x15 RenderBlock (relative positioned) {DIV} at (0,36) size 784x15 RenderImage {IMG} at (0,0) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-003-expected.txt index 902292ed9141..7bef76ffe180 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x156 RenderBlock {HTML} at (0,0) size 800x156 RenderBody {BODY} at (8,16) size 784x132 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x96 RenderBlock (relative positioned) {DIV} at (0,36) size 784x96 RenderImage {IMG} at (0,0) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-004-expected.txt index b4bfc9a5858c..3aac804a7cfe 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x216 RenderBlock {HTML} at (0,0) size 800x216 RenderBody {BODY} at (8,16) size 784x192 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x156 RenderBlock (relative positioned) {DIV} at (0,36) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-005-expected.txt index 9f75f464ea6c..da88d794602b 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 RenderIFrame {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-007-expected.txt index b4bfc9a5858c..3aac804a7cfe 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-height-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x216 RenderBlock {HTML} at (0,0) size 800x216 RenderBody {BODY} at (8,16) size 784x192 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x156 RenderBlock (relative positioned) {DIV} at (0,36) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-width-001-expected.txt index dc815159ded3..6c3d2e13f0a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-width-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 739x19 - text run at (0,0) width 739: "Test passes if the blue and orange boxes below are the same width, and they are horizontally centered inside the black box." + RenderText {#text} at (0,0) size 772x19 + text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and they are horizontally centered inside the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (91,3) size 16x15 RenderBlock {DIV} at (3,18) size 192x15 [color=#FFA500] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-width-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-width-006-expected.txt index e8918514919d..02094bb32a17 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-width-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/block-replaced-width-006-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x354 RenderBlock {HTML} at (0,0) size 800x354 RenderBody {BODY} at (8,16) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 739x19 - text run at (0,0) width 739: "Test passes if the blue and orange boxes below are the same width, and they are horizontally centered inside the black box." + RenderText {#text} at (0,0) size 772x19 + text run at (0,0) width 772: "Test passes if the blue and orange boxes below are the same width, and they are horizontally centered inside the black box." RenderBlock {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] RenderImage {IMG} at (51,3) size 96x96 RenderBlock {DIV} at (3,99) size 192x96 [color=#FFA500] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/border-collapse-offset-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/border-collapse-offset-002-expected.txt index ff8cb58a9b2f..ee737f210142 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/border-collapse-offset-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/border-collapse-offset-002-expected.txt @@ -5,10 +5,10 @@ layer at (0,0) size 800x84 RenderBody {BODY} at (8,8) size 784x68 RenderTable {TABLE} at (0,0) size 110x68 [border: (2px none #808080)] RenderBlock {CAPTION} at (0,0) size 110x28 [border: (4px solid #008000)] - RenderText {#text} at (33,4) size 44x19 - text run at (33,4) width 44: "caption" + RenderText {#text} at (32,4) size 46x19 + text run at (32,4) width 46: "caption" RenderTableSection {TBODY} at (2,30) size 106x36 RenderTableRow {TR} at (0,0) size 106x36 RenderTableCell {TD} at (0,5) size 106x26 [border: (2px solid #FFA500)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (37,3) size 32x19 - text run at (37,3) width 32: "cell 1" + RenderText {#text} at (36,3) size 34x19 + text run at (36,3) width 34: "cell 1" diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/border-conflict-style-079-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/border-conflict-style-079-expected.txt index 9d6380d7dfd5..db71266a0b76 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/border-conflict-style-079-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/border-conflict-style-079-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x310 RenderBlock {HTML} at (0,0) size 800x310 RenderBody {BODY} at (8,16) size 784x286 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 446x19 - text run at (0,0) width 446: "Test passes if the center box in the table below has a border similar to this:" + RenderText {#text} at (0,0) size 465x19 + text run at (0,0) width 465: "Test passes if the center box in the table below has a border similar to this:" RenderTable {TABLE} at (0,36) size 60x60 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 55x55 RenderTableRow {TR} at (0,0) size 55x55 @@ -14,31 +14,31 @@ layer at (0,0) size 800x310 RenderTableSection {TBODY} at (2,2) size 165x165 RenderTableRow {TR} at (0,0) size 165x55 RenderTableCell {TD} at (0,14) size 55x27 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (55,14) size 55x27 [border: (3px outset #00FF00) (2px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (110,14) size 55x27 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" RenderTableRow {TR} at (0,55) size 165x55 RenderTableCell {TD} at (0,69) size 55x27 [border: (3px outset #00FF00) (2px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (55,69) size 55x27 [border: (3px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (110,69) size 55x27 [border: (3px outset #00FF00) (3px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" RenderTableRow {TR} at (0,110) size 165x55 RenderTableCell {TD} at (0,124) size 55x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (55,124) size 55x27 [border: (3px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (110,124) size 55x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/border-conflict-style-088-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/border-conflict-style-088-expected.txt index 85fd5844dc96..a950cc33cdb3 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/border-conflict-style-088-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/border-conflict-style-088-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x310 RenderBlock {HTML} at (0,0) size 800x310 RenderBody {BODY} at (8,16) size 784x286 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 446x19 - text run at (0,0) width 446: "Test passes if the center box in the table below has a border similar to this:" + RenderText {#text} at (0,0) size 465x19 + text run at (0,0) width 465: "Test passes if the center box in the table below has a border similar to this:" RenderTable {TABLE} at (0,36) size 60x60 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 55x55 RenderTableRow {TR} at (0,0) size 55x55 @@ -14,31 +14,31 @@ layer at (0,0) size 800x310 RenderTableSection {TBODY} at (2,2) size 165x165 RenderTableRow {TR} at (0,0) size 165x55 RenderTableCell {TD} at (0,14) size 55x27 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (55,14) size 55x27 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (110,14) size 55x27 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" RenderTableRow {TR} at (0,55) size 165x55 RenderTableCell {TD} at (0,69) size 55x27 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (55,69) size 55x27 [border: (3px outset #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" RenderTableCell {TD} at (110,69) size 55x27 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" RenderTableRow {TR} at (0,110) size 165x55 RenderTableCell {TD} at (0,124) size 55x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (55,124) size 55x27 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" RenderTableCell {TD} at (110,124) size 55x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/border-spacing-applies-to-015-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/border-spacing-applies-to-015-expected.txt index c3348f7422ae..a5555e6bf259 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/border-spacing-applies-to-015-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/border-spacing-applies-to-015-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x300 RenderBlock {HTML} at (0,0) size 800x300 RenderBody {BODY} at (8,16) size 784x276 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 620x19 - text run at (0,0) width 620: "Test passes if there is a blue and orange square below and there is no vertical gap between the squares." + RenderText {#text} at (0,0) size 644x19 + text run at (0,0) width 644: "Test passes if there is a blue and orange square below and there is no vertical gap between the squares." RenderTable {DIV} at (0,36) size 120x240 RenderBlock {DIV} at (0,0) size 120x120 [border: (10px solid #0000FF)] RenderBlock {DIV} at (0,120) size 120x120 [border: (10px solid #FFA500)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/c543-txt-decor-000-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/c543-txt-decor-000-expected.txt index 6dfa68c64acc..c9d613a63e39 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/c543-txt-decor-000-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/c543-txt-decor-000-expected.txt @@ -1,81 +1,82 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x434 - RenderBlock {HTML} at (0,0) size 800x434 - RenderBody {BODY} at (8,16) size 784x402 +layer at (0,0) size 800x454 + RenderBlock {HTML} at (0,0) size 800x454 + RenderBody {BODY} at (8,16) size 784x422 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "This sentence should be underlined." + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "This sentence should be underlined." RenderBlock {P} at (0,36) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "This sentence should be overlined." + RenderText {#text} at (0,0) size 218x19 + text run at (0,0) width 218: "This sentence should be overlined." RenderBlock {P} at (0,72) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This sentence should be stricken out." + RenderText {#text} at (0,0) size 232x19 + text run at (0,0) width 232: "This sentence should be stricken out." RenderBlock {P} at (0,108) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 348x19 - text run at (0,0) width 348: "This sentence should be blinking (if the UA supports that)." + RenderText {#text} at (0,0) size 368x19 + text run at (0,0) width 368: "This sentence should be blinking (if the UA supports that)." RenderBlock {P} at (0,144) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "The sentence should be underlined. " - RenderInline {B} at (0,0) size 233x19 - RenderText {#text} at (215,0) size 233x19 - text run at (215,0) width 233: "This sentence should be underlined" - RenderText {#text} at (448,0) size 4x19 - text run at (448,0) width 4: "." + RenderText {#text} at (0,0) size 227x19 + text run at (0,0) width 227: "The sentence should be underlined. " + RenderInline {B} at (0,0) size 238x19 + RenderText {#text} at (227,0) size 238x19 + text run at (227,0) width 238: "This sentence should be underlined" + RenderText {#text} at (465,0) size 4x19 + text run at (465,0) width 4: "." RenderBlock {P} at (0,180) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 298x19 - text run at (0,0) width 298: "This sentence should be underlined and overlined." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "This sentence should be underlined and overlined." RenderBlock {P} at (0,216) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 357x19 - text run at (0,0) width 357: "This sentence should be underlined, overlined, and stricken." + RenderText {#text} at (0,0) size 377x19 + text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken." RenderBlock {DIV} at (0,252) size 784x0 [color=#FF0000] RenderBlock {P} at (0,252) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "There should be no red at the end of this line." - RenderImage {IMG} at (271,0) size 15x15 [color=#FF0000] - RenderText {#text} at (286,0) size 4x19 - text run at (286,0) width 4: " " + RenderText {#text} at (0,0) size 285x19 + text run at (0,0) width 285: "There should be no red at the end of this line." + RenderImage {IMG} at (285,0) size 15x15 [color=#FF0000] + RenderText {#text} at (300,0) size 4x19 + text run at (300,0) width 4: " " RenderBlock {P} at (0,288) size 784x42 [color=#000080] - RenderText {#text} at (0,2) size 188x19 - text run at (0,2) width 188: "The text of this sentence and all" + RenderText {#text} at (0,2) size 199x19 + text run at (0,2) width 199: "The text of this sentence and all" RenderInline {SPAN} at (0,0) size 4x19 - RenderText {#text} at (188,2) size 4x19 - text run at (188,2) width 4: " " - RenderText {#text} at (192,2) size 13x19 - text run at (192,2) width 13: "its" + RenderText {#text} at (199,2) size 4x19 + text run at (199,2) width 4: " " + RenderText {#text} at (203,2) size 14x19 + text run at (203,2) width 14: "its" RenderInline {SPAN} at (0,0) size 4x19 - RenderText {#text} at (205,2) size 4x19 - text run at (205,2) width 4: " " - RenderText {#text} at (209,2) size 294x19 - text run at (209,2) width 294: "spaces (including the space between the images) " - RenderImage {IMG} at (503,0) size 17x17 [color=#FF0000] - RenderText {#text} at (520,2) size 4x19 - text run at (520,2) width 4: " " - RenderImage {IMG} at (524,0) size 17x17 [color=#FF0000] - RenderText {#text} at (541,2) size 763x39 - text run at (541,2) width 4: " " - text run at (545,2) width 218: "should be underlined, but the images" - text run at (0,22) width 112: "themselves should " - RenderInline {EM} at (0,0) size 21x19 - RenderText {#text} at (112,22) size 21x19 - text run at (112,22) width 21: "not" - RenderText {#text} at (133,22) size 89x19 - text run at (133,22) width 89: " be underlined." - RenderBlock {P} at (0,346) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 535x19 - text run at (0,0) width 447: "This sentence should have a long blue underline including between the two " - text run at (447,0) width 88: "arrows here\x{2192}" + RenderText {#text} at (217,2) size 4x19 + text run at (217,2) width 4: " " + RenderText {#text} at (221,2) size 308x19 + text run at (221,2) width 308: "spaces (including the space between the images) " + RenderImage {IMG} at (529,0) size 17x17 [color=#FF0000] + RenderText {#text} at (546,2) size 4x19 + text run at (546,2) width 4: " " + RenderImage {IMG} at (550,0) size 17x17 [color=#FF0000] + RenderText {#text} at (567,2) size 754x39 + text run at (567,2) width 4: " " + text run at (571,2) width 183: "should be underlined, but the" + text run at (0,22) width 167: "images themselves should " + RenderInline {EM} at (0,0) size 20x19 + RenderText {#text} at (167,22) size 20x19 + text run at (167,22) width 20: "not" + RenderText {#text} at (187,22) size 94x19 + text run at (187,22) width 94: " be underlined." + RenderBlock {P} at (0,346) size 784x40 [color=#000080] + RenderText {#text} at (0,0) size 568x19 + text run at (0,0) width 478: "This sentence should have a long blue underline including between the two " + text run at (478,0) width 90: "arrows here\x{2192}" RenderInline {SPAN} at (0,0) size 156x19 [color=#FFFFFF] - RenderText {#text} at (535,0) size 156x19 - text run at (535,0) width 156: " FAIL FAIL FAIL FAIL " - RenderText {#text} at (691,0) size 72x19 - text run at (691,0) width 72: "\x{2190}and here." - RenderBlock {P} at (0,382) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 325x19 - text run at (0,0) width 325: "There should be a long blue underline between here\x{2192}" + RenderText {#text} at (568,0) size 156x19 + text run at (568,0) width 156: " FAIL FAIL FAIL FAIL " + RenderText {#text} at (724,0) size 763x39 + text run at (724,0) width 39: "\x{2190}and" + text run at (0,20) width 31: "here." + RenderBlock {P} at (0,402) size 784x20 [color=#000080] + RenderText {#text} at (0,0) size 343x19 + text run at (0,0) width 343: "There should be a long blue underline between here\x{2192}" RenderInline {SPAN} at (0,0) size 88x19 - RenderText {#text} at (325,0) size 88x19 - text run at (325,0) width 88: " " - RenderText {#text} at (413,0) size 72x19 - text run at (413,0) width 72: "\x{2190}and here." + RenderText {#text} at (343,0) size 88x19 + text run at (343,0) width 88: " " + RenderText {#text} at (431,0) size 74x19 + text run at (431,0) width 74: "\x{2190}and here." diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-001-expected.txt index 80289a39b10e..0449a0b2b1a4 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 144x19 - text run at (0,0) width 144: "There should be no red." + RenderText {#text} at (0,0) size 150x19 + text run at (0,0) width 150: "There should be no red." layer at (8,148) size 100x100 RenderBlock (positioned) {DIV} at (0,32) size 100x100 [bgcolor=#FF0000] layer at (8,148) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-002-expected.txt index f1ebb5933d2a..4738496726e7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 144x19 - text run at (0,0) width 144: "There should be no red." + RenderText {#text} at (0,0) size 150x19 + text run at (0,0) width 150: "There should be no red." layer at (8,32) size 100x100 RenderBlock (positioned) {DIV} at (8,32) size 100x100 RenderTable at (0,0) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-003-expected.txt index 6ddd771397b5..bed7c808dc62 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 144x19 - text run at (0,0) width 144: "There should be no red." + RenderText {#text} at (0,0) size 150x19 + text run at (0,0) width 150: "There should be no red." layer at (8,32) size 100x100 RenderBlock (positioned) {DIV} at (8,32) size 100x100 RenderTable {DIV} at (0,0) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-004-expected.txt index e03345ed81d9..8b6324aacce7 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/dynamic-top-change-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 144x19 - text run at (0,0) width 144: "There should be no red." + RenderText {#text} at (0,0) size 150x19 + text run at (0,0) width 150: "There should be no red." layer at (8,32) size 100x100 RenderBlock (positioned) {DIV} at (8,32) size 100x100 layer at (8,64) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-001-expected.txt index a6f1ada3df0d..1b81fcd321aa 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 251x19 - text run at (0,0) width 251: "Test passes if there is no red on this page." + RenderText {#text} at (0,0) size 260x19 + text run at (0,0) width 260: "Test passes if there is no red on this page." RenderBlock {DIV} at (0,36) size 784x0 [bgcolor=#FF0000] RenderInline {SPAN} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-002-expected.txt index 78726a3c8c3f..a426c3fda227 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-002-expected.txt @@ -9,8 +9,8 @@ layer at (0,0) size 800x428 layerType: foreground only RenderBlock {HTML} at (0,0) size 800x428 RenderBody {BODY} at (8,16) size 784x404 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." RenderBlock {DIV} at (0,116) size 784x288 RenderBlock {DIV} at (0,0) size 528x144 [border: (24px solid #008000)] RenderInline {SPAN} at (0,0) size 240x336 [bgcolor=#008000] [border: (24px solid #008000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-003-expected.txt index 3b4a13ac762f..02a8d47fcb7c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/empty-inline-003-expected.txt @@ -9,8 +9,8 @@ layer at (0,0) size 800x140 layerType: foreground only RenderBlock {HTML} at (0,0) size 800x140 RenderBody {BODY} at (8,16) size 784x116 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 582x19 - text run at (0,0) width 582: "Test passes if there is a wide bright green rectangle below with one \"X\" in it and if there is no red." + RenderText {#text} at (0,0) size 616x19 + text run at (0,0) width 616: "Test passes if there is a wide bright green rectangle below with one \"X\" in it and if there is no red." layer at (8,52) size 784x80 RenderBlock (relative positioned) {DIV} at (0,36) size 784x80 RenderBlock {DIV} at (0,0) size 784x80 [bgcolor=#00FF00] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-height-001-expected.txt index b3a188b2a7c4..8cf2ae302b92 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-height-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x148 RenderBlock {HTML} at (0,0) size 800x148 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x0 RenderBlock (relative positioned) {DIV} at (0,36) size 784x0 RenderBlock (floating) {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-001-expected.txt index 6e5c059e31fb..0a5891455064 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-001-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 420x19 - text run at (0,0) width 420: "Test passes if the blue box is in the upper-left corner of the black box." + RenderText {#text} at (0,0) size 437x19 + text run at (0,0) width 437: "Test passes if the blue box is in the upper-left corner of the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (3,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-002-expected.txt index 5f1249d8d9a9..7e1cca7807ee 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-002-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 428x19 - text run at (0,0) width 428: "Test passes if the blue box is horizontally centered inside the black box." + RenderText {#text} at (0,0) size 449x19 + text run at (0,0) width 449: "Test passes if the blue box is horizontally centered inside the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (51,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-003-expected.txt index 79596a2dc358..aea7146f0dd8 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-003-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 428x19 - text run at (0,0) width 428: "Test passes if the blue box is in the upper-right corner of the black box." + RenderText {#text} at (0,0) size 446x19 + text run at (0,0) width 446: "Test passes if the blue box is in the upper-right corner of the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (99,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-004-expected.txt index 5f1249d8d9a9..7e1cca7807ee 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-004-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 428x19 - text run at (0,0) width 428: "Test passes if the blue box is horizontally centered inside the black box." + RenderText {#text} at (0,0) size 449x19 + text run at (0,0) width 449: "Test passes if the blue box is horizontally centered inside the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (51,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-005-expected.txt index 6e5c059e31fb..0a5891455064 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-005-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 420x19 - text run at (0,0) width 420: "Test passes if the blue box is in the upper-left corner of the black box." + RenderText {#text} at (0,0) size 437x19 + text run at (0,0) width 437: "Test passes if the blue box is in the upper-left corner of the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderBlock (floating) {DIV} at (3,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-006-expected.txt index 12990545d0e0..ca8203a83746 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-006-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x148 RenderBlock {HTML} at (0,0) size 800x148 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." RenderBlock (floating) {DIV} at (0,36) size 96x96 [color=#008000] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 text run at (0,0) width 96: "X" diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-007-expected.txt index f58ad4bd380d..b1f16ce88cc2 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-007-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x200 RenderBlock {HTML} at (0,0) size 800x200 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." RenderBlock (floating) {DIV} at (0,56) size 128x128 [bgcolor=#FF0000] RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-008-expected.txt index aee37b92e13c..9cd820eda75c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-008-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x200 RenderBlock {HTML} at (0,0) size 800x200 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." RenderBlock (floating) {DIV} at (0,56) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {SPAN} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-009-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-009-expected.txt index 112fc51d514e..f83744ea75eb 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-009-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-009-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x200 RenderBlock {HTML} at (0,0) size 800x200 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." RenderBlock (floating) {DIV} at (0,56) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-010-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-010-expected.txt index 112fc51d514e..f83744ea75eb 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-010-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-010-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x200 RenderBlock {HTML} at (0,0) size 800x200 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." RenderBlock (floating) {DIV} at (0,56) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-011-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-011-expected.txt index 112fc51d514e..f83744ea75eb 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-011-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-011-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x200 RenderBlock {HTML} at (0,0) size 800x200 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." RenderBlock (floating) {DIV} at (0,56) size 128x128 [bgcolor=#FF0000] RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-012-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-012-expected.txt index dfe0d5076d61..328f1a41a899 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-012-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-non-replaced-width-012-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x200 RenderBlock {HTML} at (0,0) size 800x200 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 215: "protruding out of it toward the right." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 254: "and protruding out of it toward the right." RenderBlock (floating) {DIV} at (0,56) size 128x128 [bgcolor=#008000] RenderText {#text} at (0,48) size 256x32 text run at (0,48) width 256: "XXXXXXXX" diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-001-expected.txt index 19684890f566..68ba097368ff 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-001-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x73 RenderBlock {HTML} at (0,0) size 800x73 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 523x19 - text run at (0,0) width 523: "Test passes if there is no white space between the blue box below and the orange lines." + RenderText {#text} at (0,0) size 546x19 + text run at (0,0) width 546: "Test passes if there is no white space between the blue box below and the orange lines." RenderBlock (floating) {DIV} at (0,36) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderImage {IMG} at (0,3) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-002-expected.txt index 174de27e151a..812da7447127 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x67 RenderBlock {HTML} at (0,0) size 800x67 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 15x15 RenderBlock (floating) {DIV} at (0,36) size 15x15 RenderImage {IMG} at (0,0) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-003-expected.txt index ade7330466c4..aab4d84f33a9 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x148 RenderBlock {HTML} at (0,0) size 800x148 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 96x96 RenderBlock (floating) {DIV} at (0,36) size 96x96 RenderImage {IMG} at (0,0) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-004-expected.txt index 263fe1ffff37..e04461aeb651 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x208 RenderBlock {HTML} at (0,0) size 800x208 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x0 RenderBlock (relative positioned) {DIV} at (0,36) size 784x0 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-005-expected.txt index 9f75f464ea6c..da88d794602b 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 RenderIFrame {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-007-expected.txt index 263fe1ffff37..e04461aeb651 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-height-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x208 RenderBlock {HTML} at (0,0) size 800x208 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x0 RenderBlock (relative positioned) {DIV} at (0,36) size 784x0 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-001-expected.txt index 390493ab6412..8fa6a2215e3f 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-001-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 420x19 - text run at (0,0) width 420: "Test passes if the blue box is in the upper-left corner of the black box." + RenderText {#text} at (0,0) size 437x19 + text run at (0,0) width 437: "Test passes if the blue box is in the upper-left corner of the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-002-expected.txt index 9904ffd73be1..66ff55e0d917 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-002-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 428x19 - text run at (0,0) width 428: "Test passes if the blue box is horizontally centered inside the black box." + RenderText {#text} at (0,0) size 449x19 + text run at (0,0) width 449: "Test passes if the blue box is horizontally centered inside the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (51,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-003-expected.txt index e11657f53d9f..ae0d2257dca0 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-003-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 428x19 - text run at (0,0) width 428: "Test passes if the blue box is in the upper-right corner of the black box." + RenderText {#text} at (0,0) size 446x19 + text run at (0,0) width 446: "Test passes if the blue box is in the upper-right corner of the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (99,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-004-expected.txt index 9904ffd73be1..66ff55e0d917 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-004-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 428x19 - text run at (0,0) width 428: "Test passes if the blue box is horizontally centered inside the black box." + RenderText {#text} at (0,0) size 449x19 + text run at (0,0) width 449: "Test passes if the blue box is horizontally centered inside the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (51,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-005-expected.txt index 390493ab6412..8fa6a2215e3f 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-005-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 420x19 - text run at (0,0) width 420: "Test passes if the blue box is in the upper-left corner of the black box." + RenderText {#text} at (0,0) size 437x19 + text run at (0,0) width 437: "Test passes if the blue box is in the upper-left corner of the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-006-expected.txt index 88dc2daae66c..a853dc43ce58 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-006-expected.txt @@ -1,11 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." + RenderBlock {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 15x15 RenderBlock {DIV} at (3,18) size 15x15 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-011-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-011-expected.txt index 473a9be321dd..8ac3bf3a521d 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-011-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/float-replaced-width-011-expected.txt @@ -1,11 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." + RenderBlock {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 96x96 RenderBlock {DIV} at (3,99) size 96x96 [bgcolor=#FFA500] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/floating-replaced-height-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/floating-replaced-height-008-expected.txt index dada6f615396..b6b132d206d9 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/floating-replaced-height-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/floating-replaced-height-008-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x190 RenderBlock {HTML} at (0,0) size 800x190 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 101x19 - text run at (0,0) width 101: "There should be " + RenderText {#text} at (0,0) size 106x19 + text run at (0,0) width 106: "There should be " RenderInline {STRONG} at (0,0) size 143x19 - RenderText {#text} at (101,0) size 143x19 - text run at (101,0) width 143: "5 filled green squares" - RenderText {#text} at (244,0) size 175x19 - text run at (244,0) width 175: " with the same width and the " + RenderText {#text} at (106,0) size 143x19 + text run at (106,0) width 143: "5 filled green squares" + RenderText {#text} at (249,0) size 185x19 + text run at (249,0) width 185: " with the same width and the " RenderInline {STRONG} at (0,0) size 80x19 - RenderText {#text} at (419,0) size 80x19 - text run at (419,0) width 80: "same height" - RenderText {#text} at (499,0) size 228x19 - text run at (499,0) width 228: ". The 5 filled green squares should be " - RenderInline {STRONG} at (0,0) size 56x19 - RenderText {#text} at (727,0) size 56x19 - text run at (727,0) width 56: "identical" - RenderText {#text} at (0,20) size 417x19 - text run at (0,20) width 417: "to each other. This should still remain true even after a window resize." + RenderText {#text} at (434,0) size 80x19 + text run at (434,0) width 80: "same height" + RenderText {#text} at (514,0) size 236x19 + text run at (514,0) width 236: ". The 5 filled green squares should be" + RenderInline {STRONG} at (0,0) size 57x19 + RenderText {#text} at (0,20) size 57x19 + text run at (0,20) width 57: "identical" + RenderText {#text} at (57,20) size 444x19 + text run at (57,20) width 444: " to each other. This should still remain true even after a window resize." RenderBlock {DIV} at (0,56) size 784x0 RenderImage {IMG} at (0,0) size 118x118 RenderImage {IMG} at (117,0) size 6x5 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/height-width-inline-table-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/height-width-inline-table-001-expected.txt index 37ad7e1566cd..a158e8c91f03 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/height-width-inline-table-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/height-width-inline-table-001-expected.txt @@ -7,13 +7,13 @@ layer at (0,0) size 800x165 layerType: foreground only RenderBlock {HTML} at (0,0) size 800x165 RenderBody {BODY} at (8,16) size 784x141 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 282x19 - text run at (0,0) width 282: "Test passes if there is a filled green square and " - RenderInline {STRONG} at (0,0) size 42x19 - RenderText {#text} at (282,0) size 42x19 - text run at (282,0) width 42: "no red" - RenderText {#text} at (324,0) size 4x19 - text run at (324,0) width 4: "." + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "Test passes if there is a filled green square and " + RenderInline {STRONG} at (0,0) size 44x19 + RenderText {#text} at (294,0) size 44x19 + text run at (294,0) width 44: "no red" + RenderText {#text} at (338,0) size 4x19 + text run at (338,0) width 4: "." RenderBlock (anonymous) at (0,36) size 784x105 RenderTable {DIV} at (0,0) size 100x100 [bgcolor=#008000] [border: (25px solid #008000)] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/height-width-table-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/height-width-table-001-expected.txt index 57a494b51b09..ed621eb27fd8 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/height-width-table-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/height-width-table-001-expected.txt @@ -7,11 +7,11 @@ layer at (0,0) size 800x160 layerType: foreground only RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x136 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 282x19 - text run at (0,0) width 282: "Test passes if there is a filled green square and " - RenderInline {STRONG} at (0,0) size 42x19 - RenderText {#text} at (282,0) size 42x19 - text run at (282,0) width 42: "no red" - RenderText {#text} at (324,0) size 4x19 - text run at (324,0) width 4: "." + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "Test passes if there is a filled green square and " + RenderInline {STRONG} at (0,0) size 44x19 + RenderText {#text} at (294,0) size 44x19 + text run at (294,0) width 44: "no red" + RenderText {#text} at (338,0) size 4x19 + text run at (338,0) width 4: "." RenderTable {DIV} at (0,36) size 100x100 [bgcolor=#008000] [border: (25px solid #008000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt index c31ac8cfe1c1..81f93fd429bd 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x161 RenderBlock {HTML} at (0,0) size 800x161 RenderBody {BODY} at (8,16) size 784x137 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x101 RenderBlock (relative positioned) {DIV} at (0,36) size 784x101 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt index f2081e548cd3..4a24368a3113 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x156 RenderBlock {HTML} at (0,0) size 800x156 RenderBody {BODY} at (8,16) size 784x132 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x96 RenderBlock (relative positioned) {DIV} at (0,36) size 784x96 RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt index 2854ab8a1876..e862a256cad1 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x156 RenderBlock {HTML} at (0,0) size 800x156 RenderBody {BODY} at (8,16) size 784x132 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." RenderBlock (anonymous) at (0,36) size 784x96 RenderBlock {DIV} at (0,0) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt index 1d1c01182730..11601b33b2cc 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 651x19 - text run at (0,0) width 651: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." + RenderText {#text} at (0,0) size 679x19 + text run at (0,0) width 679: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt index 19cd388be6fd..3e25d2e695df 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x208 RenderBlock {HTML} at (0,0) size 800x208 RenderBody {BODY} at (8,16) size 784x184 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." RenderBlock (anonymous) at (0,56) size 784x128 RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#FF0000] RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt index 4a9058450e60..27c1473e0871 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x208 RenderBlock {HTML} at (0,0) size 800x208 RenderBody {BODY} at (8,16) size 784x184 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it and" - text run at (0,20) width 434: "protruding out of it toward the right. There should be no red in this page." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it" + text run at (0,20) width 484: "and protruding out of it toward the right. There should be no red in this page." RenderBlock (anonymous) at (0,56) size 784x128 RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#008000] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-001-expected.txt index 1b0df655c240..4c355a26dafa 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x81 RenderBlock {HTML} at (0,0) size 800x81 RenderBody {BODY} at (8,16) size 784x57 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 523x19 - text run at (0,0) width 523: "Test passes if there is no white space between the blue box below and the orange lines." + RenderText {#text} at (0,0) size 546x19 + text run at (0,0) width 546: "Test passes if there is no white space between the blue box below and the orange lines." RenderBlock {DIV} at (0,36) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderImage {IMG} at (0,3) size 15x15 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-002-expected.txt index 4e7d01ef415b..420f3bd66f47 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x75 RenderBlock {HTML} at (0,0) size 800x75 RenderBody {BODY} at (8,16) size 784x51 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x15 RenderBlock (relative positioned) {DIV} at (0,36) size 784x15 RenderImage {IMG} at (0,0) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-003-expected.txt index 902292ed9141..7bef76ffe180 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x156 RenderBlock {HTML} at (0,0) size 800x156 RenderBody {BODY} at (8,16) size 784x132 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x96 RenderBlock (relative positioned) {DIV} at (0,36) size 784x96 RenderImage {IMG} at (0,0) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-004-expected.txt index dc76cbbb4c43..3a1148e71e83 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x216 RenderBlock {HTML} at (0,0) size 800x216 RenderBody {BODY} at (8,16) size 784x192 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x156 RenderBlock (relative positioned) {DIV} at (0,36) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-005-expected.txt index f12ba317410f..ffa5b3d632dc 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 RenderIFrame {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-007-expected.txt index dc76cbbb4c43..3a1148e71e83 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x216 RenderBlock {HTML} at (0,0) size 800x216 RenderBody {BODY} at (8,16) size 784x192 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x156 RenderBlock (relative positioned) {DIV} at (0,36) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-008-expected.txt index fa9152d7212a..beeeeca5669e 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-height-008-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x203 RenderBlock {HTML} at (0,0) size 800x203 RenderBody {BODY} at (8,16) size 784x179 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 101x19 - text run at (0,0) width 101: "There should be " + RenderText {#text} at (0,0) size 106x19 + text run at (0,0) width 106: "There should be " RenderInline {STRONG} at (0,0) size 143x19 - RenderText {#text} at (101,0) size 143x19 - text run at (101,0) width 143: "5 filled green squares" - RenderText {#text} at (244,0) size 175x19 - text run at (244,0) width 175: " with the same width and the " + RenderText {#text} at (106,0) size 143x19 + text run at (106,0) width 143: "5 filled green squares" + RenderText {#text} at (249,0) size 185x19 + text run at (249,0) width 185: " with the same width and the " RenderInline {STRONG} at (0,0) size 80x19 - RenderText {#text} at (419,0) size 80x19 - text run at (419,0) width 80: "same height" - RenderText {#text} at (499,0) size 228x19 - text run at (499,0) width 228: ". The 5 filled green squares should be " - RenderInline {STRONG} at (0,0) size 56x19 - RenderText {#text} at (727,0) size 56x19 - text run at (727,0) width 56: "identical" - RenderText {#text} at (0,20) size 417x19 - text run at (0,20) width 417: "to each other. This should still remain true even after a window resize." + RenderText {#text} at (434,0) size 80x19 + text run at (434,0) width 80: "same height" + RenderText {#text} at (514,0) size 236x19 + text run at (514,0) width 236: ". The 5 filled green squares should be" + RenderInline {STRONG} at (0,0) size 57x19 + RenderText {#text} at (0,20) size 57x19 + text run at (0,20) width 57: "identical" + RenderText {#text} at (57,20) size 444x19 + text run at (57,20) width 444: " to each other. This should still remain true even after a window resize." RenderBlock {DIV} at (0,56) size 784x123 RenderImage {OBJECT} at (0,0) size 118x118 RenderText {#text} at (117,103) size 5x19 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-width-001-expected.txt index 7664b5a268e8..9539892889c9 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-width-001-expected.txt @@ -1,12 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x258 - RenderBlock {HTML} at (0,0) size 800x258 - RenderBody {BODY} at (8,16) size 784x234 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] +layer at (0,0) size 800x278 + RenderBlock {HTML} at (0,0) size 800x278 + RenderBody {BODY} at (8,16) size 784x254 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." + RenderBlock {DIV} at (0,56) size 198x198 [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 192x15 RenderImage {IMG} at (0,0) size 15x15 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-width-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-width-006-expected.txt index b8a35b02876e..71d1f0eb07c8 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-width-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-block-replaced-width-006-expected.txt @@ -1,12 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." + RenderBlock {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 192x96 RenderImage {IMG} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-height-002-expected.txt index a843dfd20087..cf31782930da 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-height-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x284 RenderBlock {HTML} at (0,0) size 800x284 RenderBody {BODY} at (8,16) size 784x260 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,132) size 784x144 RenderBlock (relative positioned) {DIV} at (0,116) size 784x144 RenderInline {SPAN} at (0,0) size 96x192 [color=#0000FF] [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-height-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-height-003-expected.txt index 84752d7763d7..b435c7ee0008 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-height-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-height-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x284 RenderBlock {HTML} at (0,0) size 800x284 RenderBody {BODY} at (8,16) size 784x260 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,132) size 784x144 RenderBlock (relative positioned) {DIV} at (0,116) size 784x144 RenderInline {SPAN} at (0,0) size 96x192 [color=#0000FF] [bgcolor=#0000FF] [border: (48px solid #0000FF) none (48px solid #0000FF) none] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-width-001-expected.txt index 3c4a51a0fab3..6cde6ee1f777 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-width-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 461x19 - text run at (0,0) width 461: "Test passes if the blue box below is in the upper-left corner of the black box." + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 480: "Test passes if the blue box below is in the upper-left corner of the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderText {#text} at (0,0) size 0x0 layer at (8,52) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-width-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-width-002-expected.txt index 3c4a51a0fab3..6cde6ee1f777 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-width-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-non-replaced-width-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x258 RenderBlock {HTML} at (0,0) size 800x258 RenderBody {BODY} at (8,16) size 784x234 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 461x19 - text run at (0,0) width 461: "Test passes if the blue box below is in the upper-left corner of the black box." + RenderText {#text} at (0,0) size 480x19 + text run at (0,0) width 480: "Test passes if the blue box below is in the upper-left corner of the black box." RenderBlock {DIV} at (0,36) size 198x198 [border: (3px solid #000000)] RenderText {#text} at (0,0) size 0x0 layer at (8,52) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-001-expected.txt index 1b0df655c240..4c355a26dafa 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x81 RenderBlock {HTML} at (0,0) size 800x81 RenderBody {BODY} at (8,16) size 784x57 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 523x19 - text run at (0,0) width 523: "Test passes if there is no white space between the blue box below and the orange lines." + RenderText {#text} at (0,0) size 546x19 + text run at (0,0) width 546: "Test passes if there is no white space between the blue box below and the orange lines." RenderBlock {DIV} at (0,36) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none] RenderImage {IMG} at (0,3) size 15x15 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-002-expected.txt index 4e7d01ef415b..420f3bd66f47 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x75 RenderBlock {HTML} at (0,0) size 800x75 RenderBody {BODY} at (8,16) size 784x51 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x15 RenderBlock (relative positioned) {DIV} at (0,36) size 784x15 RenderImage {IMG} at (0,0) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-003-expected.txt index 902292ed9141..7bef76ffe180 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x156 RenderBlock {HTML} at (0,0) size 800x156 RenderBody {BODY} at (8,16) size 784x132 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "Test passes if the blue and orange boxes below are the same height." + RenderText {#text} at (0,0) size 424x19 + text run at (0,0) width 424: "Test passes if the blue and orange boxes below are the same height." layer at (8,52) size 784x96 RenderBlock (relative positioned) {DIV} at (0,36) size 784x96 RenderImage {IMG} at (0,0) size 96x96 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-004-expected.txt index dc76cbbb4c43..3a1148e71e83 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x216 RenderBlock {HTML} at (0,0) size 800x216 RenderBody {BODY} at (8,16) size 784x192 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x156 RenderBlock (relative positioned) {DIV} at (0,36) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-005-expected.txt index f12ba317410f..ffa5b3d632dc 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x192 RenderBlock (relative positioned) {DIV} at (0,36) size 784x192 RenderIFrame {IFRAME} at (0,0) size 306x102 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-007-expected.txt index dc76cbbb4c43..3a1148e71e83 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x216 RenderBlock {HTML} at (0,0) size 800x216 RenderBody {BODY} at (8,16) size 784x192 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 290x19 - text run at (0,0) width 290: "Test passes if there is no red visible on the page." + RenderText {#text} at (0,0) size 302x19 + text run at (0,0) width 302: "Test passes if there is no red visible on the page." layer at (8,52) size 784x156 RenderBlock (relative positioned) {DIV} at (0,36) size 784x156 RenderIFrame {IFRAME} at (0,0) size 306x156 [border: (3px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-008-expected.txt index 51123d2540e1..c18ddd7c2f0c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-height-008-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x203 RenderBlock {HTML} at (0,0) size 800x203 RenderBody {BODY} at (8,16) size 784x179 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 101x19 - text run at (0,0) width 101: "There should be " + RenderText {#text} at (0,0) size 106x19 + text run at (0,0) width 106: "There should be " RenderInline {STRONG} at (0,0) size 143x19 - RenderText {#text} at (101,0) size 143x19 - text run at (101,0) width 143: "5 filled green squares" - RenderText {#text} at (244,0) size 175x19 - text run at (244,0) width 175: " with the same width and the " + RenderText {#text} at (106,0) size 143x19 + text run at (106,0) width 143: "5 filled green squares" + RenderText {#text} at (249,0) size 185x19 + text run at (249,0) width 185: " with the same width and the " RenderInline {STRONG} at (0,0) size 80x19 - RenderText {#text} at (419,0) size 80x19 - text run at (419,0) width 80: "same height" - RenderText {#text} at (499,0) size 228x19 - text run at (499,0) width 228: ". The 5 filled green squares should be " - RenderInline {STRONG} at (0,0) size 56x19 - RenderText {#text} at (727,0) size 56x19 - text run at (727,0) width 56: "identical" - RenderText {#text} at (0,20) size 417x19 - text run at (0,20) width 417: "to each other. This should still remain true even after a window resize." + RenderText {#text} at (434,0) size 80x19 + text run at (434,0) width 80: "same height" + RenderText {#text} at (514,0) size 236x19 + text run at (514,0) width 236: ". The 5 filled green squares should be" + RenderInline {STRONG} at (0,0) size 57x19 + RenderText {#text} at (0,20) size 57x19 + text run at (0,20) width 57: "identical" + RenderText {#text} at (57,20) size 444x19 + text run at (57,20) width 444: " to each other. This should still remain true even after a window resize." RenderBlock {DIV} at (0,56) size 784x123 RenderImage {IMG} at (0,0) size 118x118 RenderText {#text} at (117,103) size 5x19 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-001-expected.txt index cb4586848c1b..e430007ba6a8 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-001-expected.txt @@ -1,12 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." + RenderBlock {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 192x101 RenderImage {IMG} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-006-expected.txt index b8a35b02876e..71d1f0eb07c8 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-006-expected.txt @@ -1,12 +1,13 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x354 - RenderBlock {HTML} at (0,0) size 800x354 - RenderBody {BODY} at (8,16) size 784x330 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 770x19 - text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black box." - RenderBlock {DIV} at (0,36) size 198x294 [border: (3px solid #000000)] +layer at (0,0) size 800x374 + RenderBlock {HTML} at (0,0) size 800x374 + RenderBody {BODY} at (8,16) size 784x350 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 770: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black" + text run at (0,20) width 28: "box." + RenderBlock {DIV} at (0,56) size 198x294 [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 192x96 RenderImage {IMG} at (0,0) size 96x96 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-011-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-011-expected.txt index 5d13ed2785d8..3a94567a22f1 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-011-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-011-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x168 RenderBlock {HTML} at (0,0) size 800x168 RenderBody {BODY} at (8,16) size 784x136 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 185x19 - text run at (0,0) width 185: "There should be no red below." + RenderText {#text} at (0,0) size 192x19 + text run at (0,0) width 192: "There should be no red below." RenderBlock {DIV} at (0,36) size 784x100 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 784x100 RenderImage {IMG} at (0,0) size 784x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-012-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-012-expected.txt index 8889432e12bf..e0dac5399b56 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-012-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-012-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x260 RenderBlock {HTML} at (0,0) size 800x260 RenderBody {BODY} at (8,16) size 784x236 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 185x19 - text run at (0,0) width 185: "There should be no red below." + RenderText {#text} at (0,0) size 192x19 + text run at (0,0) width 192: "There should be no red below." RenderBlock {DIV} at (0,36) size 600x200 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 600x100 [bgcolor=#008000] RenderImage {IMG} at (0,0) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-013-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-013-expected.txt index 8889432e12bf..e0dac5399b56 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-013-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-013-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x260 RenderBlock {HTML} at (0,0) size 800x260 RenderBody {BODY} at (8,16) size 784x236 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 185x19 - text run at (0,0) width 185: "There should be no red below." + RenderText {#text} at (0,0) size 192x19 + text run at (0,0) width 192: "There should be no red below." RenderBlock {DIV} at (0,36) size 600x200 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 600x100 [bgcolor=#008000] RenderImage {IMG} at (0,0) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-014-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-014-expected.txt index 8cc10944f57a..fd9abd4b8f2a 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-014-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-014-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x284 RenderBlock {HTML} at (0,0) size 800x284 RenderBody {BODY} at (8,16) size 784x252 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 607x19 - text run at (0,0) width 371: "There should be no red below, just two 300\x{D7}100 pixel green " - text run at (371,0) width 236: "rectangles seperated by 1em of margin." + RenderText {#text} at (0,0) size 631x19 + text run at (0,0) width 385: "There should be no red below, just two 300\x{D7}100 pixel green " + text run at (385,0) width 246: "rectangles seperated by 1em of margin." RenderBlock {DIV} at (0,36) size 300x100 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 600x100 RenderImage {IMG} at (0,0) size 300x100 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-015-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-015-expected.txt index 8343e15d4f08..a7bc31be9805 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-015-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-replaced-width-015-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x476 RenderBlock {HTML} at (0,0) size 800x476 RenderBody {BODY} at (8,16) size 784x452 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 424x19 - text run at (0,0) width 424: "There should be no red below, just two 300x200 pixel lime rectangles." + RenderText {#text} at (0,0) size 443x19 + text run at (0,0) width 443: "There should be no red below, just two 300x200 pixel lime rectangles." layer at (8,52) size 300x200 RenderBlock (relative positioned) {DIV} at (0,36) size 300x200 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 300x100 [bgcolor=#00FF00] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/inline-table-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/inline-table-001-expected.txt index 031b580b9760..e2e27d14f94e 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/inline-table-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/inline-table-001-expected.txt @@ -4,18 +4,18 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 353x19 - text run at (0,0) width 353: "Test passes if the \"Filler Text\" below is all on the same line." + RenderText {#text} at (0,0) size 375x19 + text run at (0,0) width 375: "Test passes if the \"Filler Text\" below is all on the same line." RenderBlock {DIV} at (0,36) size 784x96 - RenderInline {SPAN} at (0,0) size 61x19 - RenderText {#text} at (0,0) size 61x19 - text run at (0,0) width 61: "Filler Text" - RenderText {#text} at (61,0) size 4x19 - text run at (61,0) width 4: " " - RenderTable {DIV} at (65,0) size 96x96 [bgcolor=#FFA500] + RenderInline {SPAN} at (0,0) size 65x19 + RenderText {#text} at (0,0) size 65x19 + text run at (0,0) width 65: "Filler Text" + RenderText {#text} at (65,0) size 4x19 + text run at (65,0) width 4: " " + RenderTable {DIV} at (69,0) size 96x96 [bgcolor=#FFA500] RenderTableSection (anonymous) at (0,0) size 96x96 RenderTableRow {DIV} at (0,0) size 96x96 RenderTableCell {DIV} at (0,0) size 96x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (0,0) size 61x19 - text run at (0,0) width 61: "Filler Text" + RenderText {#text} at (0,0) size 65x19 + text run at (0,0) width 65: "Filler Text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-001-expected.txt index a5b6e5647285..f7457ac6b1e1 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 438x19 - text run at (0,0) width 438: "Test passes if there is no space between the blue and orange lines below." + RenderText {#text} at (0,0) size 455x19 + text run at (0,0) width 455: "Test passes if there is no space between the blue and orange lines below." layer at (8,52) size 240x240 RenderBlock (positioned) {DIV} at (8,52) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-002-expected.txt index a5b6e5647285..f7457ac6b1e1 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-002-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 438x19 - text run at (0,0) width 438: "Test passes if there is no space between the blue and orange lines below." + RenderText {#text} at (0,0) size 455x19 + text run at (0,0) width 455: "Test passes if there is no space between the blue and orange lines below." layer at (8,52) size 240x240 RenderBlock (positioned) {DIV} at (8,52) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-003-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-003-expected.txt index a5b6e5647285..f7457ac6b1e1 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-003-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-003-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 438x19 - text run at (0,0) width 438: "Test passes if there is no space between the blue and orange lines below." + RenderText {#text} at (0,0) size 455x19 + text run at (0,0) width 455: "Test passes if there is no space between the blue and orange lines below." layer at (8,52) size 240x240 RenderBlock (positioned) {DIV} at (8,52) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-004-expected.txt index a163758dd00f..b6b127d0d5cc 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 438x19 - text run at (0,0) width 438: "Test passes if there is no space between the blue and orange lines below." + RenderText {#text} at (0,0) size 455x19 + text run at (0,0) width 455: "Test passes if there is no space between the blue and orange lines below." layer at (8,52) size 240x240 RenderBlock (positioned) {DIV} at (8,52) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-005-expected.txt index eca902939cea..1ca3aa7bf404 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 438x19 - text run at (0,0) width 438: "Test passes if there is no space between the blue and orange lines below." + RenderText {#text} at (0,0) size 455x19 + text run at (0,0) width 455: "Test passes if there is no space between the blue and orange lines below." layer at (8,52) size 240x240 RenderBlock (positioned) {DIV} at (8,52) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-006-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-006-expected.txt index 84eb8b916c59..dcce83a89804 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-006-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-006-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 438x19 - text run at (0,0) width 438: "Test passes if there is no space between the blue and orange lines below." + RenderText {#text} at (0,0) size 455x19 + text run at (0,0) width 455: "Test passes if there is no space between the blue and orange lines below." layer at (8,52) size 240x240 RenderBlock (positioned) {DIV} at (8,52) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-007-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-007-expected.txt index a163758dd00f..b6b127d0d5cc 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-007-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-007-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 438x19 - text run at (0,0) width 438: "Test passes if there is no space between the blue and orange lines below." + RenderText {#text} at (0,0) size 455x19 + text run at (0,0) width 455: "Test passes if there is no space between the blue and orange lines below." layer at (8,52) size 240x240 RenderBlock (positioned) {DIV} at (8,52) size 240x240 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 220x220 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-008-expected.txt index 7f297aa6163e..31343b20bc21 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-008-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x80 RenderBlock {HTML} at (0,0) size 800x80 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 419x19 - text run at (0,0) width 419: "Test passes if there is space between the blue and orange lines below." + RenderText {#text} at (0,0) size 435x19 + text run at (0,0) width 435: "Test passes if there is space between the blue and orange lines below." RenderBlock (anonymous) at (0,36) size 784x20 - RenderInline {DIV} at (0,0) size 181x19 [border: none (5px solid #0000FF) none (5px solid #0000FF)] + RenderInline {DIV} at (0,0) size 185x19 [border: none (5px solid #0000FF) none (5px solid #0000FF)] RenderText {#text} at (0,0) size 0x0 - RenderInline {DIV} at (0,0) size 71x19 [border: none (5px solid #FFA500) none (5px solid #FFA500)] - RenderText {#text} at (60,0) size 61x19 - text run at (60,0) width 61: "Filler Text" + RenderInline {DIV} at (0,0) size 75x19 [border: none (5px solid #FFA500) none (5px solid #FFA500)] + RenderText {#text} at (60,0) size 65x19 + text run at (60,0) width 65: "Filler Text" RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-009-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-009-expected.txt index 04d685013304..aeacb49dfa82 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-009-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-009-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 419x19 - text run at (0,0) width 419: "Test passes if there is space between the blue and orange lines below." + RenderText {#text} at (0,0) size 435x19 + text run at (0,0) width 435: "Test passes if there is space between the blue and orange lines below." layer at (8,52) size 340x340 RenderBlock (positioned) {DIV} at (8,52) size 340x340 [border: (10px solid #0000FF)] RenderBlock {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-010-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-010-expected.txt index 010470d1d12e..151c5ad72aa3 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-010-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-010-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x72 RenderBlock {HTML} at (0,0) size 800x72 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 746x39 - text run at (0,0) width 746: "Test passes if there is space between the blue and orange lines below and there is a marker bullet on the left-hand side of the" - text run at (0,20) width 72: "orange box." + RenderText {#text} at (0,0) size 778x39 + text run at (0,0) width 778: "Test passes if there is space between the blue and orange lines below and there is a marker bullet on the left-hand side of the" + text run at (0,20) width 75: "orange box." layer at (8,72) size 340x340 RenderBlock (positioned) {DIV} at (8,72) size 340x340 [border: (10px solid #0000FF)] RenderListItem {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-012-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-012-expected.txt index df7599642e5e..e060922e2ee5 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-012-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-012-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 419x19 - text run at (0,0) width 419: "Test passes if there is space between the blue and orange lines below." + RenderText {#text} at (0,0) size 435x19 + text run at (0,0) width 435: "Test passes if there is space between the blue and orange lines below." layer at (8,52) size 340x345 RenderBlock (positioned) {DIV} at (8,52) size 340x345 [border: (10px solid #0000FF)] RenderBlock {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-013-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-013-expected.txt index c2fa0f55b970..2bd771c52e42 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-013-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-013-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 419x19 - text run at (0,0) width 419: "Test passes if there is space between the blue and orange lines below." + RenderText {#text} at (0,0) size 435x19 + text run at (0,0) width 435: "Test passes if there is space between the blue and orange lines below." layer at (8,52) size 340x340 RenderBlock (positioned) {DIV} at (8,52) size 340x340 [border: (10px solid #0000FF)] RenderTable {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-014-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-014-expected.txt index 308b93990730..5d9a66d25dce 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-014-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-014-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 419x19 - text run at (0,0) width 419: "Test passes if there is space between the blue and orange lines below." + RenderText {#text} at (0,0) size 435x19 + text run at (0,0) width 435: "Test passes if there is space between the blue and orange lines below." layer at (8,52) size 340x345 RenderBlock (positioned) {DIV} at (8,52) size 340x345 [border: (10px solid #0000FF)] RenderTable {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-015-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-015-expected.txt index 3cfbc3c7fe50..76d26e1168cf 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-015-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/margin-applies-to-015-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 419x19 - text run at (0,0) width 419: "Test passes if there is space between the blue and orange lines below." + RenderText {#text} at (0,0) size 435x19 + text run at (0,0) width 435: "Test passes if there is space between the blue and orange lines below." layer at (8,52) size 340x340 RenderBlock (positioned) {DIV} at (8,52) size 340x340 [border: (10px solid #0000FF)] RenderTable {DIV} at (10,10) size 320x320 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/outline-color-applies-to-008-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/outline-color-applies-to-008-expected.txt index 4b34250b5d5b..8e66cb15021c 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/outline-color-applies-to-008-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/outline-color-applies-to-008-expected.txt @@ -4,10 +4,10 @@ layer at (0,0) size 800x80 RenderBlock {HTML} at (0,0) size 800x80 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 217x19 - text run at (0,0) width 217: "Test passes if the box below is blue." + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "Test passes if the box below is blue." RenderBlock (anonymous) at (0,36) size 784x20 - RenderInline {DIV} at (0,0) size 61x19 - RenderText {#text} at (0,0) size 61x19 - text run at (0,0) width 61: "Filler Text" + RenderInline {DIV} at (0,0) size 65x19 + RenderText {#text} at (0,0) size 65x19 + text run at (0,0) width 65: "Filler Text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-elements-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-elements-001-expected.txt index f8230a4ea501..21390254cdf0 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-elements-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-elements-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x174 RenderBlock {HTML} at (0,0) size 800x174 RenderBody {BODY} at (8,16) size 784x142 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 569x19 - text run at (0,0) width 569: "Below, there should be 2 orange boxes horizontally centered within their respective green bars." + RenderText {#text} at (0,0) size 597x19 + text run at (0,0) width 597: "Below, there should be 2 orange boxes horizontally centered within their respective green bars." RenderBlock {DIV} at (16,36) size 752x45 [bgcolor=#008000] RenderBlock (anonymous) at (0,0) size 752x20 RenderText {#text} at (0,0) size 36x19 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-001-expected.txt index fc00379d43d7..c4163504e1fc 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-001-expected.txt @@ -1,22 +1,23 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (8,8) size 150x235 layerType: background only -layer at (6,86) size 154x154 - RenderBlock (positioned) zI: -1 {P} at (6,86) size 154x154 [bgcolor=#FF0000] [border: (2px solid #00FF00)] - RenderText zI: -1 {#text} at (2,2) size 93x59 - text run at (2,2) width 93: "FAIL (absolute" - text run at (2,22) width 87: "positioning not" - text run at (2,42) width 66: "supported)" -layer at (8,8) size 150x235 layerType: foreground only - RenderBlock {HTML} at (8,8) size 150x235 - RenderBody {BODY} at (0,0) size 150x235 - RenderBlock {P} at (0,0) size 150x80 - RenderText {#text} at (0,0) size 145x79 - text run at (0,0) width 145: "There should be a green" - text run at (0,20) width 133: "square below this line," - text run at (0,40) width 127: "exactly fitting inside a" - text run at (0,60) width 100: "2px lime border." - RenderBlock {P} at (0,80) size 150x155 +layer at (8,8) size 150x255 layerType: background only +layer at (6,106) size 154x154 + RenderBlock (positioned) zI: -1 {P} at (6,106) size 154x154 [bgcolor=#FF0000] [border: (2px solid #00FF00)] + RenderText zI: -1 {#text} at (2,2) size 95x59 + text run at (2,2) width 95: "FAIL (absolute" + text run at (2,22) width 94: "positioning not" + text run at (2,42) width 67: "supported)" +layer at (8,8) size 150x255 layerType: foreground only + RenderBlock {HTML} at (8,8) size 150x255 + RenderBody {BODY} at (0,0) size 150x255 + RenderBlock {P} at (0,0) size 150x100 + RenderText {#text} at (0,0) size 149x99 + text run at (0,0) width 113: "There should be a" + text run at (0,20) width 149: "green square below this" + text run at (0,40) width 117: "line, exactly fitting" + text run at (0,60) width 107: "inside a 2px lime" + text run at (0,80) width 44: "border." + RenderBlock {P} at (0,100) size 150x155 RenderEmbeddedObject {OBJECT} at (0,0) size 300x150 layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-002-expected.txt index cc036df020fe..38a8452bad9f 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-002-expected.txt @@ -4,8 +4,8 @@ layer at (8,8) size 150x175 RenderBlock (relative positioned) {HTML} at (8,8) size 150x175 RenderBody {BODY} at (0,0) size 150x175 RenderBlock {P} at (0,0) size 150x175 - RenderText {#text} at (0,0) size 340x19 - text run at (0,0) width 340: "There should be an exact square of green below this line:" + RenderText {#text} at (0,0) size 359x19 + text run at (0,0) width 359: "There should be an exact square of green below this line:" RenderEmbeddedObject {OBJECT} at (0,20) size 300x150 layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-004-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-004-expected.txt index 4778eedcd9e2..c725383e0629 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-004-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-004-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x165 RenderBlock {HTML} at (0,0) size 800x165 RenderBody {BODY} at (8,16) size 784x141 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "There must be a green box below and no red." + RenderText {#text} at (0,0) size 286x19 + text run at (0,0) width 286: "There must be a green box below and no red." RenderBlock {DIV} at (0,36) size 784x105 RenderEmbeddedObject {OBJECT} at (0,0) size 100x100 [bgcolor=#008000] [border: (20px solid #FF0000)] layer at (0,0) size 60x60 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-005-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-005-expected.txt index 82287c320867..044b53048e2f 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-005-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-005-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x255 RenderBlock {HTML} at (0,0) size 800x255 RenderBody {BODY} at (8,16) size 784x231 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "There must be a green box below and no red." + RenderText {#text} at (0,0) size 286x19 + text run at (0,0) width 286: "There must be a green box below and no red." RenderBlock {DIV} at (0,36) size 784x195 RenderEmbeddedObject {OBJECT} at (0,0) size 100x190 [bgcolor=#008000] [border: (20px solid #FF0000)] layer at (0,0) size 60x150 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt index f1862752e77b..bfb0c4740571 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-intrinsic-ratio-001-expected.txt @@ -1,16 +1,17 @@ -layer at (0,0) size 785x870 +layer at (0,0) size 785x886 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x807 - RenderBlock {HTML} at (0,0) size 785x807 - RenderBody {BODY} at (8,8) size 242x784 [border: (1px dashed #C0C0C0)] - RenderBlock {P} at (1,17) size 240x32 - RenderText {#text} at (0,-2) size 237x35 - text run at (0,-2) width 237: "The following six blue boxes must be of" - text run at (0,14) width 231: "the same width. There must be no red." - RenderBlock {P} at (17,65) size 208x48 [bgcolor=#008000] [border: (16px solid #0000FF)] +layer at (0,0) size 785x823 + RenderBlock {HTML} at (0,0) size 785x823 + RenderBody {BODY} at (8,8) size 242x800 [border: (1px dashed #C0C0C0)] + RenderBlock {P} at (1,17) size 240x48 + RenderText {#text} at (0,-2) size 237x51 + text run at (0,-2) width 237: "The following six blue boxes must be" + text run at (0,14) width 230: "of the same width. There must be no" + text run at (0,30) width 24: "red." + RenderBlock {P} at (17,81) size 208x48 [bgcolor=#008000] [border: (16px solid #0000FF)] RenderText {#text} at (16,14) size 4x19 text run at (16,14) width 4: " " - RenderBlock {P} at (1,209) size 240x16 + RenderBlock {P} at (1,225) size 240x16 RenderText {#text} at (0,-2) size 24x19 text run at (0,-2) width 24: " " RenderText {#text} at (0,0) size 0x0 @@ -21,7 +22,7 @@ layer at (0,0) size 785x807 RenderSVGRoot {svg} at (0,0) size 176x44 RenderSVGRect {rect} at (0,0) size 176x44 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] RenderSVGPath {path} at (26,8) size 124x28 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] - RenderBlock {P} at (1,321) size 240x16 + RenderBlock {P} at (1,337) size 240x16 RenderEmbeddedObject {OBJECT} at (16,0) size 208x76 [bgcolor=#FF0000] [border: (16px solid #0000FF)] layer at (0,0) size 176x44 RenderView at (0,0) size 176x44 @@ -29,7 +30,7 @@ layer at (0,0) size 785x807 RenderSVGRoot {svg} at (0,0) size 176x44 RenderSVGRect {rect} at (0,0) size 176x44 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] RenderSVGPath {path} at (26,8) size 124x28 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] - RenderTable at (1,433) size 240x79 + RenderTable at (1,449) size 240x79 RenderTableSection (anonymous) at (0,0) size 240x79 RenderTableRow (anonymous) at (0,0) size 240x79 RenderTableCell {P} at (0,0) size 240x79 [r=0 c=0 rs=1 cs=1] @@ -40,7 +41,7 @@ layer at (0,0) size 785x807 RenderSVGRoot {svg} at (0,0) size 176x44 RenderSVGRect {rect} at (0,0) size 176x44 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] RenderSVGPath {path} at (26,8) size 124x28 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] - RenderTable {TABLE} at (1,608) size 240x79 + RenderTable {TABLE} at (1,624) size 240x79 RenderTableSection {TBODY} at (0,0) size 240x79 RenderTableRow {TR} at (0,0) size 240x79 RenderTableCell {TD} at (0,0) size 240x79 [r=0 c=0 rs=1 cs=1] @@ -51,7 +52,7 @@ layer at (0,0) size 785x807 RenderSVGRoot {svg} at (0,0) size 176x44 RenderSVGRect {rect} at (0,0) size 176x44 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] RenderSVGPath {path} at (26,8) size 124x28 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] - RenderBlock (floating) {P} at (1,783) size 240x16 + RenderBlock (floating) {P} at (1,799) size 240x16 RenderEmbeddedObject {OBJECT} at (16,0) size 208x76 [bgcolor=#FF0000] [border: (16px solid #0000FF)] layer at (0,0) size 176x44 RenderView at (0,0) size 176x44 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-min-max-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-min-max-001-expected.txt index 9e068e48e67c..a81c3d804fda 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-min-max-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-min-max-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x276 RenderBlock {HTML} at (0,0) size 800x276 RenderBody {BODY} at (8,8) size 784x260 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 279x19 - text run at (0,0) width 279: "All twenty images should be identically square." + RenderText {#text} at (0,0) size 298x19 + text run at (0,0) width 298: "All twenty images should be identically square." RenderBlock (anonymous) at (0,20) size 784x240 RenderInline {P} at (0,0) size 75x19 RenderImage {IMG} at (0,0) size 75x75 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-001-expected.txt index 9e71f76cd75a..011fb70e9424 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-001-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x176 RenderBlock {HTML} at (0,0) size 800x176 RenderBody {BODY} at (8,16) size 784x152 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 285x19 - text run at (0,0) width 285: "Test passes if the \"Filler Text\" is above the box." + RenderText {#text} at (0,0) size 300x19 + text run at (0,0) width 300: "Test passes if the \"Filler Text\" is above the box." RenderTable {DIV} at (0,36) size 96x116 RenderBlock {DIV} at (0,0) size 96x20 - RenderText {#text} at (0,0) size 61x19 - text run at (0,0) width 61: "Filler Text" + RenderText {#text} at (0,0) size 65x19 + text run at (0,0) width 65: "Filler Text" RenderTableSection (anonymous) at (0,20) size 96x96 RenderTableRow {DIV} at (0,0) size 96x48 RenderTableCell {DIV} at (0,0) size 48x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-002-expected.txt index 580765cffbaa..a87fa84b6395 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-002-expected.txt @@ -6,29 +6,29 @@ layer at (0,0) size 800x176 RenderTableSection (anonymous) at (0,60) size 784x60 RenderTableRow (anonymous) at (0,0) size 784x40 RenderTableCell {DIV} at (0,0) size 784x40 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (0,0) size 767x39 - text run at (0,0) width 767: "Test passes if the numbers above are in order from top-to-bottom (1-3) and the number below are in order from top-to-bottom" - text run at (0,20) width 36: "(4-6)." + RenderText {#text} at (0,0) size 742x39 + text run at (0,0) width 742: "Test passes if the numbers above are in order from top-to-bottom (1-3) and the number below are in order from top-to-" + text run at (0,20) width 83: "bottom (4-6)." RenderTableRow {DIV} at (0,40) size 784x20 [color=#008000] RenderTableCell (anonymous) at (0,40) size 784x20 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (0,0) size 168x19 - text run at (0,0) width 168: "4. This line should be green." + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "4. This line should be green." RenderBlock {DIV} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 168x19 - text run at (0,0) width 168: "1. This line should be green." + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "1. This line should be green." RenderBlock {DIV} at (0,20) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 168x19 - text run at (0,0) width 168: "2. This line should be green." + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "2. This line should be green." RenderTableSection (anonymous) at (0,120) size 784x20 RenderTableRow {DIV} at (0,0) size 784x20 [color=#008000] RenderTableCell (anonymous) at (0,0) size 784x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (0,0) size 168x19 - text run at (0,0) width 168: "5. This line should be green." + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "5. This line should be green." RenderBlock {DIV} at (0,40) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 168x19 - text run at (0,0) width 168: "3. This line should be green." + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "3. This line should be green." RenderTableSection (anonymous) at (0,140) size 784x20 RenderTableRow {DIV} at (0,0) size 784x20 [color=#008000] RenderTableCell (anonymous) at (0,0) size 784x20 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (0,0) size 168x19 - text run at (0,0) width 168: "6. This line should be green." + RenderText {#text} at (0,0) size 179x19 + text run at (0,0) width 179: "6. This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt index f097bd8c53de..beab41573231 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x64 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 400x19 - text run at (0,0) width 400: "Test passes if the \"Filler Text\" below is on the right side of the box." + RenderText {#text} at (0,0) size 423x19 + text run at (0,0) width 423: "Test passes if the \"Filler Text\" below is on the right side of the box." RenderTable {TABLE} at (0,36) size 202x28 RenderBlock {CAPTION} at (0,0) size 202x22 [border: (1px solid #000000)] - RenderText {#text} at (140,1) size 61x19 - text run at (140,1) width 61: "Filler Text" + RenderText {#text} at (136,1) size 65x19 + text run at (136,1) width 65: "Filler Text" RenderTableSection {TBODY} at (0,22) size 202x6 RenderTableRow {TR} at (0,2) size 202x2 RenderTableCell {TD} at (2,2) size 198x2 [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-margins-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-margins-001-expected.txt index c9b69226bed6..b72298d75477 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-margins-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-margins-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x247 RenderBlock {HTML} at (0,0) size 800x247 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 378x19 - text run at (0,0) width 378: "There must be four evenly-spaced blue bars below and no red." + RenderText {#text} at (0,0) size 393x19 + text run at (0,0) width 393: "There must be four evenly-spaced blue bars below and no red." RenderBlock {DIV} at (15,36) size 96x180 [border: (15px solid #FF0000) none (15px solid #FF0000) none] RenderBlock {DIV} at (0,0) size 96x180 [border: (15px solid #0000FF) none (15px solid #0000FF) none] RenderTable {DIV} at (0,35) size 96x90 [bgcolor=#0000FF] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-optional-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-optional-001-expected.txt index c0544deee1d7..753ed221309e 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-optional-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-optional-001-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x300 RenderBlock {HTML} at (0,0) size 800x300 RenderBody {BODY} at (8,16) size 784x276 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "Test passes if the top square below has \"Filler Text\" directly above it and the bottom square does not." + RenderText {#text} at (0,0) size 635x19 + text run at (0,0) width 635: "Test passes if the top square below has \"Filler Text\" directly above it and the bottom square does not." RenderTable {DIV} at (0,36) size 100x120 RenderBlock {DIV} at (0,0) size 100x20 - RenderText {#text} at (0,0) size 61x19 - text run at (0,0) width 61: "Filler Text" + RenderText {#text} at (0,0) size 65x19 + text run at (0,0) width 65: "Filler Text" RenderTableSection (anonymous) at (0,20) size 100x100 RenderTableRow {DIV} at (0,0) size 100x50 RenderTableCell {DIV} at (0,0) size 50x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-optional-002-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-optional-002-expected.txt index c4a24421ecaa..54b7f6f7c9cd 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-optional-002-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/table-caption-optional-002-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x185 RenderBlock {HTML} at (0,0) size 800x185 RenderBody {BODY} at (8,16) size 784x161 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 632x19 - text run at (0,0) width 632: "Test passes if the left square below has \"Filler Text\" directly above it and the square on the right does not." + RenderText {#text} at (0,0) size 663x19 + text run at (0,0) width 663: "Test passes if the left square below has \"Filler Text\" directly above it and the square on the right does not." RenderBlock {DIV} at (0,36) size 784x125 RenderTable {SPAN} at (0,0) size 100x120 RenderBlock {SPAN} at (0,0) size 100x20 - RenderText {#text} at (0,0) size 61x19 - text run at (0,0) width 61: "Filler Text" + RenderText {#text} at (0,0) size 65x19 + text run at (0,0) width 65: "Filler Text" RenderTableSection (anonymous) at (0,20) size 100x100 RenderTableRow {SPAN} at (0,0) size 100x50 RenderTableCell {SPAN} at (0,0) size 50x0 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/table-height-algorithm-023-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/table-height-algorithm-023-expected.txt index a363e6af6a35..b5a9c038437f 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/table-height-algorithm-023-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/table-height-algorithm-023-expected.txt @@ -4,20 +4,20 @@ layer at (0,0) size 800x160 RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x136 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 367x19 - text run at (0,0) width 367: "Test passes if the bottom of the \"Filler Text\" below is aligned." - RenderTable {TABLE} at (0,36) size 346x100 - RenderTableSection {TBODY} at (0,0) size 346x100 - RenderTableRow {TR} at (0,2) size 346x96 - RenderTableCell {TD} at (2,27) size 54x18 [r=0 c=0 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 52x16 - RenderText {#text} at (0,0) size 52x15 - text run at (0,0) width 52: "Filler Text" - RenderTableCell {TD} at (58,15) size 117x34 [r=0 c=1 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 115x32 - RenderText {#text} at (0,0) size 115x31 - text run at (0,0) width 115: "Filler Text" - RenderTableCell {TD} at (177,2) size 167x50 [r=0 c=2 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 165x48 - RenderText {#text} at (0,1) size 165x46 - text run at (0,1) width 165: "Filler Text" + RenderText {#text} at (0,0) size 388x19 + text run at (0,0) width 388: "Test passes if the bottom of the \"Filler Text\" below is aligned." + RenderTable {TABLE} at (0,36) size 353x100 + RenderTableSection {TBODY} at (0,0) size 353x100 + RenderTableRow {TR} at (0,2) size 353x96 + RenderTableCell {TD} at (2,27) size 58x18 [r=0 c=0 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 56x16 + RenderText {#text} at (0,0) size 56x15 + text run at (0,0) width 56: "Filler Text" + RenderTableCell {TD} at (62,15) size 118x34 [r=0 c=1 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 116x32 + RenderText {#text} at (0,0) size 116x31 + text run at (0,0) width 116: "Filler Text" + RenderTableCell {TD} at (182,2) size 169x50 [r=0 c=2 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 167x48 + RenderText {#text} at (0,1) size 167x46 + text run at (0,1) width 167: "Filler Text" diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/table-height-algorithm-024-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/table-height-algorithm-024-expected.txt index a363e6af6a35..b5a9c038437f 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/table-height-algorithm-024-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/table-height-algorithm-024-expected.txt @@ -4,20 +4,20 @@ layer at (0,0) size 800x160 RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x136 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 367x19 - text run at (0,0) width 367: "Test passes if the bottom of the \"Filler Text\" below is aligned." - RenderTable {TABLE} at (0,36) size 346x100 - RenderTableSection {TBODY} at (0,0) size 346x100 - RenderTableRow {TR} at (0,2) size 346x96 - RenderTableCell {TD} at (2,27) size 54x18 [r=0 c=0 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 52x16 - RenderText {#text} at (0,0) size 52x15 - text run at (0,0) width 52: "Filler Text" - RenderTableCell {TD} at (58,15) size 117x34 [r=0 c=1 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 115x32 - RenderText {#text} at (0,0) size 115x31 - text run at (0,0) width 115: "Filler Text" - RenderTableCell {TD} at (177,2) size 167x50 [r=0 c=2 rs=1 cs=1] - RenderBlock {DIV} at (1,1) size 165x48 - RenderText {#text} at (0,1) size 165x46 - text run at (0,1) width 165: "Filler Text" + RenderText {#text} at (0,0) size 388x19 + text run at (0,0) width 388: "Test passes if the bottom of the \"Filler Text\" below is aligned." + RenderTable {TABLE} at (0,36) size 353x100 + RenderTableSection {TBODY} at (0,0) size 353x100 + RenderTableRow {TR} at (0,2) size 353x96 + RenderTableCell {TD} at (2,27) size 58x18 [r=0 c=0 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 56x16 + RenderText {#text} at (0,0) size 56x15 + text run at (0,0) width 56: "Filler Text" + RenderTableCell {TD} at (62,15) size 118x34 [r=0 c=1 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 116x32 + RenderText {#text} at (0,0) size 116x31 + text run at (0,0) width 116: "Filler Text" + RenderTableCell {TD} at (182,2) size 169x50 [r=0 c=2 rs=1 cs=1] + RenderBlock {DIV} at (1,1) size 167x48 + RenderText {#text} at (0,1) size 167x46 + text run at (0,1) width 167: "Filler Text" diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/width-non-replaced-inline-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/width-non-replaced-inline-001-expected.txt index 3a2a4d9622fe..9cc5207e2aff 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/width-non-replaced-inline-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/width-non-replaced-inline-001-expected.txt @@ -4,10 +4,10 @@ layer at (0,0) size 800x80 RenderBlock {HTML} at (0,0) size 800x80 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 485x19 - text run at (0,0) width 485: "Test passes if the left and right borders start and end where the 'Filler Text' does." + RenderText {#text} at (0,0) size 503x19 + text run at (0,0) width 503: "Test passes if the left and right borders start and end where the 'Filler Text' does." RenderBlock {DIV} at (0,36) size 784x20 - RenderInline {SPAN} at (0,0) size 266x19 [border: none (5px solid #000000) none (5px solid #000000)] - RenderText {#text} at (5,0) size 256x19 - text run at (5,0) width 256: "Filler Text Filler Text Filler Text Filler Text" + RenderInline {SPAN} at (0,0) size 282x19 [border: none (5px solid #000000) none (5px solid #000000)] + RenderText {#text} at (5,0) size 272x19 + text run at (5,0) width 272: "Filler Text Filler Text Filler Text Filler Text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/width-replaced-element-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/width-replaced-element-001-expected.txt index 723e77939c82..85ea90a4fe4e 100644 --- a/LayoutTests/platform/wincairo/css2.1/20110323/width-replaced-element-001-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/20110323/width-replaced-element-001-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x75 RenderBlock {HTML} at (0,0) size 800x75 RenderBody {BODY} at (8,16) size 784x51 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 471x19 - text run at (0,0) width 471: "Test passes if the blue square is the same size or larger than the orange square." + RenderText {#text} at (0,0) size 490x19 + text run at (0,0) width 490: "Test passes if the blue square is the same size or larger than the orange square." layer at (8,52) size 784x15 RenderBlock (relative positioned) {DIV} at (0,36) size 784x15 layer at (8,52) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t010403-shand-border-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t010403-shand-border-00-c-expected.txt index 927e5b1f2e35..cfa7e30f3e82 100644 --- a/LayoutTests/platform/wincairo/css2.1/t010403-shand-border-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t010403-shand-border-00-c-expected.txt @@ -4,6 +4,6 @@ layer at (0,0) size 800x58 RenderBlock {HTML} at (0,0) size 800x58 RenderBody {BODY} at (8,16) size 784x26 [bgcolor=#FFFFFF] RenderBlock {P} at (0,0) size 784x26 [color=#008000] [border: (3px solid #008000)] - RenderInline {SPAN} at (0,0) size 223x19 [color=#000000] - RenderText {#text} at (3,3) size 223x19 - text run at (3,3) width 223: "This text should have a green border." + RenderInline {SPAN} at (0,0) size 233x19 [color=#000000] + RenderText {#text} at (3,3) size 233x19 + text run at (3,3) width 233: "This text should have a green border." diff --git a/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-00-b-expected.txt index 3b04fca22588..d10020027dda 100644 --- a/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-00-b-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 270x19 - text run at (0,0) width 270: "The following paragraphs should be identical:" + RenderText {#text} at (0,0) size 289x19 + text run at (0,0) width 289: "The following paragraphs should be identical:" RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 231x19 - text run at (0,0) width 231: "This should be in a normal weight font." + RenderText {#text} at (0,0) size 248x19 + text run at (0,0) width 248: "This should be in a normal weight font." RenderBlock {P} at (0,72) size 784x20 - RenderText {#text} at (0,0) size 231x19 - text run at (0,0) width 231: "This should be in a normal weight font." + RenderText {#text} at (0,0) size 248x19 + text run at (0,0) width 248: "This should be in a normal weight font." diff --git a/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-01-b-expected.txt index 3b04fca22588..d10020027dda 100644 --- a/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-01-b-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 270x19 - text run at (0,0) width 270: "The following paragraphs should be identical:" + RenderText {#text} at (0,0) size 289x19 + text run at (0,0) width 289: "The following paragraphs should be identical:" RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 231x19 - text run at (0,0) width 231: "This should be in a normal weight font." + RenderText {#text} at (0,0) size 248x19 + text run at (0,0) width 248: "This should be in a normal weight font." RenderBlock {P} at (0,72) size 784x20 - RenderText {#text} at (0,0) size 231x19 - text run at (0,0) width 231: "This should be in a normal weight font." + RenderText {#text} at (0,0) size 248x19 + text run at (0,0) width 248: "This should be in a normal weight font." diff --git a/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-02-b-expected.txt index b922b5ffa630..856d91af617f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-02-b-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 270x19 - text run at (0,0) width 270: "The following paragraphs should be identical:" + RenderText {#text} at (0,0) size 289x19 + text run at (0,0) width 289: "The following paragraphs should be identical:" RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This should be in a bold font." + RenderText {#text} at (0,0) size 197x19 + text run at (0,0) width 197: "This should be in a bold font." RenderBlock {P} at (0,72) size 784x20 - RenderText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This should be in a bold font." + RenderText {#text} at (0,0) size 197x19 + text run at (0,0) width 197: "This should be in a bold font." diff --git a/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-03-b-expected.txt index b922b5ffa630..856d91af617f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t010403-shand-font-03-b-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 270x19 - text run at (0,0) width 270: "The following paragraphs should be identical:" + RenderText {#text} at (0,0) size 289x19 + text run at (0,0) width 289: "The following paragraphs should be identical:" RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This should be in a bold font." + RenderText {#text} at (0,0) size 197x19 + text run at (0,0) width 197: "This should be in a bold font." RenderBlock {P} at (0,72) size 784x20 - RenderText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This should be in a bold font." + RenderText {#text} at (0,0) size 197x19 + text run at (0,0) width 197: "This should be in a bold font." diff --git a/LayoutTests/platform/wincairo/css2.1/t040102-keywords-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040102-keywords-00-b-expected.txt index 88670482750c..fd2baa3d0514 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040102-keywords-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040102-keywords-00-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040102-keywords-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040102-keywords-01-b-expected.txt index d65aa2f97ffa..6d13c8327fe4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040102-keywords-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040102-keywords-01-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x136 RenderBlock {HTML} at (0,0) size 800x136 RenderBody {BODY} at (8,16) size 784x104 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 280x19 - text run at (0,0) width 280: "The next two paragraphs should look identical:" + RenderText {#text} at (0,0) size 296x19 + text run at (0,0) width 296: "The next two paragraphs should look identical:" RenderBlock {P} at (0,36) size 166x26 [border: (3px solid #000000)] RenderText {#text} at (3,3) size 30x19 text run at (3,3) width 30: "Test." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-case-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-case-00-b-expected.txt index 88670482750c..fd2baa3d0514 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-case-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-case-00-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-case-01-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-case-01-c-expected.txt index 4c5ff672499d..98344219657e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-case-01-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-case-01-c-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-00-b-expected.txt index 94cebb9af6b2..90919178d71e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-00-b-expected.txt @@ -4,20 +4,20 @@ layer at (0,0) size 800x160 RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x128 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "The following three paragraphs should look identical:" + RenderText {#text} at (0,0) size 337x19 + text run at (0,0) width 337: "The following three paragraphs should look identical:" RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 143x19 - text run at (0,0) width 143: "This is a test paragraph." + RenderText {#text} at (0,0) size 149x19 + text run at (0,0) width 149: "This is a test paragraph." RenderBlock {P} at (0,72) size 784x20 - RenderInline (generated) at (0,0) size 29x19 - RenderText at (0,0) size 29x19 - text run at (0,0) width 29: "This " - RenderText {#text} at (29,0) size 114x19 - text run at (29,0) width 114: "is a test paragraph." + RenderInline (generated) at (0,0) size 32x19 + RenderText at (0,0) size 32x19 + text run at (0,0) width 32: "This " + RenderText {#text} at (32,0) size 117x19 + text run at (32,0) width 117: "is a test paragraph." RenderBlock {P} at (0,108) size 784x20 - RenderInline (generated) at (0,0) size 29x19 - RenderText at (0,0) size 29x19 - text run at (0,0) width 29: "This " - RenderText {#text} at (29,0) size 114x19 - text run at (29,0) width 114: "is a test paragraph." + RenderInline (generated) at (0,0) size 32x19 + RenderText at (0,0) size 32x19 + text run at (0,0) width 32: "This " + RenderText {#text} at (32,0) size 117x19 + text run at (32,0) width 117: "is a test paragraph." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-01-b-expected.txt index 88670482750c..fd2baa3d0514 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-01-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-02-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-02-d-expected.txt index 632eb11aff41..c94d97da8ee2 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-02-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-02-d-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 293x19 - text run at (0,0) width 293: "This paragraph should have a green background." + RenderText {#text} at (0,0) size 308x19 + text run at (0,0) width 308: "This paragraph should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-03-b-expected.txt index 88670482750c..fd2baa3d0514 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-03-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-04-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-04-b-expected.txt index 88670482750c..fd2baa3d0514 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-04-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-04-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-05-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-05-c-expected.txt index 88670482750c..fd2baa3d0514 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-05-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-05-c-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-06-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-06-b-expected.txt index 88670482750c..fd2baa3d0514 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-06-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-06-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-07-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-07-b-expected.txt index 88670482750c..fd2baa3d0514 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-07-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-07-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-08-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-08-b-expected.txt index 88670482750c..fd2baa3d0514 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-escapes-08-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-escapes-08-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This should have a green background." + RenderText {#text} at (0,0) size 241x19 + text run at (0,0) width 241: "This should have a green background." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-00-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-00-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-01-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-01-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-01-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-01-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-02-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-02-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-02-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-02-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-03-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-03-c-expected.txt index 4c1c314ec3f8..2e3fb4b3a0c4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-03-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-03-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#FF0000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#FF0000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-04-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-04-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-04-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-04-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-05-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-05-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-05-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-05-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-06-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-06-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-06-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-06-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-07-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-07-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-07-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-07-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-08-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-08-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-08-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-08-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-09-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-09-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-09-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-09-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-10-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-10-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-10-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-10-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-11-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-11-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-11-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-11-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-12-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-12-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-12-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-12-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040103-ident-13-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040103-ident-13-c-expected.txt index cea386448ca2..7201b52046e5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040103-ident-13-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040103-ident-13-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-00-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-00-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-01-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-01-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-02-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-atkeyw-02-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-00-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-00-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-01-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-01-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-02-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-02-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-03-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-03-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-04-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-04-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-atrule-04-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-atrule-04-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-import-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-import-00-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-import-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-import-00-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-import-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-import-01-b-expected.txt index a88ada63db45..e1a7fdb544d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-import-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-import-01-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040105-import-10-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040105-import-10-b-expected.txt index 2c8581e5bacf..48202ca3bd7e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040105-import-10-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040105-import-10-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 173x19 - text run at (0,0) width 173: "This sentence must be green." + RenderText {#text} at (0,0) size 182x19 + text run at (0,0) width 182: "This sentence must be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040109-c17-comments-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040109-c17-comments-00-b-expected.txt index 8aec0ebf53ec..9e8292169713 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040109-c17-comments-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040109-c17-comments-00-b-expected.txt @@ -4,20 +4,20 @@ layer at (0,0) size 800x232 RenderBlock {HTML} at (0,0) size 800x232 RenderBody {BODY} at (8,16) size 784x200 [color=#FF0000] RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,72) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,108) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,144) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,180) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040109-c17-comments-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040109-c17-comments-01-b-expected.txt index 96bbc0ff996f..37bf52dca538 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040109-c17-comments-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040109-c17-comments-01-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 [color=#008000] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt index 2ea31f48bb61..35f503fb6208 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt @@ -4,30 +4,30 @@ layer at (0,0) size 800x340 RenderBlock {HTML} at (0,0) size 800x340 RenderBody {BODY} at (8,16) size 784x308 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {DIV} at (0,72) size 784x20 [color=#008000] [bgcolor=#FFFFFF] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,108) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,144) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,180) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,216) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,252) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,288) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt index 57bc0ddd6aa3..1368860848d7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x220 RenderBlock {HTML} at (0,0) size 800x220 RenderBody {BODY} at (8,16) size 784x188 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 329x19 - text run at (0,0) width 329: "The next four blocks should look identical, to the pixel." + RenderText {#text} at (0,0) size 348x19 + text run at (0,0) width 348: "The next four blocks should look identical, to the pixel." RenderBlock {P} at (0,36) size 784x26 [border: (3px solid #000080)] RenderText {#text} at (3,3) size 26x19 text run at (3,3) width 26: "Test" diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt index e1c4dce1c547..7878574af0c3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt @@ -4,59 +4,59 @@ layer at (0,0) size 800x592 RenderBlock {HTML} at (0,0) size 800x592 RenderBody {BODY} at (8,16) size 784x560 [color=#008000] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,72) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,108) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {OL} at (0,144) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,180) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {UL} at (0,216) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {BLOCKQUOTE} at (40,252) size 704x20 RenderBlock {P} at (0,0) size 704x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,288) size 784x20 - RenderInline {ACRONYM} at (0,0) size 152x19 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderInline {ACRONYM} at (0,0) size 163x19 + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderText {#text} at (0,0) size 0x0 RenderBlock {ADDRESS} at (0,324) size 784x20 RenderText {#text} at (0,0) size 163x19 text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,360) size 784x20 - RenderInline {SPAN} at (0,0) size 152x19 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderInline {SPAN} at (0,0) size 163x19 + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,396) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,432) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,468) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,504) size 784x20 - RenderText {#text} at (48,0) size 152x19 - text run at (48,0) width 152: "This line should be green." + RenderText {#text} at (48,0) size 163x19 + text run at (48,0) width 163: "This line should be green." RenderBlock {P} at (0,540) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt index 287fffbc19c5..1289a18d0526 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x160 RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x128 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 299x19 - text run at (0,0) width 299: "These four lines should look identical, to the pixel." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "These four lines should look identical, to the pixel." RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 299x19 - text run at (0,0) width 299: "These four lines should look identical, to the pixel." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "These four lines should look identical, to the pixel." RenderBlock {P} at (0,72) size 784x20 - RenderText {#text} at (0,0) size 299x19 - text run at (0,0) width 299: "These four lines should look identical, to the pixel." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "These four lines should look identical, to the pixel." RenderBlock {P} at (0,108) size 784x20 - RenderText {#text} at (0,0) size 299x19 - text run at (0,0) width 299: "These four lines should look identical, to the pixel." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "These four lines should look identical, to the pixel." diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt index d21c6d9f2233..c17fc152c101 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [bgcolor=#00FF00] - RenderText {#text} at (48,0) size 190x19 - text run at (48,0) width 190: "This line should be bright green." + RenderText {#text} at (48,0) size 204x19 + text run at (48,0) width 204: "This line should be bright green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-01-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-01-f-expected.txt index 9257c4a5f478..97fcd4bdd1bc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-01-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-01-f-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "This text should be green" + RenderText {#text} at (0,0) size 159x19 + text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-02-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-02-f-expected.txt index 9257c4a5f478..97fcd4bdd1bc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-02-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-02-f-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "This text should be green" + RenderText {#text} at (0,0) size 159x19 + text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-03-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-03-f-expected.txt index 9257c4a5f478..97fcd4bdd1bc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-03-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-03-f-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "This text should be green" + RenderText {#text} at (0,0) size 159x19 + text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-04-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-04-f-expected.txt index 9257c4a5f478..97fcd4bdd1bc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-04-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-04-f-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "This text should be green" + RenderText {#text} at (0,0) size 159x19 + text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-05-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-05-f-expected.txt index 9257c4a5f478..97fcd4bdd1bc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-05-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-05-f-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "This text should be green" + RenderText {#text} at (0,0) size 159x19 + text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-06-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-06-f-expected.txt index 9257c4a5f478..97fcd4bdd1bc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0402-syntax-06-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0402-syntax-06-f-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "This text should be green" + RenderText {#text} at (0,0) size 159x19 + text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t040302-c61-ex-len-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040302-c61-ex-len-00-b-a-expected.txt index 4c9daaf82b7a..3b17b5094897 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040302-c61-ex-len-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040302-c61-ex-len-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x120 RenderBlock {HTML} at (0,0) size 800x120 RenderBody {BODY} at (8,16) size 784x88 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 310x19 - text run at (0,0) width 310: "The two blocks below should have the same height." + RenderText {#text} at (0,0) size 327x19 + text run at (0,0) width 327: "The two blocks below should have the same height." RenderTable {TABLE} at (80,36) size 102x52 RenderTableSection {TBODY} at (0,0) size 102x52 RenderTableRow {TR} at (0,2) size 102x48 diff --git a/LayoutTests/platform/wincairo/css2.1/t040302-c61-phys-len-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040302-c61-phys-len-00-b-expected.txt index 755fec85ef96..17fd01239cd4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040302-c61-phys-len-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040302-c61-phys-len-00-b-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x212 RenderBlock {HTML} at (0,0) size 800x212 RenderBody {BODY} at (8,16) size 784x188 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 307x19 - text run at (0,0) width 307: "There should be two unbroken vertical bars below." + RenderText {#text} at (0,0) size 320x19 + text run at (0,0) width 320: "There should be two unbroken vertical bars below." RenderBlock {P} at (0,36) size 784x40 [color=#000080] - RenderText {#text} at (0,0) size 752x39 - text run at (0,0) width 387: "Hold up a credit card to your display. The distance between the " - text run at (387,0) width 365: "two vertical bars should be exactly the length of a credit card" - text run at (0,20) width 72: "(85.60mm)." + RenderText {#text} at (0,0) size 784x39 + text run at (0,0) width 402: "Hold up a credit card to your display. The distance between the " + text run at (402,0) width 382: "two vertical bars should be exactly the length of a credit card" + text run at (0,20) width 74: "(85.60mm)." RenderBlock {DIV} at (0,92) size 784x96 [border: none (3px solid #000000)] RenderBlock {DIV} at (326,0) size 458x16 [border: none (3px solid #000000)] RenderBlock {DIV} at (326,16) size 458x16 [border: none (3px solid #000000)] diff --git a/LayoutTests/platform/wincairo/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt index 91f13162869a..e5e624fbbcfc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x120 RenderBlock {HTML} at (0,0) size 800x120 RenderBody {BODY} at (8,16) size 784x96 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 309x19 - text run at (0,0) width 309: "There should be a solid vertical bar of green below." + RenderText {#text} at (0,0) size 323x19 + text run at (0,0) width 323: "There should be a solid vertical bar of green below." RenderBlock {DIV} at (0,36) size 784x60 [color=#008000] RenderBlock {DIV} at (0,0) size 784x15 RenderText {#text} at (0,0) size 60x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t040303-c62-percent-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040303-c62-percent-00-b-ag-expected.txt index ef81c7e03084..06ab165e963f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040303-c62-percent-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040303-c62-percent-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x336 RenderBlock {HTML} at (0,0) size 800x336 RenderBody {BODY} at (8,16) size 784x312 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 217x19 - text run at (0,0) width 217: "There should be a green box below." + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "There should be a green box below." RenderBlock {DIV} at (0,36) size 186x276 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (48,18) size 90x75 RenderBlock {P} at (0,0) size 90x75 diff --git a/LayoutTests/platform/wincairo/css2.1/t040304-c64-uri-00-a-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040304-c64-uri-00-a-g-expected.txt index c1e1c8bdb2a1..594e06fc7610 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040304-c64-uri-00-a-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040304-c64-uri-00-a-g-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x160 RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x128 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 243x19 - text run at (0,0) width 243: "There should be three green lines below." + RenderText {#text} at (0,0) size 255x19 + text run at (0,0) width 255: "There should be three green lines below." RenderBlock {P} at (0,36) size 784x20 [color=#FFFFFF] [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,72) size 784x20 [color=#FFFFFF] [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,108) size 784x20 [color=#FFFFFF] [bgcolor=#FF0000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t040306-c63-color-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040306-c63-color-00-b-ag-expected.txt index eec537e19fa2..dccb87fa1ea4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040306-c63-color-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040306-c63-color-00-b-ag-expected.txt @@ -4,74 +4,74 @@ layer at (0,0) size 800x120 RenderBlock {HTML} at (0,0) size 800x120 RenderBody {BODY} at (8,16) size 784x96 [color=#0000FF] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 621x19 - text run at (0,0) width 621: "There should be three solid bars of colour below, each longer than the last, each of the colour specified." + RenderText {#text} at (0,0) size 649x19 + text run at (0,0) width 649: "There should be three solid bars of colour below, each longer than the last, each of the colour specified." RenderBlock {DIV} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 34x19 - text run at (0,0) width 34: "Blue: " + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "Blue: " RenderInline {SPAN} at (0,0) size 15x15 - RenderText {#text} at (34,5) size 15x15 - text run at (34,5) width 15: "X" + RenderText {#text} at (38,5) size 15x15 + text run at (38,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 - RenderText {#text} at (49,5) size 15x15 - text run at (49,5) width 15: "X" - RenderImage {IMG} at (64,5) size 15x15 [color=#FF0000] + RenderText {#text} at (53,5) size 15x15 + text run at (53,5) width 15: "X" + RenderImage {IMG} at (68,5) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 52x19 - text run at (0,0) width 52: "Orange: " + RenderText {#text} at (0,0) size 55x19 + text run at (0,0) width 55: "Orange: " RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500] - RenderText {#text} at (52,5) size 15x15 - text run at (52,5) width 15: "X" + RenderText {#text} at (55,5) size 15x15 + text run at (55,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500] - RenderText {#text} at (67,5) size 15x15 - text run at (67,5) width 15: "X" + RenderText {#text} at (70,5) size 15x15 + text run at (70,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500] - RenderText {#text} at (82,5) size 15x15 - text run at (82,5) width 15: "X" + RenderText {#text} at (85,5) size 15x15 + text run at (85,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#FFA500] - RenderText {#text} at (97,5) size 15x15 - text run at (97,5) width 15: "X" - RenderImage {IMG} at (112,5) size 15x15 [color=#FF0000] + RenderText {#text} at (100,5) size 15x15 + text run at (100,5) width 15: "X" + RenderImage {IMG} at (115,5) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,76) size 784x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "Lime: " + RenderText {#text} at (0,0) size 41x19 + text run at (0,0) width 41: "Lime: " RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (37,5) size 15x15 - text run at (37,5) width 15: "X" + RenderText {#text} at (41,5) size 15x15 + text run at (41,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (52,5) size 15x15 - text run at (52,5) width 15: "X" + RenderText {#text} at (56,5) size 15x15 + text run at (56,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (67,5) size 15x15 - text run at (67,5) width 15: "X" + RenderText {#text} at (71,5) size 15x15 + text run at (71,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (82,5) size 15x15 - text run at (82,5) width 15: "X" + RenderText {#text} at (86,5) size 15x15 + text run at (86,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (97,5) size 15x15 - text run at (97,5) width 15: "X" + RenderText {#text} at (101,5) size 15x15 + text run at (101,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (112,5) size 15x15 - text run at (112,5) width 15: "X" + RenderText {#text} at (116,5) size 15x15 + text run at (116,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (127,5) size 15x15 - text run at (127,5) width 15: "X" + RenderText {#text} at (131,5) size 15x15 + text run at (131,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (142,5) size 15x15 - text run at (142,5) width 15: "X" + RenderText {#text} at (146,5) size 15x15 + text run at (146,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (157,5) size 15x15 - text run at (157,5) width 15: "X" + RenderText {#text} at (161,5) size 15x15 + text run at (161,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (172,5) size 15x15 - text run at (172,5) width 15: "X" + RenderText {#text} at (176,5) size 15x15 + text run at (176,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (187,5) size 15x15 - text run at (187,5) width 15: "X" + RenderText {#text} at (191,5) size 15x15 + text run at (191,5) width 15: "X" RenderInline {SPAN} at (0,0) size 15x15 [color=#00FF00] - RenderText {#text} at (202,5) size 15x15 - text run at (202,5) width 15: "X" - RenderImage {IMG} at (217,5) size 15x15 [color=#FF0000] + RenderText {#text} at (206,5) size 15x15 + text run at (206,5) width 15: "X" + RenderImage {IMG} at (221,5) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t040306-syntax-01-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040306-syntax-01-f-expected.txt index bc2d80786de9..215cf4d914a2 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040306-syntax-01-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040306-syntax-01-f-expected.txt @@ -4,29 +4,29 @@ layer at (0,0) size 800x340 RenderBlock {HTML} at (0,0) size 800x340 RenderBody {BODY} at (8,16) size 784x308 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" RenderBlock {P} at (0,36) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" RenderBlock {P} at (0,72) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" RenderBlock {P} at (0,108) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" RenderBlock {P} at (0,144) size 784x20 [color=#FF0000] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" RenderBlock {P} at (0,180) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" RenderBlock {P} at (0,216) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" RenderBlock {P} at (0,252) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" RenderBlock {P} at (0,288) size 784x20 [color=#007F00] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t040307-syntax-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t040307-syntax-01-b-expected.txt index ed006c9a1e18..77473eab7614 100644 --- a/LayoutTests/platform/wincairo/css2.1/t040307-syntax-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t040307-syntax-01-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "This should be green" + RenderText {#text} at (0,0) size 132x19 + text run at (0,0) width 132: "This should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t050201-c12-grouping-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t050201-c12-grouping-00-b-expected.txt index 669b3b7df356..944d16ca974e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t050201-c12-grouping-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t050201-c12-grouping-00-b-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,72) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-00-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-00-e-expected.txt index 008f7380317e..8f142e25911c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-00-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-00-e-expected.txt @@ -4,16 +4,16 @@ layer at (0,0) size 800x108 RenderBlock {HTML} at (0,0) size 800x108 RenderBody {BODY} at (8,16) size 784x76 [color=#FF0000] RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {UL} at (0,36) size 784x40 RenderListItem {LI} at (40,0) size 744x40 RenderBlock (anonymous) at (0,0) size 744x20 - RenderInline {SPAN} at (0,0) size 152x19 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderInline {SPAN} at (0,0) size 163x19 [color=#008000] + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderText {#text} at (0,0) size 0x0 RenderBlock {UL} at (0,20) size 744x20 RenderListItem {LI} at (40,0) size 704x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-01-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-01-e-expected.txt index 389834e162f9..dd9df3c36939 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-01-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-01-e-expected.txt @@ -5,12 +5,12 @@ layer at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {DIV} at (0,0) size 784x20 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {UL} at (0,36) size 784x20 [color=#008000] RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet RenderInline {SPAN} at (0,0) size 0x19 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-02-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-02-e-expected.txt index 0d3fbf057bce..1ce36291031b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-02-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0505-c16-descendant-02-e-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {DIV} at (0,0) size 784x20 [color=#FF0000] RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t050803-c14-classes-00-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t050803-c14-classes-00-e-expected.txt index 0f16f0e51485..36ef43b411c3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t050803-c14-classes-00-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t050803-c14-classes-00-e-expected.txt @@ -4,18 +4,18 @@ layer at (0,0) size 800x228 RenderBlock {HTML} at (0,0) size 800x228 RenderBody {BODY} at (8,16) size 784x196 [color=#FF0000] RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {DIV} at (0,36) size 784x20 [color=#008000] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,72) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,108) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {DIV} at (0,144) size 784x16 [color=#008000] RenderBlock {PRE} at (0,0) size 784x16 RenderText {#text} at (0,0) size 240x16 @@ -24,5 +24,5 @@ layer at (0,0) size 800x228 RenderBlock {UL} at (0,0) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0509-c15-ids-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0509-c15-ids-00-a-expected.txt index b32896038a99..d8f08bd9f9e7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0509-c15-ids-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0509-c15-ids-00-a-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 [color=#FF0000] RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,72) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0509-c15-ids-01-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0509-c15-ids-01-e-expected.txt index 06b2f5a472f8..cc672092bbe8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0509-c15-ids-01-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0509-c15-ids-01-e-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x120 RenderBlock {HTML} at (0,0) size 800x120 RenderBody {BODY} at (8,16) size 784x88 [color=#008000] RenderBlock {P} at (0,0) size 784x20 [color=#FF0000] - RenderInline {SPAN} at (0,0) size 152x19 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderInline {SPAN} at (0,0) size 163x19 [color=#008000] + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderText {#text} at (0,0) size 0x0 RenderBlock {PRE} at (0,36) size 784x16 RenderText {#text} at (0,0) size 224x16 @@ -14,5 +14,5 @@ layer at (0,0) size 800x120 RenderBlock {UL} at (0,68) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0509-id-sel-syntax-01-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0509-id-sel-syntax-01-f-expected.txt index 9fcf8ab129da..f2b3424deb9a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0509-id-sel-syntax-01-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0509-id-sel-syntax-01-f-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {DIV} at (0,0) size 784x20 [color=#008000] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "This text should be green" + RenderText {#text} at (0,0) size 159x19 + text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t0509-id-sel-syntax-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0509-id-sel-syntax-02-b-expected.txt index 699e243262c5..8f10e6c3b202 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0509-id-sel-syntax-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0509-id-sel-syntax-02-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {DIV} at (0,0) size 784x20 [color=#FF0000] RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "This text should be green" + RenderText {#text} at (0,0) size 159x19 + text run at (0,0) width 159: "This text should be green" diff --git a/LayoutTests/platform/wincairo/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt index c3435e108ed8..dc0f33c1edc2 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x116 RenderBlock {HTML} at (0,0) size 800x116 RenderBody {BODY} at (8,8) size 784x92 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 241x19 - text run at (0,0) width 241: "There should be two lines of text below." + RenderText {#text} at (0,0) size 253x19 + text run at (0,0) width 253: "There should be two lines of text below." RenderBlock {P} at (0,36) size 784x20 [color=#FF0000] - RenderText {#text} at (0,0) size 207x19 - text run at (0,0) width 207: "This line should be white on green." + RenderText {#text} at (0,0) size 222x19 + text run at (0,0) width 222: "This line should be white on green." RenderBlock {P} at (0,72) size 784x20 [color=#FF0000] - RenderText {#text} at (0,0) size 207x19 - text run at (0,0) width 207: "This line should be white on green." + RenderText {#text} at (0,0) size 222x19 + text run at (0,0) width 222: "This line should be white on green." diff --git a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt index 4c1715d2f8a4..7337e12b962d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-anch-00-e-i-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 184x19 [color=#008000] - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - RenderText {#text} at (184,0) size 252x19 - text run at (184,0) width 252: " Check that it remains green if you click it." + RenderInline {A} at (0,0) size 194x19 [color=#008000] + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." + RenderText {#text} at (194,0) size 267x19 + text run at (194,0) width 267: " Check that it remains green if you click it." diff --git a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-00-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-00-e-expected.txt index 729460d9d15f..a5d7c18ecdaa 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-00-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-00-e-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 153x19 [color=#008000] - RenderText {#text} at (0,0) size 153x19 - text run at (0,0) width 153: "This link should be green." - RenderText {#text} at (153,0) size 211x19 - text run at (153,0) width 211: " (do not hover over it or activate it)" + RenderInline {A} at (0,0) size 164x19 [color=#008000] + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This link should be green." + RenderText {#text} at (164,0) size 219x19 + text run at (164,0) width 219: " (do not hover over it or activate it)" diff --git a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-01-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-01-e-expected.txt index 729460d9d15f..a5d7c18ecdaa 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-01-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-01-e-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 153x19 [color=#008000] - RenderText {#text} at (0,0) size 153x19 - text run at (0,0) width 153: "This link should be green." - RenderText {#text} at (153,0) size 211x19 - text run at (153,0) width 211: " (do not hover over it or activate it)" + RenderInline {A} at (0,0) size 164x19 [color=#008000] + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This link should be green." + RenderText {#text} at (164,0) size 219x19 + text run at (164,0) width 219: " (do not hover over it or activate it)" diff --git a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-02-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-02-e-expected.txt index 729460d9d15f..a5d7c18ecdaa 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-02-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-02-e-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 153x19 [color=#008000] - RenderText {#text} at (0,0) size 153x19 - text run at (0,0) width 153: "This link should be green." - RenderText {#text} at (153,0) size 211x19 - text run at (153,0) width 211: " (do not hover over it or activate it)" + RenderInline {A} at (0,0) size 164x19 [color=#008000] + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This link should be green." + RenderText {#text} at (164,0) size 219x19 + text run at (164,0) width 219: " (do not hover over it or activate it)" diff --git a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-03-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-03-e-expected.txt index 729460d9d15f..a5d7c18ecdaa 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-03-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0511-c21-pseud-link-03-e-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 153x19 [color=#008000] - RenderText {#text} at (0,0) size 153x19 - text run at (0,0) width 153: "This link should be green." - RenderText {#text} at (153,0) size 211x19 - text run at (153,0) width 211: " (do not hover over it or activate it)" + RenderInline {A} at (0,0) size 164x19 [color=#008000] + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This link should be green." + RenderText {#text} at (164,0) size 219x19 + text run at (164,0) width 219: " (do not hover over it or activate it)" diff --git a/LayoutTests/platform/wincairo/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt b/LayoutTests/platform/wincairo/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt index 76ac11825900..682a79f31eca 100644 --- a/LayoutTests/platform/wincairo/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t051103-c21-activ-ln-00-e-i-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 311x19 [color=#0000FF] - RenderText {#text} at (0,0) size 311x19 - text run at (0,0) width 311: "While you are activating this link, it should go green." - RenderText {#text} at (311,0) size 400x19 - text run at (311,0) width 400: " Check that once you have stopped activating it, it goes blue again." + RenderInline {A} at (0,0) size 333x19 [color=#0000FF] + RenderText {#text} at (0,0) size 333x19 + text run at (0,0) width 333: "While you are activating this link, it should go green." + RenderText {#text} at (333,0) size 420x19 + text run at (333,0) width 420: " Check that once you have stopped activating it, it goes blue again." diff --git a/LayoutTests/platform/wincairo/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt b/LayoutTests/platform/wincairo/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt index b284f0c3ff43..037ea9d0b82f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t051103-c21-focus-ln-00-e-i-expected.txt @@ -4,6 +4,6 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 238x19 [color=#0000FF] - RenderText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "If you focus this link, it should go green." + RenderInline {A} at (0,0) size 255x19 [color=#0000FF] + RenderText {#text} at (0,0) size 255x19 + text run at (0,0) width 255: "If you focus this link, it should go green." diff --git a/LayoutTests/platform/wincairo/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt b/LayoutTests/platform/wincairo/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt index de8656ce51bd..0b91c2098e82 100644 --- a/LayoutTests/platform/wincairo/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t051103-c21-hover-ln-00-e-i-expected.txt @@ -4,6 +4,6 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 337x19 [color=#0000FF] - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "While you are hovering over this link, it should go green." + RenderInline {A} at (0,0) size 360x19 [color=#0000FF] + RenderText {#text} at (0,0) size 360x19 + text run at (0,0) width 360: "While you are hovering over this link, it should go green." diff --git a/LayoutTests/platform/wincairo/css2.1/t051103-dom-hover-01-c-io-expected.txt b/LayoutTests/platform/wincairo/css2.1/t051103-dom-hover-01-c-io-expected.txt index ab0f84811d15..91d874b2c9df 100644 --- a/LayoutTests/platform/wincairo/css2.1/t051103-dom-hover-01-c-io-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t051103-dom-hover-01-c-io-expected.txt @@ -4,10 +4,10 @@ layer at (0,0) size 800x56 RenderBlock {HTML} at (0,0) size 800x56 RenderBody {BODY} at (8,8) size 784x40 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 473x19 - text run at (0,0) width 96: "Hover this text, " - text run at (96,0) width 159: "then wait till it disappears. " - text run at (255,0) width 218: "At that point there should be no red." + RenderText {#text} at (0,0) size 496x19 + text run at (0,0) width 101: "Hover this text, " + text run at (101,0) width 168: "then wait till it disappears. " + text run at (269,0) width 227: "At that point there should be no red." RenderBlock {DIV} at (0,20) size 784x20 [color=#FF0000] - RenderText {#text} at (0,0) size 154x19 - text run at (0,0) width 154: "This should end up green." + RenderText {#text} at (0,0) size 164x19 + text run at (0,0) width 164: "This should end up green." diff --git a/LayoutTests/platform/wincairo/css2.1/t051103-dom-hover-02-c-io-expected.txt b/LayoutTests/platform/wincairo/css2.1/t051103-dom-hover-02-c-io-expected.txt index 04df5f41dc75..ef5f82f1659d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t051103-dom-hover-02-c-io-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t051103-dom-hover-02-c-io-expected.txt @@ -5,15 +5,15 @@ layer at (0,0) size 800x76 RenderBody {BODY} at (8,8) size 784x60 RenderBlock {DIV} at (0,0) size 784x40 RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 158x19 - text run at (0,0) width 158: "Dummy text. Dummy text." + RenderText {#text} at (0,0) size 170x19 + text run at (0,0) width 170: "Dummy text. Dummy text." RenderBlock {DIV} at (0,20) size 784x20 - RenderInline {SPAN} at (0,0) size 473x19 - RenderText {#text} at (0,0) size 473x19 - text run at (0,0) width 96: "Hover this text, " - text run at (96,0) width 159: "then wait till it disappears. " - text run at (255,0) width 218: "At that point there should be no red." + RenderInline {SPAN} at (0,0) size 496x19 + RenderText {#text} at (0,0) size 496x19 + text run at (0,0) width 101: "Hover this text, " + text run at (101,0) width 168: "then wait till it disappears. " + text run at (269,0) width 227: "At that point there should be no red." RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,40) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 158x19 - text run at (0,0) width 158: "Dummy text. Dummy text." + RenderText {#text} at (0,0) size 170x19 + text run at (0,0) width 170: "Dummy text. Dummy text." diff --git a/LayoutTests/platform/wincairo/css2.1/t051201-c23-first-line-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t051201-c23-first-line-00-b-expected.txt index 0d0d4095c1e6..2503899410fc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t051201-c23-first-line-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t051201-c23-first-line-00-b-expected.txt @@ -1,93 +1,95 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x402 - RenderBlock {HTML} at (0,0) size 800x402 - RenderBody {BODY} at (8,16) size 784x370 [color=#0000FF] - RenderBlock {P} at (0,0) size 784x100 - RenderText {#text} at (0,0) size 27x19 - text run at (0,0) width 27: "The " +layer at (0,0) size 800x442 + RenderBlock {HTML} at (0,0) size 800x442 + RenderBody {BODY} at (8,16) size 784x410 [color=#0000FF] + RenderBlock {P} at (0,0) size 784x120 + RenderText {#text} at (0,0) size 29x19 + text run at (0,0) width 29: "The " RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (27,0) size 55x19 - text run at (27,0) width 55: "first line" - RenderText {#text} at (82,0) size 286x19 - text run at (82,0) width 194: " of this paragraph, and only that " - text run at (276,0) width 92: "one, should be " + RenderText {#text} at (29,0) size 55x19 + text run at (29,0) width 55: "first line" + RenderText {#text} at (84,0) size 300x19 + text run at (84,0) width 204: " of this paragraph, and only that " + text run at (288,0) width 96: "one, should be " RenderInline {STRONG} at (0,0) size 38x19 - RenderText {#text} at (368,0) size 38x19 - text run at (368,0) width 38: "green" - RenderText {#text} at (406,0) size 776x99 - text run at (406,0) width 169: ". If this precise combination " - text run at (575,0) width 174: "does not occur, then the user" - text run at (0,20) width 219: "agent has failed this test. Remember " - text run at (219,20) width 373: "that in order to ensure a complete test, the paragraph must be " - text run at (592,20) width 166: "displayed on more than one" - text run at (0,40) width 241: "line. Dummy text. Dummy text. Dummy " - text run at (241,40) width 435: "text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " - text run at (676,40) width 77: "Dummy text." - text run at (0,60) width 375: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (375,60) width 401: "text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy" - text run at (0,80) width 30: "text. " - text run at (30,80) width 456: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (486,80) width 269: "text. Dummy text. Dummy text. Dummy text." - RenderBlock {P} at (0,116) size 784x138 - RenderText {#text} at (0,1) size 56x36 - text run at (0,1) width 56: "The " - RenderInline {STRONG} at (0,0) size 116x36 - RenderText {#text} at (56,0) size 116x36 - text run at (56,0) width 116: "first line" - RenderText {#text} at (172,1) size 610x36 - text run at (172,1) width 407: " of this paragraph, and only that " - text run at (579,1) width 203: "one, should be a" - RenderInline {STRONG} at (0,0) size 40x19 - RenderText {#text} at (0,38) size 40x19 - text run at (0,38) width 40: "larger" - RenderText {#text} at (40,38) size 119x19 - text run at (40,38) width 119: " font size as well as " + RenderText {#text} at (384,0) size 38x19 + text run at (384,0) width 38: "green" + RenderText {#text} at (422,0) size 780x119 + text run at (422,0) width 178: ". If this precise combination " + text run at (600,0) width 180: "does not occur, then the user" + text run at (0,20) width 230: "agent has failed this test. Remember " + text run at (230,20) width 385: "that in order to ensure a complete test, the paragraph must be " + text run at (615,20) width 147: "displayed on more than" + text run at (0,40) width 288: "one line. Dummy text. Dummy text. Dummy " + text run at (288,40) width 462: "text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text." + text run at (0,60) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (491,60) width 288: "text. Dummy text. Dummy text. Dummy text." + text run at (0,80) width 174: "Dummy text. Dummy text. " + text run at (174,80) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (665,80) width 114: "text. Dummy text." + text run at (0,100) width 170: "Dummy text. Dummy text." + RenderBlock {P} at (0,136) size 784x138 + RenderText {#text} at (0,1) size 58x36 + text run at (0,1) width 58: "The " + RenderInline {STRONG} at (0,0) size 115x36 + RenderText {#text} at (58,0) size 115x36 + text run at (58,0) width 115: "first line" + RenderText {#text} at (173,1) size 774x56 + text run at (173,1) width 416: " of this paragraph, and only that " + text run at (589,1) width 185: "one, should be" + text run at (0,38) width 11: "a " + RenderInline {STRONG} at (0,0) size 41x19 + RenderText {#text} at (11,38) size 41x19 + text run at (11,38) width 41: "larger" + RenderText {#text} at (52,38) size 126x19 + text run at (52,38) width 126: " font size as well as " RenderInline {STRONG} at (0,0) size 38x19 - RenderText {#text} at (159,38) size 38x19 - text run at (159,38) width 38: "green" - RenderText {#text} at (197,38) size 780x99 - text run at (197,38) width 267: ". If this precise combination does not occur, " - text run at (464,38) width 295: "then the user agent has failed this test. Remember" - text run at (0,58) width 93: "that in order to " - text run at (93,58) width 395: "ensure a complete test, the paragraph must be displayed on more " - text run at (488,58) width 292: "than one line. Dummy text. Dummy text. Dummy" - text run at (0,78) width 111: "text. Dummy text. " - text run at (111,78) width 456: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (567,78) width 188: "text. Dummy text. Dummy text." - text run at (0,98) width 243: "Dummy text. Dummy text. Dummy text. " - text run at (243,98) width 456: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (699,98) width 77: "text. Dummy" - text run at (0,118) width 354: "text. Dummy text. Dummy text. Dummy text. Dummy text. " - text run at (354,118) width 158: "Dummy text. Dummy text." - RenderBlock {P} at (0,270) size 784x100 - RenderText {#text} at (0,0) size 28x19 - text run at (0,0) width 28: "The " - RenderInline {STRONG} at (0,0) size 60x19 - RenderText {#text} at (28,0) size 60x19 - text run at (28,0) width 60: "first line" - RenderText {#text} at (88,0) size 404x19 - text run at (88,0) width 225: " of this paragraph, and only that " - text run at (313,0) width 179: "one, should be displayed in " - RenderInline {STRONG} at (0,0) size 75x19 - RenderText {#text} at (492,0) size 75x19 - text run at (492,0) width 75: "small-caps" - RenderText {#text} at (567,0) size 113x19 - text run at (567,0) width 60: " style as " - text run at (627,0) width 53: "well as " - RenderInline {STRONG} at (0,0) size 37x19 - RenderText {#text} at (680,0) size 37x19 - text run at (680,0) width 37: "green" - RenderText {#text} at (717,0) size 776x99 - text run at (717,0) width 56: ". Thus, if" - text run at (0,20) width 122: "the first line is not in " - text run at (122,20) width 325: "small-caps style, or if the entire paragraph turns out in " - text run at (447,20) width 297: "small-caps, then the user agent has failed this test." - text run at (0,40) width 81: "Dummy text. " - text run at (81,40) width 456: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (537,40) width 239: "text. Dummy text. Dummy text. Dummy" - text run at (0,60) width 192: "text. Dummy text. Dummy text. " - text run at (192,60) width 456: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " - text run at (648,60) width 107: "text. Dummy text." - text run at (0,80) width 324: "Dummy text. Dummy text. Dummy text. Dummy text. " - text run at (324,80) width 401: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text." + RenderText {#text} at (178,38) size 38x19 + text run at (178,38) width 38: "green" + RenderText {#text} at (216,38) size 779x99 + text run at (216,38) width 278: ". If this precise combination does not occur, " + text run at (494,38) width 237: "then the user agent has failed this test." + text run at (0,58) width 169: "Remember that in order to " + text run at (169,58) width 409: "ensure a complete test, the paragraph must be displayed on more " + text run at (578,58) width 172: "than one line. Dummy text." + text run at (0,78) width 261: "Dummy text. Dummy text. Dummy text. " + text run at (261,78) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (752,78) width 27: "text." + text run at (0,98) width 435: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " + text run at (435,98) width 344: "Dummy text. Dummy text. Dummy text. Dummy text." + text run at (0,118) width 143: "Dummy text. Dummy " + text run at (143,118) width 466: "text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " + text run at (609,118) width 170: "Dummy text. Dummy text." + RenderBlock {P} at (0,290) size 784x120 + RenderText {#text} at (0,0) size 29x19 + text run at (0,0) width 29: "The " + RenderInline {STRONG} at (0,0) size 62x19 + RenderText {#text} at (29,0) size 62x19 + text run at (29,0) width 62: "first line" + RenderText {#text} at (91,0) size 398x19 + text run at (91,0) width 219: " of this paragraph, and only that " + text run at (310,0) width 179: "one, should be displayed in " + RenderInline {STRONG} at (0,0) size 73x19 + RenderText {#text} at (489,0) size 73x19 + text run at (489,0) width 73: "small-caps" + RenderText {#text} at (562,0) size 115x19 + text run at (562,0) width 61: " style as " + text run at (623,0) width 54: "well as " + RenderInline {STRONG} at (0,0) size 39x19 + RenderText {#text} at (677,0) size 39x19 + text run at (677,0) width 39: "green" + RenderText {#text} at (716,0) size 784x119 + text run at (716,0) width 58: ". Thus, if" + text run at (0,20) width 132: "the first line is not in " + text run at (132,20) width 341: "small-caps style, or if the entire paragraph turns out in " + text run at (473,20) width 311: "small-caps, then the user agent has failed this test." + text run at (0,40) width 87: "Dummy text. " + text run at (87,40) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (578,40) width 201: "text. Dummy text. Dummy text." + text run at (0,60) width 261: "Dummy text. Dummy text. Dummy text. " + text run at (261,60) width 491: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy " + text run at (752,60) width 27: "text." + text run at (0,80) width 435: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. " + text run at (435,80) width 344: "Dummy text. Dummy text. Dummy text. Dummy text." + text run at (0,100) width 83: "Dummy text." diff --git a/LayoutTests/platform/wincairo/css2.1/t051202-c24-first-lttr-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t051202-c24-first-lttr-00-b-expected.txt index 82cb8528d4b3..fe04e65ac78a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t051202-c24-first-lttr-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t051202-c24-first-lttr-00-b-expected.txt @@ -1,73 +1,74 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x247 - RenderBlock {HTML} at (0,0) size 800x247 - RenderBody {BODY} at (8,16) size 784x215 [color=#0000FF] +layer at (0,0) size 800x267 + RenderBlock {HTML} at (0,0) size 800x267 + RenderBody {BODY} at (8,16) size 784x235 [color=#0000FF] RenderBlock {P} at (0,0) size 784x40 RenderInline (generated) at (0,0) size 9x19 [color=#008000] RenderText at (0,0) size 9x19 text run at (0,0) width 9: "T" - RenderText {#text} at (9,0) size 18x19 - text run at (9,0) width 18: "he " - RenderInline {STRONG} at (0,0) size 67x19 - RenderText {#text} at (27,0) size 67x19 - text run at (27,0) width 67: "first letter" - RenderText {#text} at (94,0) size 286x19 - text run at (94,0) width 194: " of this paragraph, and only that " - text run at (288,0) width 92: "one, should be " + RenderText {#text} at (9,0) size 19x19 + text run at (9,0) width 19: "he " + RenderInline {STRONG} at (0,0) size 66x19 + RenderText {#text} at (28,0) size 66x19 + text run at (28,0) width 66: "first letter" + RenderText {#text} at (94,0) size 300x19 + text run at (94,0) width 204: " of this paragraph, and only that " + text run at (298,0) width 96: "one, should be " RenderInline {STRONG} at (0,0) size 38x19 - RenderText {#text} at (380,0) size 38x19 - text run at (380,0) width 38: "green" - RenderText {#text} at (418,0) size 761x39 - text run at (418,0) width 169: ". If this precise combination " - text run at (587,0) width 174: "does not occur, then the user" - text run at (0,20) width 145: "agent has failed this test." + RenderText {#text} at (394,0) size 38x19 + text run at (394,0) width 38: "green" + RenderText {#text} at (432,0) size 760x39 + text run at (432,0) width 178: ". If this precise combination " + text run at (610,0) width 150: "does not occur, then the" + text run at (0,20) width 183: "user agent has failed this test." RenderBlock {P} at (0,56) size 784x57 RenderInline (generated) at (0,0) size 19x36 [color=#008000] RenderText at (0,0) size 19x36 text run at (0,0) width 19: "T" - RenderText {#text} at (19,13) size 18x19 - text run at (19,13) width 18: "he " - RenderInline {STRONG} at (0,0) size 67x19 - RenderText {#text} at (37,13) size 67x19 - text run at (37,13) width 67: "first letter" - RenderText {#text} at (104,13) size 311x19 - text run at (104,13) width 194: " of this paragraph, and only that " - text run at (298,13) width 117: "one, should be in a " - RenderInline {STRONG} at (0,0) size 40x19 - RenderText {#text} at (415,13) size 40x19 - text run at (415,13) width 40: "larger" - RenderText {#text} at (455,13) size 123x19 - text run at (455,13) width 123: " font size, as well as " + RenderText {#text} at (19,13) size 19x19 + text run at (19,13) width 19: "he " + RenderInline {STRONG} at (0,0) size 66x19 + RenderText {#text} at (38,13) size 66x19 + text run at (38,13) width 66: "first letter" + RenderText {#text} at (104,13) size 327x19 + text run at (104,13) width 204: " of this paragraph, and only that " + text run at (308,13) width 123: "one, should be in a " + RenderInline {STRONG} at (0,0) size 41x19 + RenderText {#text} at (431,13) size 41x19 + text run at (431,13) width 41: "larger" + RenderText {#text} at (472,13) size 130x19 + text run at (472,13) width 130: " font size, as well as " RenderInline {STRONG} at (0,0) size 38x19 - RenderText {#text} at (578,13) size 38x19 - text run at (578,13) width 38: "green" - RenderText {#text} at (616,13) size 781x43 - text run at (616,13) width 165: ". If this precise combination" - text run at (0,37) width 98: "does not occur, " - text run at (98,37) width 225: "then the user agent has failed this test." - RenderBlock {P} at (0,129) size 784x86 - RenderInline (generated) at (0,0) size 58x64 [color=#008000] - RenderText at (0,1) size 58x64 - text run at (0,1) width 58: "\"T" - RenderText {#text} at (58,36) size 18x19 - text run at (58,36) width 18: "he " - RenderInline {STRONG} at (0,0) size 128x19 - RenderText {#text} at (76,36) size 128x19 - text run at (76,36) width 128: "first two characters" - RenderText {#text} at (204,36) size 434x19 - text run at (204,36) width 123: " in this paragraph (a " - text run at (327,36) width 311: "double-quote mark and a capital 'T') should be in a " - RenderInline {STRONG} at (0,0) size 79x19 - RenderText {#text} at (638,36) size 79x19 - text run at (638,36) width 39: "much " - text run at (677,36) width 40: "larger" - RenderText {#text} at (717,36) size 770x49 - text run at (717,36) width 53: " font size" - text run at (0,66) width 210: "than the rest of the paragraph, and " + RenderText {#text} at (602,13) size 38x19 + text run at (602,13) width 38: "green" + RenderText {#text} at (640,13) size 732x43 + text run at (640,13) width 92: ". If this precise" + text run at (0,37) width 182: "combination does not occur, " + text run at (182,37) width 237: "then the user agent has failed this test." + RenderBlock {P} at (0,129) size 784x106 + RenderInline (generated) at (0,0) size 57x64 [color=#008000] + RenderText at (0,1) size 57x64 + text run at (0,1) width 57: "\"T" + RenderText {#text} at (57,36) size 19x19 + text run at (57,36) width 19: "he " + RenderInline {STRONG} at (0,0) size 131x19 + RenderText {#text} at (76,36) size 131x19 + text run at (76,36) width 131: "first two characters" + RenderText {#text} at (207,36) size 452x19 + text run at (207,36) width 129: " in this paragraph (a " + text run at (336,36) width 323: "double-quote mark and a capital 'T') should be in a " + RenderInline {STRONG} at (0,0) size 83x19 + RenderText {#text} at (659,36) size 83x19 + text run at (659,36) width 42: "much " + text run at (701,36) width 41: "larger" + RenderText {#text} at (742,36) size 771x49 + text run at (742,36) width 29: " font" + text run at (0,66) width 246: "size than the rest of the paragraph, and " RenderInline {STRONG} at (0,0) size 38x19 - RenderText {#text} at (210,66) size 38x19 - text run at (210,66) width 38: "green" - RenderText {#text} at (248,66) size 492x19 - text run at (248,66) width 267: ". If this precise combination does not occur, " - text run at (515,66) width 225: "then the user agent has failed this test." + RenderText {#text} at (246,66) size 38x19 + text run at (246,66) width 38: "green" + RenderText {#text} at (284,66) size 770x39 + text run at (284,66) width 278: ". If this precise combination does not occur, " + text run at (562,66) width 208: "then the user agent has failed this" + text run at (0,86) width 25: "test." diff --git a/LayoutTests/platform/wincairo/css2.1/t051202-c26-psudo-nest-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t051202-c26-psudo-nest-00-c-expected.txt index d5b59132e525..f9532ee13e05 100644 --- a/LayoutTests/platform/wincairo/css2.1/t051202-c26-psudo-nest-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t051202-c26-psudo-nest-00-c-expected.txt @@ -7,133 +7,131 @@ layer at (0,0) size 800x479 RenderInline (generated) at (0,0) size 88x164 [color=#00FFFF] RenderText at (0,3) size 88x164 text run at (0,3) width 88: "T" - RenderText {#text} at (88,89) size 56x55 - text run at (88,89) width 56: "he " + RenderText {#text} at (88,89) size 57x55 + text run at (88,89) width 57: "he " RenderInline {STRONG} at (0,0) size 205x55 - RenderText {#text} at (144,88) size 205x55 - text run at (144,88) width 205: "first letter" - RenderText {#text} at (349,89) size 772x100 - text run at (349,89) width 423: " of this paragraph, and" - text run at (0,170) width 55: "only that " - text run at (55,170) width 92: "one, should be " - RenderInline {STRONG} at (0,0) size 86x19 - RenderText {#text} at (147,170) size 86x19 - text run at (147,170) width 86: "600% bigger" - RenderText {#text} at (233,170) size 492x19 - text run at (233,170) width 126: " than the normal text " - text run at (359,170) width 366: "(300% bigger than the rest of first line of this paragraph) and " - RenderInline {STRONG} at (0,0) size 32x19 - RenderText {#text} at (725,170) size 32x19 - text run at (725,170) width 32: "aqua" - RenderText {#text} at (757,170) size 761x39 - text run at (757,170) width 4: "," - text run at (0,190) width 94: "while the entire " + RenderText {#text} at (145,88) size 205x55 + text run at (145,88) width 205: "first letter" + RenderText {#text} at (350,89) size 779x100 + text run at (350,89) width 429: " of this paragraph, and" + text run at (0,170) width 59: "only that " + text run at (59,170) width 96: "one, should be " + RenderInline {STRONG} at (0,0) size 87x19 + RenderText {#text} at (155,170) size 87x19 + text run at (155,170) width 87: "600% bigger" + RenderText {#text} at (242,170) size 513x19 + text run at (242,170) width 133: " than the normal text " + text run at (375,170) width 380: "(300% bigger than the rest of first line of this paragraph) and" + RenderInline {STRONG} at (0,0) size 34x19 + RenderText {#text} at (0,190) size 34x19 + text run at (0,190) width 34: "aqua" + RenderText {#text} at (34,190) size 109x19 + text run at (34,190) width 109: ", while the entire " RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (94,190) size 55x19 - text run at (94,190) width 55: "first line" - RenderText {#text} at (149,190) size 66x19 - text run at (149,190) width 4: " " - text run at (153,190) width 62: "should be " - RenderInline {STRONG} at (0,0) size 86x19 - RenderText {#text} at (215,190) size 86x19 - text run at (215,190) width 86: "300% bigger" - RenderText {#text} at (301,190) size 104x19 - text run at (301,190) width 104: " than normal and " - RenderInline {STRONG} at (0,0) size 25x19 - RenderText {#text} at (405,190) size 25x19 - text run at (405,190) width 25: "teal" - RenderText {#text} at (430,190) size 773x59 - text run at (430,190) width 267: ". If this precise combination does not occur, " - text run at (697,190) width 76: "then the user" - text run at (0,210) width 312: "agent has failed this test. Remember that in order to " - text run at (312,210) width 395: "ensure a complete test, the paragraph must be displayed on more " - text run at (707,210) width 51: "than one" - text run at (0,230) width 82: "line. (TEST1)" + RenderText {#text} at (143,190) size 55x19 + text run at (143,190) width 55: "first line" + RenderText {#text} at (198,190) size 69x19 + text run at (198,190) width 4: " " + text run at (202,190) width 65: "should be " + RenderInline {STRONG} at (0,0) size 87x19 + RenderText {#text} at (267,190) size 87x19 + text run at (267,190) width 87: "300% bigger" + RenderText {#text} at (354,190) size 110x19 + text run at (354,190) width 110: " than normal and " + RenderInline {STRONG} at (0,0) size 24x19 + RenderText {#text} at (464,190) size 24x19 + text run at (464,190) width 24: "teal" + RenderText {#text} at (488,190) size 779x59 + text run at (488,190) width 274: ". If this precise combination does not occur," + text run at (0,210) width 410: "then the user agent has failed this test. Remember that in order to " + text run at (410,210) width 369: "ensure a complete test, the paragraph must be displayed on" + text run at (0,230) width 36: "more " + text run at (36,230) width 146: "than one line. (TEST1)" RenderBlock {P} at (0,266) size 784x77 - RenderInline (generated) at (0,0) size 32x36 [color=#00FFFF] - RenderText at (0,0) size 32x36 - text run at (0,0) width 32: "\"T" - RenderText {#text} at (32,13) size 94x19 - text run at (32,13) width 94: "est\": The first " - RenderInline {STRONG} at (0,0) size 110x19 - RenderText {#text} at (126,13) size 110x19 - text run at (126,13) width 110: "two characters" - RenderText {#text} at (236,13) size 451x19 - text run at (236,13) width 120: " in this paragraph " - text run at (356,13) width 331: "(a double-quote mark and a capital 'T') should be " + RenderInline (generated) at (0,0) size 33x36 [color=#00FFFF] + RenderText at (0,0) size 33x36 + text run at (0,0) width 33: "\"T" + RenderText {#text} at (33,13) size 98x19 + text run at (33,13) width 98: "est\": The first " + RenderInline {STRONG} at (0,0) size 108x19 + RenderText {#text} at (131,13) size 108x19 + text run at (131,13) width 108: "two characters" + RenderText {#text} at (239,13) size 446x19 + text run at (239,13) width 118: " in this paragraph " + text run at (357,13) width 328: "(a double-quote mark and a capital 'T') should be " RenderInline {STRONG} at (0,0) size 88x19 - RenderText {#text} at (687,13) size 88x19 - text run at (687,13) width 44: "200% " - text run at (731,13) width 44: "bigger" - RenderText {#text} at (0,37) size 210x19 - text run at (0,37) width 210: "than the rest of the paragraph, and " - RenderInline {STRONG} at (0,0) size 32x19 - RenderText {#text} at (210,37) size 32x19 - text run at (210,37) width 32: "aqua" - RenderText {#text} at (242,37) size 139x19 - text run at (242,37) width 139: ". In addition, the entire " + RenderText {#text} at (685,13) size 88x19 + text run at (685,13) width 44: "200% " + text run at (729,13) width 44: "bigger" + RenderText {#text} at (0,37) size 218x19 + text run at (0,37) width 218: "than the rest of the paragraph, and " + RenderInline {STRONG} at (0,0) size 34x19 + RenderText {#text} at (218,37) size 34x19 + text run at (218,37) width 34: "aqua" + RenderText {#text} at (252,37) size 146x19 + text run at (252,37) width 146: ". In addition, the entire " RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (381,37) size 55x19 - text run at (381,37) width 31: "first " - text run at (412,37) width 24: "line" - RenderText {#text} at (436,37) size 91x19 - text run at (436,37) width 91: " should be in a " - RenderInline {STRONG} at (0,0) size 157x19 - RenderText {#text} at (527,37) size 157x19 - text run at (527,37) width 132: "small-caps font and " - text run at (659,37) width 25: "teal" - RenderText {#text} at (684,37) size 784x39 - text run at (684,37) width 100: ". Remember that" - text run at (0,57) width 209: "in order to ensure a complete test, " - text run at (209,57) width 390: "the paragraph must be displayed on more than one line. (TEST2)" + RenderText {#text} at (398,37) size 55x19 + text run at (398,37) width 31: "first " + text run at (429,37) width 24: "line" + RenderText {#text} at (453,37) size 96x19 + text run at (453,37) width 96: " should be in a " + RenderInline {STRONG} at (0,0) size 159x19 + RenderText {#text} at (549,37) size 159x19 + text run at (549,37) width 135: "small-caps font and " + text run at (684,37) width 24: "teal" + RenderText {#text} at (708,37) size 724x39 + text run at (708,37) width 4: "." + text run at (0,57) width 315: "Remember that in order to ensure a complete test, " + text run at (315,57) width 409: "the paragraph must be displayed on more than one line. (TEST2)" RenderBlock {P} at (0,359) size 784x60 RenderInline (generated) at (0,0) size 9x19 [color=#00FFFF] RenderText at (0,0) size 9x19 text run at (0,0) width 9: "T" - RenderText {#text} at (9,0) size 18x19 - text run at (9,0) width 18: "he " - RenderInline {STRONG} at (0,0) size 67x19 - RenderText {#text} at (27,0) size 67x19 - text run at (27,0) width 67: "first letter" - RenderText {#text} at (94,0) size 286x19 - text run at (94,0) width 194: " of this paragraph, and only that " - text run at (288,0) width 92: "one, should be " - RenderInline {STRONG} at (0,0) size 32x19 - RenderText {#text} at (380,0) size 32x19 - text run at (380,0) width 32: "aqua" - RenderText {#text} at (412,0) size 102x19 - text run at (412,0) width 102: ", while the entire " + RenderText {#text} at (9,0) size 19x19 + text run at (9,0) width 19: "he " + RenderInline {STRONG} at (0,0) size 66x19 + RenderText {#text} at (28,0) size 66x19 + text run at (28,0) width 66: "first letter" + RenderText {#text} at (94,0) size 300x19 + text run at (94,0) width 204: " of this paragraph, and only that " + text run at (298,0) width 96: "one, should be " + RenderInline {STRONG} at (0,0) size 34x19 + RenderText {#text} at (394,0) size 34x19 + text run at (394,0) width 34: "aqua" + RenderText {#text} at (428,0) size 109x19 + text run at (428,0) width 109: ", while the entire " RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (514,0) size 55x19 - text run at (514,0) width 55: "first line" - RenderText {#text} at (569,0) size 66x19 - text run at (569,0) width 66: " should be " - RenderInline {STRONG} at (0,0) size 25x19 - RenderText {#text} at (635,0) size 25x19 - text run at (635,0) width 25: "teal" - RenderText {#text} at (660,0) size 748x59 - text run at (660,0) width 21: ". If " - text run at (681,0) width 67: "this precise" - text run at (0,20) width 315: "combination does not occur, then the user agent has " - text run at (315,20) width 394: "failed this test. Remember that in order to ensure a complete test, " - text run at (709,20) width 18: "the" - text run at (0,40) width 368: "paragraph must be displayed on more than one line. (TEST3)" + RenderText {#text} at (537,0) size 55x19 + text run at (537,0) width 55: "first line" + RenderText {#text} at (592,0) size 69x19 + text run at (592,0) width 69: " should be " + RenderInline {STRONG} at (0,0) size 24x19 + RenderText {#text} at (661,0) size 24x19 + text run at (661,0) width 24: "teal" + RenderText {#text} at (685,0) size 777x59 + text run at (685,0) width 22: ". If " + text run at (707,0) width 70: "this precise" + text run at (0,20) width 329: "combination does not occur, then the user agent has " + text run at (329,20) width 409: "failed this test. Remember that in order to ensure a complete test, " + text run at (738,20) width 19: "the" + text run at (0,40) width 386: "paragraph must be displayed on more than one line. (TEST3)" RenderBlock {DIV} at (0,435) size 784x20 - RenderText {#text} at (0,0) size 161x19 - text run at (0,0) width 161: "You should see the words " - RenderInline {STRONG} at (0,0) size 65x19 - RenderText {#text} at (161,0) size 65x19 - text run at (161,0) width 65: "\"TEST1\"" - RenderText {#text} at (226,0) size 8x19 - text run at (226,0) width 8: ", " - RenderInline {STRONG} at (0,0) size 65x19 - RenderText {#text} at (234,0) size 65x19 - text run at (234,0) width 65: "\"TEST2\"" - RenderText {#text} at (299,0) size 34x19 - text run at (299,0) width 34: ", and " - RenderInline {STRONG} at (0,0) size 65x19 - RenderText {#text} at (333,0) size 65x19 - text run at (333,0) width 65: "\"TEST3\"" - RenderText {#text} at (398,0) size 229x19 - text run at (398,0) width 83: " at the end of " - text run at (481,0) width 146: "three paragraphs above." + RenderText {#text} at (0,0) size 166x19 + text run at (0,0) width 166: "You should see the words " + RenderInline {STRONG} at (0,0) size 68x19 + RenderText {#text} at (166,0) size 68x19 + text run at (166,0) width 68: "\"TEST1\"" + RenderText {#text} at (234,0) size 8x19 + text run at (234,0) width 8: ", " + RenderInline {STRONG} at (0,0) size 68x19 + RenderText {#text} at (242,0) size 68x19 + text run at (242,0) width 68: "\"TEST2\"" + RenderText {#text} at (310,0) size 35x19 + text run at (310,0) width 35: ", and " + RenderInline {STRONG} at (0,0) size 68x19 + RenderText {#text} at (345,0) size 68x19 + text run at (345,0) width 68: "\"TEST3\"" + RenderText {#text} at (413,0) size 236x19 + text run at (413,0) width 86: " at the end of " + text run at (499,0) width 150: "three paragraphs above." diff --git a/LayoutTests/platform/wincairo/css2.1/t0602-c13-inh-underlin-00-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0602-c13-inh-underlin-00-e-expected.txt index 52c45e6488d6..a0aa2cb36ae1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0602-c13-inh-underlin-00-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0602-c13-inh-underlin-00-e-expected.txt @@ -4,51 +4,51 @@ layer at (0,0) size 800x160 RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x128 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 212x19 - text run at (0,0) width 212: "This should be blue and underlined." + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "This should be blue and underlined." RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 273x19 - text run at (0,0) width 273: "This sentence should be underlined, including " + RenderText {#text} at (0,0) size 293x19 + text run at (0,0) width 293: "This sentence should be underlined, including " RenderInline {CODE} at (0,0) size 72x16 - RenderText {#text} at (273,3) size 72x16 - text run at (273,3) width 72: "this part" - RenderText {#text} at (345,0) size 8x19 - text run at (345,0) width 8: ", " - RenderInline {CITE} at (0,0) size 54x19 - RenderText {#text} at (353,0) size 54x19 - text run at (353,0) width 54: "this part" - RenderText {#text} at (407,0) size 8x19 - text run at (407,0) width 8: ", " - RenderInline {EM} at (0,0) size 54x19 - RenderText {#text} at (415,0) size 54x19 - text run at (415,0) width 54: "this part" - RenderText {#text} at (469,0) size 34x19 - text run at (469,0) width 8: ", " - text run at (477,0) width 26: "and " - RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (503,0) size 55x19 - text run at (503,0) width 55: "this part" - RenderText {#text} at (558,0) size 4x19 - text run at (558,0) width 4: "." + RenderText {#text} at (293,3) size 72x16 + text run at (293,3) width 72: "this part" + RenderText {#text} at (365,0) size 8x19 + text run at (365,0) width 8: ", " + RenderInline {CITE} at (0,0) size 52x19 + RenderText {#text} at (373,0) size 52x19 + text run at (373,0) width 52: "this part" + RenderText {#text} at (425,0) size 8x19 + text run at (425,0) width 8: ", " + RenderInline {EM} at (0,0) size 52x19 + RenderText {#text} at (433,0) size 52x19 + text run at (433,0) width 52: "this part" + RenderText {#text} at (485,0) size 35x19 + text run at (485,0) width 8: ", " + text run at (493,0) width 27: "and " + RenderInline {STRONG} at (0,0) size 57x19 + RenderText {#text} at (520,0) size 57x19 + text run at (520,0) width 57: "this part" + RenderText {#text} at (577,0) size 4x19 + text run at (577,0) width 4: "." RenderBlock {P} at (0,72) size 784x20 - RenderText {#text} at (0,0) size 373x19 - text run at (0,0) width 279: "This sentence should also be underlined, as " - text run at (279,0) width 94: "well as italics, " - RenderInline {STRONG} at (0,0) size 125x19 - RenderText {#text} at (373,0) size 125x19 - text run at (373,0) width 125: "including this part" - RenderText {#text} at (498,0) size 4x19 - text run at (498,0) width 4: "." + RenderText {#text} at (0,0) size 371x19 + text run at (0,0) width 278: "This sentence should also be underlined, as " + text run at (278,0) width 93: "well as italics, " + RenderInline {STRONG} at (0,0) size 119x19 + RenderText {#text} at (371,0) size 119x19 + text run at (371,0) width 119: "including this part" + RenderText {#text} at (490,0) size 4x19 + text run at (490,0) width 4: "." RenderBlock {P} at (0,108) size 784x20 - RenderText {#text} at (0,0) size 317x19 - text run at (0,0) width 317: "This sentence should be blue but not underlined, like " - RenderInline {STRONG} at (0,0) size 55x19 - RenderText {#text} at (317,0) size 55x19 - text run at (317,0) width 55: "this part" - RenderText {#text} at (372,0) size 31x19 - text run at (372,0) width 31: ", but " - RenderInline {EM} at (0,0) size 191x19 - RenderText {#text} at (403,0) size 191x19 - text run at (403,0) width 191: "this part should be underlined" - RenderText {#text} at (594,0) size 4x19 - text run at (594,0) width 4: "." + RenderText {#text} at (0,0) size 336x19 + text run at (0,0) width 336: "This sentence should be blue but not underlined, like " + RenderInline {STRONG} at (0,0) size 57x19 + RenderText {#text} at (336,0) size 57x19 + text run at (336,0) width 57: "this part" + RenderText {#text} at (393,0) size 32x19 + text run at (393,0) width 32: ", but " + RenderInline {EM} at (0,0) size 189x19 + RenderText {#text} at (425,0) size 189x19 + text run at (425,0) width 189: "this part should be underlined" + RenderText {#text} at (614,0) size 4x19 + text run at (614,0) width 4: "." diff --git a/LayoutTests/platform/wincairo/css2.1/t0602-c13-inheritance-00-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0602-c13-inheritance-00-e-expected.txt index 4aa0fe54fefb..4870249131d6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0602-c13-inheritance-00-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0602-c13-inheritance-00-e-expected.txt @@ -4,30 +4,30 @@ layer at (0,0) size 800x160 RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x128 [color=#008000] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." + RenderText {#text} at (0,0) size 194x19 + text run at (0,0) width 194: "This sentence should be green." RenderBlock {P} at (0,36) size 784x20 [color=#FFFFFF] [bgcolor=#008000] - RenderText {#text} at (0,0) size 85x19 - text run at (0,0) width 85: "This sentence " + RenderText {#text} at (0,0) size 90x19 + text run at (0,0) width 90: "This sentence " RenderInline {SPAN} at (0,0) size 61x19 - RenderText {#text} at (85,0) size 61x19 - text run at (85,0) width 61: "should be" - RenderText {#text} at (146,0) size 96x19 - text run at (146,0) width 96: " white on green." + RenderText {#text} at (90,0) size 61x19 + text run at (90,0) width 61: "should be" + RenderText {#text} at (151,0) size 102x19 + text run at (151,0) width 102: " white on green." RenderBlock {P} at (0,72) size 784x20 [color=#FFFFFF] - RenderInline {EM} at (0,0) size 36x19 [color=#008000] - RenderText {#text} at (0,0) size 36x19 - text run at (0,0) width 36: "PASS" - RenderText {#text} at (36,0) size 4x19 - text run at (36,0) width 4: " " - RenderInline {STRONG} at (0,0) size 36x19 - RenderText {#text} at (40,0) size 36x19 - text run at (40,0) width 36: "FAIL" + RenderInline {EM} at (0,0) size 34x19 [color=#008000] + RenderText {#text} at (0,0) size 34x19 + text run at (0,0) width 34: "PASS" + RenderText {#text} at (34,0) size 4x19 + text run at (34,0) width 4: " " + RenderInline {STRONG} at (0,0) size 38x19 + RenderText {#text} at (38,0) size 38x19 + text run at (38,0) width 38: "FAIL" RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,108) size 784x20 - RenderText {#text} at (0,0) size 42x19 - text run at (0,0) width 42: "PASS " - RenderInline {DFN} at (0,0) size 34x19 [color=#FFFFFF] - RenderText {#text} at (42,0) size 34x19 - text run at (42,0) width 34: "FAIL" + RenderText {#text} at (0,0) size 41x19 + text run at (0,0) width 41: "PASS " + RenderInline {DFN} at (0,0) size 32x19 [color=#FFFFFF] + RenderText {#text} at (41,0) size 32x19 + text run at (41,0) width 32: "FAIL" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt index 3ed98b14b14f..c2c9b7d1bcf6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0602-inherit-bdr-pad-b-00-expected.txt @@ -4,15 +4,15 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This sentence should have no border. " - RenderInline {SPAN} at (0,0) size 263x29 [border: (5px solid #00FF00)] - RenderText {#text} at (233,0) size 253x19 - text run at (233,0) width 253: "This sentence should have a green border." + RenderText {#text} at (0,0) size 238x19 + text run at (0,0) width 238: "This sentence should have no border. " + RenderInline {SPAN} at (0,0) size 274x29 [border: (5px solid #00FF00)] + RenderText {#text} at (243,0) size 264x19 + text run at (243,0) width 264: "This sentence should have a green border." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,36) size 784x20 - RenderInline {SPAN} at (0,0) size 357x35 [bgcolor=#FF0000] - RenderInline {SPAN} at (0,0) size 357x35 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 357x19 - text run at (0,0) width 357: "This sentence should be in a green bar, with no red present." + RenderInline {SPAN} at (0,0) size 374x35 [bgcolor=#FF0000] + RenderInline {SPAN} at (0,0) size 374x35 [bgcolor=#00FF00] + RenderText {#text} at (0,0) size 374x19 + text run at (0,0) width 374: "This sentence should be in a green bar, with no red present." RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0603-c11-import-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0603-c11-import-00-b-expected.txt index 3f59a128ca4d..fa28095afbf2 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0603-c11-import-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0603-c11-import-00-b-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x160 RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x128 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,72) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,108) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t060401-c32-cascading-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t060401-c32-cascading-00-b-expected.txt index 20cab78034e6..c26ed1f16302 100644 --- a/LayoutTests/platform/wincairo/css2.1/t060401-c32-cascading-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t060401-c32-cascading-00-b-expected.txt @@ -5,53 +5,53 @@ layer at (0,0) size 800x236 RenderBody {BODY} at (8,8) size 784x220 RenderBlock {UL} at (0,0) size 784x160 [color=#FF0000] RenderListItem {LI} at (0,0) size 784x20 - RenderInline {SPAN} at (0,0) size 128x19 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderInline {SPAN} at (0,0) size 136x19 [color=#008000] + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (0,20) size 784x80 RenderBlock (anonymous) at (0,0) size 784x20 - RenderInline {SPAN} at (0,0) size 128x19 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderInline {SPAN} at (0,0) size 136x19 [color=#008000] + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 RenderBlock {UL} at (0,20) size 784x60 RenderListItem {LI} at (0,0) size 784x20 - RenderInline {SPAN} at (0,0) size 128x19 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderInline {SPAN} at (0,0) size 136x19 [color=#008000] + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (0,20) size 784x20 - RenderInline {SPAN} at (0,0) size 128x19 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderInline {SPAN} at (0,0) size 136x19 [color=#008000] + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (0,40) size 784x20 - RenderInline {SPAN} at (0,0) size 128x19 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderInline {SPAN} at (0,0) size 136x19 [color=#008000] + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (0,100) size 784x20 - RenderInline {SPAN} at (0,0) size 128x19 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderInline {SPAN} at (0,0) size 136x19 [color=#008000] + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (0,120) size 784x20 - RenderInline {SPAN} at (0,0) size 128x19 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderInline {SPAN} at (0,0) size 136x19 [color=#008000] + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 RenderListItem {LI} at (0,140) size 784x20 - RenderInline {SPAN} at (0,0) size 128x19 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderInline {SPAN} at (0,0) size 136x19 [color=#008000] + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,160) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,180) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." RenderBlock {P} at (0,200) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." + RenderText {#text} at (0,0) size 136x19 + text run at (0,0) width 136: "This should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t060402-c31-important-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t060402-c31-important-00-b-expected.txt index 20943620b98d..d03692103279 100644 --- a/LayoutTests/platform/wincairo/css2.1/t060402-c31-important-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t060402-c31-important-00-b-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,72) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt b/LayoutTests/platform/wincairo/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt index 752e93659e29..65333e010438 100644 --- a/LayoutTests/platform/wincairo/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t060403-c21-pseu-cls-00-e-i-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 297x19 [color=#008000] - RenderText {#text} at (0,0) size 297x19 - text run at (0,0) width 297: "Whatever you do to this link, it should stay green." - RenderText {#text} at (297,0) size 187x19 - text run at (297,0) width 187: " (hover, focus, activate, follow)" + RenderInline {A} at (0,0) size 313x19 [color=#008000] + RenderText {#text} at (0,0) size 313x19 + text run at (0,0) width 313: "Whatever you do to this link, it should stay green." + RenderText {#text} at (313,0) size 197x19 + text run at (313,0) width 197: " (hover, focus, activate, follow)" diff --git a/LayoutTests/platform/wincairo/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt b/LayoutTests/platform/wincairo/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt index 752e93659e29..65333e010438 100644 --- a/LayoutTests/platform/wincairo/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t060403-c21-pseu-id-00-e-i-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 RenderBlock {P} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 297x19 [color=#008000] - RenderText {#text} at (0,0) size 297x19 - text run at (0,0) width 297: "Whatever you do to this link, it should stay green." - RenderText {#text} at (297,0) size 187x19 - text run at (297,0) width 187: " (hover, focus, activate, follow)" + RenderInline {A} at (0,0) size 313x19 [color=#008000] + RenderText {#text} at (0,0) size 313x19 + text run at (0,0) width 313: "Whatever you do to this link, it should stay green." + RenderText {#text} at (313,0) size 197x19 + text run at (313,0) width 197: " (hover, focus, activate, follow)" diff --git a/LayoutTests/platform/wincairo/css2.1/t0801-c412-hz-box-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0801-c412-hz-box-00-b-a-expected.txt index 47a5f73bc8d2..2c3392d3b0b1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0801-c412-hz-box-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0801-c412-hz-box-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x169 RenderBlock {HTML} at (0,0) size 800x169 RenderBody {BODY} at (8,16) size 784x137 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "The two diagrams below should be identical." + RenderText {#text} at (0,0) size 283x19 + text run at (0,0) width 283: "The two diagrams below should be identical." RenderBlock {DIV} at (0,36) size 784x101 RenderBlock {P} at (40,0) size 520x40 [color=#0000FF] [bgcolor=#00FFFF] [border: none (40px solid #FF00FF) none (40px solid #FF00FF)] RenderText {#text} at (80,0) size 360x40 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt index 6888e25d0fd7..e94fb0923e2c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x241 RenderBlock {HTML} at (0,0) size 800x241 RenderBody {BODY} at (8,16) size 784x217 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 274x19 - text run at (0,0) width 274: "The three diagrams below should be identical:" + RenderText {#text} at (0,0) size 290x19 + text run at (0,0) width 290: "The three diagrams below should be identical:" RenderBlock {P} at (0,36) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 112x16 text run at (0,0) width 112: "xxx xxx" diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt index 907460069dd4..cdd27de78ee7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x326 RenderBlock {HTML} at (0,0) size 800x326 RenderBody {BODY} at (8,8) size 784x310 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 392x19 - text run at (0,0) width 392: "The two diagrams below should be identical, with no red present." + RenderText {#text} at (0,0) size 412x19 + text run at (0,0) width 412: "The two diagrams below should be identical, with no red present." RenderTable {TABLE} at (0,20) size 218x290 RenderTableSection {TBODY} at (0,0) size 218x290 RenderTableRow {TR} at (0,2) size 218x286 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt index ffef35d92bc7..7a128731f748 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x97 RenderBlock {HTML} at (0,0) size 800x97 RenderBody {BODY} at (8,16) size 784x66 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 260x19 - text run at (0,0) width 260: "There should be a green vertical bar below:" + RenderText {#text} at (0,0) size 273x19 + text run at (0,0) width 273: "There should be a green vertical bar below:" RenderBlock {DIV} at (15,36) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt index 4bd8b2ef543a..598e25bdb4d2 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "There should be a green horizontal bar below:" + RenderText {#text} at (0,0) size 290x19 + text run at (0,0) width 290: "There should be a green horizontal bar below:" RenderBlock {DIV} at (15,36) size 195x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 30x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt index f96cc85e51d7..4b8f0a639b02 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x127 RenderBlock {HTML} at (0,0) size 800x127 RenderBody {BODY} at (8,16) size 784x96 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 233x19 - text run at (0,0) width 233: "There should be a green square below:" + RenderText {#text} at (0,0) size 244x19 + text run at (0,0) width 244: "There should be a green square below:" RenderBlock {DIV} at (15,36) size 75x60 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 75x60 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 75x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt index f880bcddb37b..2a275147cc7c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x142 RenderBlock {HTML} at (0,0) size 800x142 RenderBody {BODY} at (8,16) size 784x111 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "It should say \"HI\" below:" + RenderText {#text} at (0,0) size 162x19 + text run at (0,0) width 162: "It should say \"HI\" below:" RenderBlock {DIV} at (15,36) size 165x75 [color=#FFFFFF] [bgcolor=#000080] RenderText {#text} at (0,0) size 135x15 text run at (0,0) width 135: "xx xx xx " diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt index 634464127ac6..03912ed64e15 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (15,36) size 120x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 120x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 105x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt index 67f5d26425cb..c1ca417060ce 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x115 RenderBlock {HTML} at (0,0) size 800x115 RenderBody {BODY} at (8,16) size 784x84 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 256x19 - text run at (0,0) width 256: "The following two bars should be identical:" + RenderText {#text} at (0,0) size 274x19 + text run at (0,0) width 274: "The following two bars should be identical:" RenderBlock {DIV} at (15,36) size 180x15 RenderBlock {P} at (0,0) size 180x15 [color=#00FF00] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 45x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt index 99a4d68cd910..e641e0b5b289 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x110 RenderBlock {HTML} at (0,0) size 800x110 RenderBody {BODY} at (8,16) size 784x86 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 256x19 - text run at (0,0) width 256: "The following two bars should be identical:" + RenderText {#text} at (0,0) size 274x19 + text run at (0,0) width 274: "The following two bars should be identical:" RenderBlock {DIV} at (30,36) size 75x15 RenderBlock {P} at (0,0) size 75x15 [color=#00FF00] [bgcolor=#FFFF00] RenderInline {SPAN} at (0,0) size 30x15 [color=#FFA500] [bgcolor=#FF0000] diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt index 3b9783da764d..d0bc538ab1cc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x152 RenderBlock {HTML} at (0,0) size 800x152 RenderBody {BODY} at (8,16) size 784x126 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "The five \"matches\" below should be identical." + RenderText {#text} at (0,0) size 291x19 + text run at (0,0) width 291: "The five \"matches\" below should be identical." RenderBlock {DIV} at (0,36) size 200x90 [color=#FFA500] RenderBlock {P} at (0,0) size 200x10 [bgcolor=#A52A2A] RenderText {#text} at (142,0) size 10x10 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt index 045bac276ce5..f4191ec3b71c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x184 RenderBlock {HTML} at (0,0) size 800x184 RenderBody {BODY} at (8,8) size 784x160 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 297x19 - text run at (0,0) width 297: "The following two diagrams should look identical." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "The following two diagrams should look identical." RenderBlock {DIV} at (16,36) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (3,3) size 128x48 [bgcolor=#FFFF00] RenderListItem {LI} at (0,0) size 128x16 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt index f0549391a496..9c68a58c68e7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-02-c-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x68 RenderBlock {HTML} at (0,0) size 800x68 RenderBody {BODY} at (8,24) size 784x20 RenderBlock {P} at (0,0) size 794x20 [color=#000080] - RenderText {#text} at (0,0) size 270x19 - text run at (0,0) width 270: "This page should have a horizontal scroll bar." + RenderText {#text} at (0,0) size 285x19 + text run at (0,0) width 285: "This page should have a horizontal scroll bar." diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt index 3cfc36a763cc..a4442ede060f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5502-mrgn-r-03-c-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x116 RenderBlock {HTML} at (0,0) size 800x116 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 227x19 - text run at (0,0) width 227: "The next two bars should be identical:" + RenderText {#text} at (0,0) size 240x19 + text run at (0,0) width 240: "The next two bars should be identical:" RenderBlock {DIV} at (0,36) size 160x20 RenderBlock {P} at (0,0) size 240x20 [color=#FFFF00] [bgcolor=#000080] - RenderText {#text} at (0,0) size 36x19 - text run at (0,0) width 36: "TEST" + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "TEST" RenderBlock {DIV} at (0,72) size 240x20 [color=#FFFF00] [bgcolor=#000080] - RenderText {#text} at (0,0) size 36x19 - text run at (0,0) width 36: "TEST" + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "TEST" diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt index 6888e25d0fd7..e94fb0923e2c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x241 RenderBlock {HTML} at (0,0) size 800x241 RenderBody {BODY} at (8,16) size 784x217 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 274x19 - text run at (0,0) width 274: "The three diagrams below should be identical:" + RenderText {#text} at (0,0) size 290x19 + text run at (0,0) width 290: "The three diagrams below should be identical:" RenderBlock {P} at (0,36) size 160x48 [color=#FFA500] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 112x16 text run at (0,0) width 112: "xxx xxx" diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt index 97f6b79a106f..95783d1115f9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x346 RenderBlock {HTML} at (0,0) size 800x346 RenderBody {BODY} at (8,8) size 784x330 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 392x19 - text run at (0,0) width 392: "The two diagrams below should be identical, with no red present." + RenderText {#text} at (0,0) size 412x19 + text run at (0,0) width 412: "The two diagrams below should be identical, with no red present." RenderTable {TABLE} at (0,20) size 218x310 RenderTableSection {TBODY} at (0,0) size 218x310 RenderTableRow {TR} at (0,2) size 218x306 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt index 5e182f8877ff..006d3bfc6fc5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x97 RenderBlock {HTML} at (0,0) size 800x97 RenderBody {BODY} at (8,16) size 784x66 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 260x19 - text run at (0,0) width 260: "There should be a green vertical bar below:" + RenderText {#text} at (0,0) size 273x19 + text run at (0,0) width 273: "There should be a green vertical bar below:" RenderBlock {DIV} at (15,36) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt index 4027cea228c4..ed6b594cf35b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "There should be a green horizontal bar below:" + RenderText {#text} at (0,0) size 290x19 + text run at (0,0) width 290: "There should be a green horizontal bar below:" RenderBlock {DIV} at (15,36) size 195x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 30x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt index 5e94c9b9f5fe..1a1c11776beb 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 295x19 - text run at (0,0) width 295: "There should be a small light green square below:" + RenderText {#text} at (0,0) size 313x19 + text run at (0,0) width 313: "There should be a small light green square below:" RenderBlock {DIV} at (15,36) size 754x45 RenderBlock {P} at (0,0) size 75x45 [color=#FFFFFF] RenderText {#text} at (0,0) size 30x30 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt index 20494998e205..08d2da9c2b19 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x142 RenderBlock {HTML} at (0,0) size 800x142 RenderBody {BODY} at (8,16) size 784x111 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "It should say \"HI\" below:" + RenderText {#text} at (0,0) size 162x19 + text run at (0,0) width 162: "It should say \"HI\" below:" RenderBlock {DIV} at (15,36) size 165x75 [color=#FFFFFF] [bgcolor=#000080] RenderText {#text} at (0,0) size 165x45 text run at (0,0) width 165: "xx xx xx xx" diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt index a59c3ecb7734..8ec3f53ddb95 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (15,36) size 120x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 120x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 105x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt index 8c8dafeaab70..d03f82cdd8f8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x115 RenderBlock {HTML} at (0,0) size 800x115 RenderBody {BODY} at (8,16) size 784x84 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 256x19 - text run at (0,0) width 256: "The following two bars should be identical:" + RenderText {#text} at (0,0) size 274x19 + text run at (0,0) width 274: "The following two bars should be identical:" RenderBlock {DIV} at (15,36) size 195x15 RenderBlock {P} at (0,0) size 195x15 [color=#00FF00] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 135x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt index 23ae5be25b21..eeee3de84208 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x110 RenderBlock {HTML} at (0,0) size 800x110 RenderBody {BODY} at (8,16) size 784x86 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 256x19 - text run at (0,0) width 256: "The following two bars should be identical:" + RenderText {#text} at (0,0) size 274x19 + text run at (0,0) width 274: "The following two bars should be identical:" RenderBlock {DIV} at (30,36) size 75x15 RenderBlock {P} at (0,0) size 75x15 [color=#00FF00] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 45x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt index bbbc6d04644b..5b7fa315e02e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x152 RenderBlock {HTML} at (0,0) size 800x152 RenderBody {BODY} at (8,16) size 784x126 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "The five \"matches\" below should be identical." + RenderText {#text} at (0,0) size 291x19 + text run at (0,0) width 291: "The five \"matches\" below should be identical." RenderBlock {DIV} at (0,36) size 200x90 [color=#FFA500] RenderBlock {P} at (0,0) size 200x10 [bgcolor=#A52A2A] RenderImage {IMG} at (0,0) size 48x10 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt index f3b78915b76f..00494f05502e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x184 RenderBlock {HTML} at (0,0) size 800x184 RenderBody {BODY} at (8,8) size 784x160 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 297x19 - text run at (0,0) width 297: "The following two diagrams should look identical." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "The following two diagrams should look identical." RenderBlock {DIV} at (16,36) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (35,3) size 128x48 [bgcolor=#FFFF00] RenderListItem {LI} at (0,0) size 128x16 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt index d9a9a89f9fc2..85ef057bf1b6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x68 RenderBlock {HTML} at (0,0) size 800x68 RenderBody {BODY} at (8,24) size 784x20 RenderBlock {P} at (-10,0) size 794x20 [color=#000080] - RenderText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: " This page should have a horizontal scroll bar." + RenderText {#text} at (0,0) size 293x19 + text run at (0,0) width 293: " This page should have a horizontal scroll bar." diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt index be7c9e603079..77480d1119d9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5504-mrgn-l-03-c-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 227x19 - text run at (0,0) width 227: "The next two bars should be identical:" + RenderText {#text} at (0,0) size 240x19 + text run at (0,0) width 240: "The next two bars should be identical:" RenderBlock {DIV} at (160,36) size 160x20 RenderBlock {P} at (-80,0) size 240x20 [color=#FFFF00] [bgcolor=#000080] - RenderText {#text} at (0,0) size 36x19 - text run at (0,0) width 36: "TEST" + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "TEST" RenderBlock {DIV} at (80,72) size 240x20 [color=#FFFF00] [bgcolor=#000080] - RenderText {#text} at (0,0) size 36x19 - text run at (0,0) width 36: "TEST" + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "TEST" diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt index 55d76004d023..302cb7582dc1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-imrgn-00-a-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x119 RenderBlock {HTML} at (0,0) size 800x119 RenderBody {BODY} at (8,16) size 784x87 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 239x19 - text run at (0,0) width 239: "The two bars below should be identical:" + RenderText {#text} at (0,0) size 252x19 + text run at (0,0) width 252: "The two bars below should be identical:" RenderBlock {DIV} at (15,36) size 105x15 [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 105x15 [color=#008000] [bgcolor=#00FF00] RenderText {#text} at (0,0) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt index bd508eb934a6..32d3a8a496e6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-00-b-ag-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "The five \"matches\" below should be identical " - RenderInline {STRONG} at (0,0) size 126x19 - RenderText {#text} at (271,0) size 126x19 - text run at (271,0) width 126: "and equally spaced" - RenderText {#text} at (397,0) size 4x19 - text run at (397,0) width 4: "." + RenderText {#text} at (0,0) size 291x19 + text run at (0,0) width 291: "The five \"matches\" below should be identical " + RenderInline {STRONG} at (0,0) size 129x19 + RenderText {#text} at (291,0) size 129x19 + text run at (291,0) width 129: "and equally spaced" + RenderText {#text} at (420,0) size 4x19 + text run at (420,0) width 4: "." RenderBlock {DIV} at (0,36) size 200x180 [color=#FFA500] RenderBlock {P} at (0,0) size 200x10 [bgcolor=#A52A2A] RenderImage {IMG} at (0,0) size 24x10 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt index 6fa4afec0bb1..b43643c7eae0 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-01-e-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x312 RenderBlock {HTML} at (0,0) size 800x312 RenderBody {BODY} at (8,8) size 784x288 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 297x19 - text run at (0,0) width 297: "The following two diagrams should look identical." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "The following two diagrams should look identical." RenderBlock {DIV} at (16,36) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (19,19) size 128x80 [bgcolor=#FFFF00] RenderListItem {LI} at (0,0) size 128x16 diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-02-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-02-c-expected.txt index c85e7e6becdc..9c8fa348f8ea 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-02-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-02-c-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x36 RenderBody {BODY} at (8,-2) size 784x40 RenderBlock {P} at (-10,0) size 804x40 [color=#000080] RenderBR {BR} at (0,0) size 0x19 - RenderText {#text} at (0,20) size 278x19 - text run at (0,20) width 278: " This page should have a horizontal scroll bar." + RenderText {#text} at (0,20) size 293x19 + text run at (0,20) width 293: " This page should have a horizontal scroll bar." diff --git a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt index 38f724044c51..910ca076a81e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0803-c5505-mrgn-03-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x128 RenderBlock {HTML} at (0,0) size 800x128 RenderBody {BODY} at (8,16) size 784x96 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 227x19 - text run at (0,0) width 227: "The next two bars should be identical:" + RenderText {#text} at (0,0) size 240x19 + text run at (0,0) width 240: "The next two bars should be identical:" RenderBlock {DIV} at (16,36) size 134x22 [border: (3px solid #000000)] RenderBlock {P} at (3,3) size 128x16 [color=#FFA500] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 64x16 diff --git a/LayoutTests/platform/wincairo/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt index 49b3f78204fe..a397d59c1fe2 100644 --- a/LayoutTests/platform/wincairo/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t080301-c411-vt-mrgn-00-b-expected.txt @@ -4,55 +4,55 @@ layer at (0,0) size 785x897 RenderBlock {HTML} at (0,0) size 785x897 RenderBody {BODY} at (8,16) size 769x873 RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 263x19 - text run at (0,0) width 263: "The two columns below should be identical." + RenderText {#text} at (0,0) size 279x19 + text run at (0,0) width 279: "The two columns below should be identical." RenderTable {TABLE} at (0,36) size 178x837 RenderTableSection {TBODY} at (0,0) size 178x837 RenderTableRow {TR} at (0,2) size 178x833 RenderTableCell {TD} at (2,2) size 86x833 [bgcolor=#008080] [border: (3px solid #000000)] [r=0 c=0 rs=1 cs=1] RenderBlock {P} at (3,3) size 80x20 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,98) size 80x21 [bgcolor=#FF00FF] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,118) size 80x21 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,214) size 80x21 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,234) size 80x21 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,291) size 80x21 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {DIV} at (3,349) size 80x97 [bgcolor=#00FFFF] RenderBlock {P} at (0,75) size 80x21 [bgcolor=#FFA500] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,483) size 80x21 [bgcolor=#FFFF00] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,503) size 80x96 [bgcolor=#FF00FF] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,560) size 80x59 [bgcolor=#00FF00] - RenderText {#text} at (0,37) size 6x20 - text run at (0,37) width 6: "-" + RenderText {#text} at (0,37) size 5x20 + text run at (0,37) width 5: "-" RenderBlock (floating) {P} at (3,694) size 40x21 [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,656) size 80x21 [bgcolor=#00FFFF] - RenderText {#text} at (40,0) size 6x19 - text run at (40,0) width 6: "-" + RenderText {#text} at (40,0) size 5x19 + text run at (40,0) width 5: "-" RenderBlock {P} at (3,714) size 80x58 [bgcolor=#FFA500] - RenderText {#text} at (0,0) size 6x19 - text run at (0,0) width 6: "-" + RenderText {#text} at (0,0) size 5x19 + text run at (0,0) width 5: "-" RenderBlock {P} at (3,772) size 80x58 [bgcolor=#FFFF00] - RenderText {#text} at (0,37) size 6x20 - text run at (0,37) width 6: "-" + RenderText {#text} at (0,37) size 5x20 + text run at (0,37) width 5: "-" RenderTableCell {TD} at (90,2) size 86x833 [border: (3px solid #000000)] [r=0 c=1 rs=1 cs=1] RenderBlock {DIV} at (3,3) size 80x20 [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 6x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt index 79c424df2c61..4aae819d7b32 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x120 RenderBlock {HTML} at (0,0) size 800x120 RenderBody {BODY} at (8,16) size 784x96 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (0,36) size 120x60 [color=#FFFFFF] RenderText {#text} at (0,0) size 100x20 text run at (0,0) width 100: "xx xx" diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt index 8d7554d0a4bb..da105ba45478 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x120 RenderBlock {HTML} at (0,0) size 800x120 RenderBody {BODY} at (8,16) size 784x96 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (0,36) size 120x60 [color=#FFFFFF] RenderText {#text} at (0,0) size 100x20 text run at (0,0) width 100: "xx xx" diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt index b853733dee4c..8fd26c52481b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x88 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (0,68) size 120x20 [color=#FFFFFF] RenderInline {SPAN} at (0,0) size 40x40 [bgcolor=#008000] RenderText {#text} at (0,0) size 40x20 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt index da0f925c9891..3daf62d6dcbb 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5506-padn-t-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x166 RenderBlock {HTML} at (0,0) size 800x166 RenderBody {BODY} at (8,8) size 784x150 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 251x19 - text run at (0,0) width 251: "The next two columns should be identical." + RenderText {#text} at (0,0) size 267x19 + text run at (0,0) width 267: "The next two columns should be identical." RenderTable {TABLE} at (0,20) size 138x130 RenderTableSection {TBODY} at (0,0) size 138x130 RenderTableRow {TR} at (0,2) size 138x126 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt index b691be57daeb..48c74afb0b57 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x97 RenderBlock {HTML} at (0,0) size 800x97 RenderBody {BODY} at (8,16) size 784x66 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 260x19 - text run at (0,0) width 260: "There should be a green vertical bar below:" + RenderText {#text} at (0,0) size 273x19 + text run at (0,0) width 273: "There should be a green vertical bar below:" RenderBlock {DIV} at (15,36) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt index 777108e0107b..59238ed0e47b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (15,36) size 195x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 30x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt index 0c6897438391..da65158895fe 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x127 RenderBlock {HTML} at (0,0) size 800x127 RenderBody {BODY} at (8,16) size 784x96 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 233x19 - text run at (0,0) width 233: "There should be a green square below:" + RenderText {#text} at (0,0) size 244x19 + text run at (0,0) width 244: "There should be a green square below:" RenderBlock {DIV} at (15,36) size 754x60 RenderBlock {DIV} at (0,0) size 75x60 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 75x60 [color=#FFFFFF] [bgcolor=#FFFFFF] diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt index f880bcddb37b..2a275147cc7c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x142 RenderBlock {HTML} at (0,0) size 800x142 RenderBody {BODY} at (8,16) size 784x111 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "It should say \"HI\" below:" + RenderText {#text} at (0,0) size 162x19 + text run at (0,0) width 162: "It should say \"HI\" below:" RenderBlock {DIV} at (15,36) size 165x75 [color=#FFFFFF] [bgcolor=#000080] RenderText {#text} at (0,0) size 135x15 text run at (0,0) width 135: "xx xx xx " diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt index ab7387fc40e2..fa6e169250b2 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x119 RenderBlock {HTML} at (0,0) size 800x119 RenderBody {BODY} at (8,16) size 784x87 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 270x19 - text run at (0,0) width 270: "The following two blocks should be identical:" + RenderText {#text} at (0,0) size 289x19 + text run at (0,0) width 289: "The following two blocks should be identical:" RenderBlock {DIV} at (15,36) size 135x15 [color=#FFFF00] [bgcolor=#FFA500] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "x" diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt index 78b450439ad7..9d407e56598c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-00-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x152 RenderBlock {HTML} at (0,0) size 800x152 RenderBody {BODY} at (8,16) size 784x126 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "The five bars below should be identical." + RenderText {#text} at (0,0) size 252x19 + text run at (0,0) width 252: "The five bars below should be identical." RenderBlock {DIV} at (0,36) size 106x90 [color=#0000FF] RenderBlock {P} at (0,0) size 106x10 [bgcolor=#000080] RenderText {#text} at (48,0) size 10x10 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt index 621d547a644e..89815992d1fe 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x184 RenderBlock {HTML} at (0,0) size 800x184 RenderBody {BODY} at (8,8) size 784x160 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 297x19 - text run at (0,0) width 297: "The following two diagrams should look identical." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "The following two diagrams should look identical." RenderBlock {DIV} at (16,36) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (3,3) size 160x48 [bgcolor=#FFFF00] RenderListItem {LI} at (0,0) size 128x16 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-02-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-02-f-expected.txt index 7e596b4fa127..c68c58e76252 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-02-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-02-f-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x92 RenderBlock {HTML} at (0,0) size 800x92 RenderBody {BODY} at (8,16) size 784x60 RenderBlock {P} at (0,0) size 176x60 [bgcolor=#FFFFFF] [border: none (16px solid #008000) none] - RenderText {#text} at (0,0) size 145x59 - text run at (0,0) width 145: "There should be a green" - text run at (0,20) width 142: "block to the right of this" - text run at (0,40) width 26: "text." + RenderText {#text} at (0,0) size 152x59 + text run at (0,0) width 152: "There should be a green" + text run at (0,20) width 150: "block to the right of this" + text run at (0,40) width 27: "text." diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-03-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-03-f-expected.txt index 0987642ed061..2b3a1f4a8845 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-03-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5507-padn-r-03-f-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 227x19 - text run at (0,0) width 227: "The next two bars should be identical:" + RenderText {#text} at (0,0) size 240x19 + text run at (0,0) width 240: "The next two bars should be identical:" RenderBlock {DIV} at (16,36) size 192x20 [color=#FFFF00] [bgcolor=#000080] - RenderText {#text} at (0,0) size 36x19 - text run at (0,0) width 36: "TEST" + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "TEST" RenderBlock {DIV} at (16,72) size 192x20 [color=#FFFF00] [bgcolor=#000080] - RenderText {#text} at (0,0) size 36x19 - text run at (0,0) width 36: "TEST" + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "TEST" diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt index 4785fd3fb6ba..26de3ca0ee90 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x120 RenderBlock {HTML} at (0,0) size 800x120 RenderBody {BODY} at (8,16) size 784x96 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (0,36) size 120x60 [color=#FFFFFF] RenderText {#text} at (0,0) size 100x20 text run at (0,0) width 100: "xx xx" diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt index 6cdd3c1099a0..8a0b62374b4c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x120 RenderBlock {HTML} at (0,0) size 800x120 RenderBody {BODY} at (8,16) size 784x96 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (0,36) size 120x60 [color=#FFFFFF] RenderText {#text} at (0,0) size 100x20 text run at (0,0) width 100: "xx xx" diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt index b853733dee4c..8fd26c52481b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x88 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (0,68) size 120x20 [color=#FFFFFF] RenderInline {SPAN} at (0,0) size 40x40 [bgcolor=#008000] RenderText {#text} at (0,0) size 40x20 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt index cdfed75fea73..ee9b6343935a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x166 RenderBlock {HTML} at (0,0) size 800x166 RenderBody {BODY} at (8,8) size 784x150 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 251x19 - text run at (0,0) width 251: "The next two columns should be identical." + RenderText {#text} at (0,0) size 267x19 + text run at (0,0) width 267: "The next two columns should be identical." RenderTable {TABLE} at (0,20) size 138x130 RenderTableSection {TBODY} at (0,0) size 138x130 RenderTableRow {TR} at (0,2) size 138x126 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt index 32e62ff3b81c..48e30d564fa0 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x97 RenderBlock {HTML} at (0,0) size 800x97 RenderBody {BODY} at (8,16) size 784x66 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 260x19 - text run at (0,0) width 260: "There should be a green vertical bar below:" + RenderText {#text} at (0,0) size 273x19 + text run at (0,0) width 273: "There should be a green vertical bar below:" RenderBlock {DIV} at (15,36) size 120x30 [color=#FFFFFF] [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x30 [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 15x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt index fd604408590a..0d50f20dd6f3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "There should be a green bar below:" + RenderText {#text} at (0,0) size 223x19 + text run at (0,0) width 223: "There should be a green bar below:" RenderBlock {DIV} at (15,36) size 195x45 [bgcolor=#008000] RenderBlock {P} at (0,0) size 195x30 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderText {#text} at (0,0) size 30x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt index b4cf65ef221f..2a54944aca5f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x112 RenderBlock {HTML} at (0,0) size 800x112 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 295x19 - text run at (0,0) width 295: "There should be a small light green square below:" + RenderText {#text} at (0,0) size 313x19 + text run at (0,0) width 313: "There should be a small light green square below:" RenderBlock {DIV} at (15,36) size 754x45 RenderBlock {P} at (0,0) size 75x45 [color=#FFFFFF] RenderText {#text} at (0,0) size 30x30 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt index 20494998e205..08d2da9c2b19 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x142 RenderBlock {HTML} at (0,0) size 800x142 RenderBody {BODY} at (8,16) size 784x111 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "It should say \"HI\" below:" + RenderText {#text} at (0,0) size 162x19 + text run at (0,0) width 162: "It should say \"HI\" below:" RenderBlock {DIV} at (15,36) size 165x75 [color=#FFFFFF] [bgcolor=#000080] RenderText {#text} at (0,0) size 165x45 text run at (0,0) width 165: "xx xx xx xx" diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt index 70f6c9e702fd..a4a4630d521d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x119 RenderBlock {HTML} at (0,0) size 800x119 RenderBody {BODY} at (8,16) size 784x87 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 270x19 - text run at (0,0) width 270: "The following two blocks should be identical:" + RenderText {#text} at (0,0) size 289x19 + text run at (0,0) width 289: "The following two blocks should be identical:" RenderBlock {DIV} at (15,36) size 135x15 [color=#FFFF00] [bgcolor=#FFA500] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "x" diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt index fa223515eb2f..d7521525b1e3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x152 RenderBlock {HTML} at (0,0) size 800x152 RenderBody {BODY} at (8,16) size 784x126 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "The five bars below should be identical." + RenderText {#text} at (0,0) size 252x19 + text run at (0,0) width 252: "The five bars below should be identical." RenderBlock {DIV} at (0,36) size 106x90 [color=#0000FF] RenderBlock {P} at (0,0) size 106x10 [bgcolor=#000080] RenderText {#text} at (48,0) size 10x10 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt index 0b146ed52cf4..9afcfd2edc76 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-01-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x184 RenderBlock {HTML} at (0,0) size 800x184 RenderBody {BODY} at (8,8) size 784x160 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 297x19 - text run at (0,0) width 297: "The following two diagrams should look identical." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "The following two diagrams should look identical." RenderBlock {DIV} at (16,36) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (3,3) size 160x48 [bgcolor=#FFFF00] RenderListItem {LI} at (32,0) size 128x16 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-02-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-02-f-expected.txt index ad9761f3cc89..321ece62e147 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-02-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-02-f-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x92 RenderBlock {HTML} at (0,0) size 800x92 RenderBody {BODY} at (8,16) size 784x60 RenderBlock {P} at (0,0) size 176x60 [bgcolor=#FFFFFF] [border: none (16px solid #008000)] - RenderText {#text} at (16,0) size 145x59 - text run at (16,0) width 145: "There should be a green" - text run at (16,20) width 134: "block to the left of this" - text run at (16,40) width 26: "text." + RenderText {#text} at (16,0) size 152x59 + text run at (16,0) width 152: "There should be a green" + text run at (16,20) width 141: "block to the left of this" + text run at (16,40) width 27: "text." diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt index 1149caf526ca..e6ab6442545f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5509-padn-l-03-f-g-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 227x19 - text run at (0,0) width 227: "The next two bars should be identical:" + RenderText {#text} at (0,0) size 240x19 + text run at (0,0) width 240: "The next two bars should be identical:" RenderBlock {DIV} at (16,36) size 192x20 [color=#FFFF00] [bgcolor=#000080] - RenderText {#text} at (32,0) size 36x19 - text run at (32,0) width 36: "TEST" + RenderText {#text} at (32,0) size 39x19 + text run at (32,0) width 39: "TEST" RenderBlock {DIV} at (16,72) size 192x20 [color=#FFFF00] [bgcolor=#000080] RenderImage {IMG} at (0,13) size 32x2 - RenderText {#text} at (32,0) size 36x19 - text run at (32,0) width 36: "TEST" + RenderText {#text} at (32,0) size 39x19 + text run at (32,0) width 39: "TEST" diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt index efb35e26671f..04e796569540 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5510-ipadn-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x195 RenderBlock {HTML} at (0,0) size 800x195 RenderBody {BODY} at (8,16) size 784x147 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 254x19 - text run at (0,0) width 254: "The two sweets below should be identical:" + RenderText {#text} at (0,0) size 268x19 + text run at (0,0) width 268: "The two sweets below should be identical:" RenderBlock {DIV} at (0,50) size 105x15 [bgcolor=#FF0000] RenderBlock {P} at (0,0) size 105x15 [color=#008000] [bgcolor=#00FF00] RenderText {#text} at (0,0) size 30x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-00-b-ag-expected.txt index c059a970b83c..c939fe76fb15 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x392 RenderBlock {HTML} at (0,0) size 800x392 RenderBody {BODY} at (8,16) size 784x366 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 266x19 - text run at (0,0) width 266: "The five diagrams below should be identical." + RenderText {#text} at (0,0) size 283x19 + text run at (0,0) width 283: "The five diagrams below should be identical." RenderBlock {DIV} at (0,36) size 138x330 [color=#FFA500] RenderBlock {P} at (0,0) size 138x58 [bgcolor=#FF0000] [border: (24px solid #FFFF00)] RenderImage {IMG} at (24,24) size 10x10 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-01-e-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-01-e-a-expected.txt index 3c6b297da7a8..8082342704bd 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-01-e-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-01-e-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x312 RenderBlock {HTML} at (0,0) size 800x312 RenderBody {BODY} at (8,8) size 784x288 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 297x19 - text run at (0,0) width 297: "The following two diagrams should look identical." + RenderText {#text} at (0,0) size 318x19 + text run at (0,0) width 318: "The following two diagrams should look identical." RenderBlock {DIV} at (16,36) size 166x118 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)] RenderBlock {UL} at (3,3) size 160x112 [bgcolor=#FFFF00] RenderListItem {LI} at (16,16) size 128x16 diff --git a/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-02-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-02-f-expected.txt index 3ad7b68507c9..c8cc7eef0958 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-02-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0804-c5510-padn-02-f-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x188 RenderBlock {HTML} at (0,0) size 800x188 RenderBody {BODY} at (8,16) size 784x156 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 227x19 - text run at (0,0) width 227: "The next two bars should be identical:" + RenderText {#text} at (0,0) size 240x19 + text run at (0,0) width 240: "The next two bars should be identical:" RenderBlock {DIV} at (16,36) size 192x52 [color=#FFFF00] [bgcolor=#000080] - RenderText {#text} at (16,16) size 36x19 - text run at (16,16) width 36: "TEST" + RenderText {#text} at (16,16) size 39x19 + text run at (16,16) width 39: "TEST" RenderBlock {DIV} at (16,104) size 192x52 [color=#FFFF00] [bgcolor=#000080] [border: (16px solid #000080)] - RenderText {#text} at (16,16) size 36x19 - text run at (16,16) width 36: "TEST" + RenderText {#text} at (16,16) size 39x19 + text run at (16,16) width 39: "TEST" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt index 4cf33baf5ea7..6993c07e7b9a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-00-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x126 RenderBlock {HTML} at (0,0) size 800x126 RenderBody {BODY} at (8,16) size 784x102 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 419x19 - text run at (0,0) width 419: "The three boxes below should have progressively thinner top borders." + RenderText {#text} at (0,0) size 439x19 + text run at (0,0) width 439: "The three boxes below should have progressively thinner top borders." RenderTable {TABLE} at (0,36) size 64x66 [color=#000080] RenderTableSection {TBODY} at (0,0) size 64x66 RenderTableRow {TR} at (0,2) size 64x62 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt index da1edc504134..7a5547ff15f1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x54 RenderBody {BODY} at (8,8) size 784x38 RenderBlock {DIV} at (0,0) size 784x38 RenderBlock {DIV} at (0,0) size 784x38 [color=#008000] [border: (15px solid #008000) (3px solid #008000)] - RenderText {#text} at (3,15) size 220x19 - text run at (3,15) width 220: "There should be no red on this page." + RenderText {#text} at (3,15) size 230x19 + text run at (3,15) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt index 9c25578bb862..15ee91411558 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "There should be no red on this page:" + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page:" RenderBlock {P} at (0,36) size 784x20 [color=#FF0000] RenderText {#text} at (0,0) size 4x19 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt index 429183d1d78c..3ec280a54dd1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-brdr-tw-03-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x39 RenderBody {BODY} at (8,8) size 784x23 RenderBlock {DIV} at (0,0) size 784x23 [color=#000080] RenderBlock {DIV} at (0,0) size 784x23 [border: none (3px solid #000080)] - RenderText {#text} at (3,0) size 254x19 - text run at (3,0) width 254: "This box should be open ended at the top." + RenderText {#text} at (3,0) size 264x19 + text run at (3,0) width 264: "This box should be open ended at the top." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt index 8bd3054eef65..789d3ba96795 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderInline {SPAN} at (0,0) size 242x23 [border: (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,0) size 236x19 - text run at (3,0) width 236: "This box should have a thin top border." + RenderInline {SPAN} at (0,0) size 253x23 [border: (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,0) size 247x19 + text run at (3,0) width 247: "This box should have a thin top border." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "There should be no red on this line. " + RenderText {#text} at (0,0) size 227x19 + text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000] - RenderText {#text} at (215,0) size 12x19 - text run at (215,0) width 12: " " + RenderText {#text} at (227,0) size 12x19 + text run at (227,0) width 12: " " RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt index a059385b0c1d..73442795755e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-00-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x178 RenderBlock {HTML} at (0,0) size 800x178 RenderBody {BODY} at (8,16) size 784x146 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 425x19 - text run at (0,0) width 425: "The three boxes below should have progressively thinner right borders." + RenderText {#text} at (0,0) size 448x19 + text run at (0,0) width 448: "The three boxes below should have progressively thinner right borders." RenderBlock {P} at (0,36) size 784x26 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] RenderText {#text} at (3,3) size 11x19 text run at (3,3) width 11: "A" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt index 3237ae30df29..a47c3be11adf 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x42 RenderBody {BODY} at (8,8) size 784x26 RenderBlock {DIV} at (0,0) size 784x26 RenderBlock {DIV} at (0,0) size 784x26 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)] - RenderText {#text} at (3,3) size 220x19 - text run at (3,3) width 220: "There should be no red on this page." + RenderText {#text} at (3,3) size 230x19 + text run at (3,3) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt index 9c25578bb862..15ee91411558 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "There should be no red on this page:" + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page:" RenderBlock {P} at (0,36) size 784x20 [color=#FF0000] RenderText {#text} at (0,0) size 4x19 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt index 6e7dc2584243..0b928161fac4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-brdr-rw-03-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x42 RenderBody {BODY} at (8,8) size 784x26 RenderBlock {DIV} at (0,0) size 784x26 [color=#000080] RenderBlock {DIV} at (0,0) size 784x26 [border: (3px solid #000080) none (3px solid #000080)] - RenderText {#text} at (3,3) size 260x19 - text run at (3,3) width 260: "This box should be open ended at the right." + RenderText {#text} at (3,3) size 273x19 + text run at (3,3) width 273: "This box should be open ended at the right." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt index 0f7dfb633dfd..bf320fa85aa9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderInline {SPAN} at (0,0) size 246x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,0) size 242x19 - text run at (3,0) width 242: "This box should have a thin right border." + RenderInline {SPAN} at (0,0) size 260x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,0) size 256x19 + text run at (3,0) width 256: "This box should have a thin right border." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "There should be no red on this line. " + RenderText {#text} at (0,0) size 227x19 + text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000] - RenderText {#text} at (215,0) size 12x19 - text run at (215,0) width 12: " " + RenderText {#text} at (227,0) size 12x19 + text run at (227,0) width 12: " " RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt index 6134c468172e..e5ac1b926b71 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-00-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x126 RenderBlock {HTML} at (0,0) size 800x126 RenderBody {BODY} at (8,16) size 784x102 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 442x19 - text run at (0,0) width 442: "The three boxes below should have progressively thinner bottom borders." + RenderText {#text} at (0,0) size 463x19 + text run at (0,0) width 463: "The three boxes below should have progressively thinner bottom borders." RenderTable {TABLE} at (0,36) size 64x66 [color=#000080] RenderTableSection {TBODY} at (0,0) size 64x66 RenderTableRow {TR} at (0,2) size 64x62 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt index d03830a06bd8..868d7032f9c1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x54 RenderBody {BODY} at (8,8) size 784x38 RenderBlock {DIV} at (0,0) size 784x38 RenderBlock {DIV} at (0,0) size 784x38 [color=#008000] [border: (3px solid #008000) (15px solid #008000) (3px solid #008000)] - RenderText {#text} at (3,3) size 220x19 - text run at (3,3) width 220: "There should be no red on this page." + RenderText {#text} at (3,3) size 230x19 + text run at (3,3) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt index 9c25578bb862..15ee91411558 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "There should be no red on this page:" + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page:" RenderBlock {P} at (0,36) size 784x20 [color=#FF0000] RenderText {#text} at (0,0) size 4x19 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt index 20a879c24908..9759ba63ba7b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-brdr-bw-03-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x39 RenderBody {BODY} at (8,8) size 784x23 RenderBlock {DIV} at (0,0) size 784x23 [color=#000080] RenderBlock {DIV} at (0,0) size 784x23 [border: (3px solid #000080) none (3px solid #000080)] - RenderText {#text} at (3,3) size 277x19 - text run at (3,3) width 277: "This box should be open ended at the bottom." + RenderText {#text} at (3,3) size 288x19 + text run at (3,3) width 288: "This box should be open ended at the bottom." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt index a717aed0cedf..753aaad9e847 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderInline {SPAN} at (0,0) size 265x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - RenderText {#text} at (3,0) size 259x19 - text run at (3,0) width 259: "This box should have a thin bottom border." + RenderInline {SPAN} at (0,0) size 277x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] + RenderText {#text} at (3,0) size 271x19 + text run at (3,0) width 271: "This box should have a thin bottom border." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "There should be no red on this line. " + RenderText {#text} at (0,0) size 227x19 + text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000] - RenderText {#text} at (215,0) size 12x19 - text run at (215,0) width 12: " " + RenderText {#text} at (227,0) size 12x19 + text run at (227,0) width 12: " " RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt index 24ef827b773e..8e8af401c95f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-00-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x178 RenderBlock {HTML} at (0,0) size 800x178 RenderBody {BODY} at (8,16) size 784x146 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 417x19 - text run at (0,0) width 417: "The three boxes below should have progressively thinner left borders." + RenderText {#text} at (0,0) size 439x19 + text run at (0,0) width 439: "The three boxes below should have progressively thinner left borders." RenderBlock {P} at (0,36) size 784x26 [border: (3px solid #000000) (5px solid #000000)] RenderText {#text} at (5,3) size 11x19 text run at (5,3) width 11: "A" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt index 091ce775bb35..3d798ad36e8e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x42 RenderBody {BODY} at (8,8) size 784x26 RenderBlock {DIV} at (0,0) size 784x26 RenderBlock {DIV} at (0,0) size 784x26 [color=#008000] [border: (3px solid #008000) (15px solid #008000)] - RenderText {#text} at (15,3) size 220x19 - text run at (15,3) width 220: "There should be no red on this page." + RenderText {#text} at (15,3) size 230x19 + text run at (15,3) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt index 9c25578bb862..15ee91411558 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "There should be no red on this page:" + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page:" RenderBlock {P} at (0,36) size 784x20 [color=#FF0000] RenderText {#text} at (0,0) size 4x19 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt index 8dda2b7cd1af..3b2e55d6d6fc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-brdr-lw-03-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x42 RenderBody {BODY} at (8,8) size 784x26 RenderBlock {DIV} at (0,0) size 784x26 [color=#000080] RenderBlock {DIV} at (0,0) size 784x26 [border: (3px solid #000080) none] - RenderText {#text} at (0,3) size 252x19 - text run at (0,3) width 252: "This box should be open ended at the left." + RenderText {#text} at (0,3) size 264x19 + text run at (0,3) width 264: "This box should be open ended at the left." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt index 09a27806b973..5604b559fbfb 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderInline {SPAN} at (0,0) size 238x25 [border: (3px solid #000000) (1px solid #000000)] - RenderText {#text} at (1,0) size 234x19 - text run at (1,0) width 234: "This box should have a thin left border." + RenderInline {SPAN} at (0,0) size 251x25 [border: (3px solid #000000) (1px solid #000000)] + RenderText {#text} at (1,0) size 247x19 + text run at (1,0) width 247: "This box should have a thin left border." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "There should be no red on this line. " + RenderText {#text} at (0,0) size 227x19 + text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000] - RenderText {#text} at (215,0) size 12x19 - text run at (215,0) width 12: " " + RenderText {#text} at (227,0) size 12x19 + text run at (227,0) width 12: " " RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-00-a-expected.txt index 9577eaad9445..2c069ea64e36 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-00-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x178 RenderBlock {HTML} at (0,0) size 800x178 RenderBody {BODY} at (8,16) size 784x146 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 395x19 - text run at (0,0) width 395: "The three boxes below should have progressively thinner borders." + RenderText {#text} at (0,0) size 415x19 + text run at (0,0) width 415: "The three boxes below should have progressively thinner borders." RenderBlock {P} at (0,36) size 784x30 [border: (5px solid #000000)] RenderText {#text} at (5,5) size 11x19 text run at (5,5) width 11: "A" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt index c3e787b8d976..1b911f231e42 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-01-b-g-expected.txt @@ -6,5 +6,5 @@ layer at (0,0) size 800x66 RenderBlock {DIV} at (0,0) size 784x50 RenderBlock {DIV} at (0,0) size 784x50 [color=#008000] [border: (15px solid #008000)] RenderBlock {P} at (15,15) size 754x20 [color=#000000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-02-b-expected.txt index 050dd9e58704..ccf90b9138db 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5515-brdr-w-02-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "There should be no red on this page:" + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page:" RenderBlock {P} at (0,36) size 784x20 [color=#FF0000] RenderText {#text} at (0,0) size 4x19 text run at (0,0) width 4: " " diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5515-ibrdr-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5515-ibrdr-00-b-expected.txt index f359b3b26dfe..ee69b3590ed5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5515-ibrdr-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5515-ibrdr-00-b-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderInline {SPAN} at (0,0) size 214x21 [border: (1px solid #000000)] - RenderText {#text} at (1,0) size 212x19 - text run at (1,0) width 212: "This box should have a thin border." + RenderInline {SPAN} at (0,0) size 225x21 [border: (1px solid #000000)] + RenderText {#text} at (1,0) size 223x19 + text run at (1,0) width 223: "This box should have a thin border." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "There should be no red on this line. " + RenderText {#text} at (0,0) size 227x19 + text run at (0,0) width 227: "There should be no red on this line. " RenderInline {SPAN} at (0,0) size 12x19 [color=#FF0000] - RenderText {#text} at (215,0) size 12x19 - text run at (215,0) width 12: " " + RenderText {#text} at (227,0) size 12x19 + text run at (227,0) width 12: " " RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5516-brdr-c-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5516-brdr-c-00-a-expected.txt index b6fc03fb0b72..21470689deaf 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5516-brdr-c-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5516-brdr-c-00-a-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x200 RenderBlock {HTML} at (0,0) size 800x200 RenderBody {BODY} at (8,16) size 784x168 RenderBlock {P} at (0,0) size 784x26 [border: (3px solid #008000)] - RenderText {#text} at (3,3) size 224x19 - text run at (3,3) width 224: "This box should have a green border." + RenderText {#text} at (3,3) size 234x19 + text run at (3,3) width 234: "This box should have a green border." RenderBlock {P} at (0,42) size 784x26 [border: (3px solid #008000)] - RenderText {#text} at (3,3) size 284x19 - text run at (3,3) width 284: "This box should have an identical green border." + RenderText {#text} at (3,3) size 299x19 + text run at (3,3) width 299: "This box should have an identical green border." RenderBlock {P} at (0,84) size 784x84 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)] - RenderText {#text} at (32,32) size 506x19 - text run at (32,32) width 506: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW." + RenderText {#text} at (32,32) size 531x19 + text run at (32,32) width 531: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt index b49698e9c2d4..3cdeaf0eb2ec 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5516-ibrdr-c-00-a-expected.txt @@ -4,17 +4,17 @@ layer at (0,0) size 800x252 RenderBlock {HTML} at (0,0) size 800x252 RenderBody {BODY} at (8,48) size 784x156 RenderBlock {P} at (48,0) size 688x20 - RenderInline {SPAN} at (0,0) size 230x25 [border: (3px solid #008000)] - RenderText {#text} at (3,0) size 224x19 - text run at (3,0) width 224: "This box should have a green border." + RenderInline {SPAN} at (0,0) size 240x25 [border: (3px solid #008000)] + RenderText {#text} at (3,0) size 234x19 + text run at (3,0) width 234: "This box should have a green border." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (48,68) size 688x20 - RenderInline {SPAN} at (0,0) size 230x25 [border: (3px solid #008000)] - RenderText {#text} at (3,0) size 224x19 - text run at (3,0) width 224: "This box should have a green border." + RenderInline {SPAN} at (0,0) size 240x25 [border: (3px solid #008000)] + RenderText {#text} at (3,0) size 234x19 + text run at (3,0) width 234: "This box should have a green border." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (48,136) size 688x20 - RenderInline {SPAN} at (0,0) size 570x83 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)] - RenderText {#text} at (32,0) size 506x19 - text run at (32,0) width 506: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW." + RenderInline {SPAN} at (0,0) size 595x83 [border: (32px solid #800080) (32px solid #008000) (32px solid #0000FF) (32px solid #FFFF00)] + RenderText {#text} at (32,0) size 531x19 + text run at (32,0) width 531: "Clockwise from top, the borders should be: PURPLE, GREEN, BLUE, YELLOW." RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5517-brdr-s-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5517-brdr-s-00-c-expected.txt index e3ee2213bdd2..da37fc1446e9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5517-brdr-s-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5517-brdr-s-00-c-expected.txt @@ -4,38 +4,38 @@ layer at (0,0) size 800x548 RenderBlock {HTML} at (0,0) size 800x548 RenderBody {BODY} at (8,16) size 784x516 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 260x19 - text run at (0,0) width 260: "The borders below should be as described:" + RenderText {#text} at (0,0) size 269x19 + text run at (0,0) width 269: "The borders below should be as described:" RenderBlock {P} at (0,36) size 784x30 [border: (5px dotted #000080)] - RenderText {#text} at (5,5) size 100x19 - text run at (5,5) width 100: "Blue and dotted." - RenderBlock {P} at (0,82) size 784x30 [border: (5px dashed #000080)] RenderText {#text} at (5,5) size 104x19 - text run at (5,5) width 104: "Blue and dashed." + text run at (5,5) width 104: "Blue and dotted." + RenderBlock {P} at (0,82) size 784x30 [border: (5px dashed #000080)] + RenderText {#text} at (5,5) size 109x19 + text run at (5,5) width 109: "Blue and dashed." RenderBlock {P} at (0,128) size 784x30 [border: (5px solid #000080)] - RenderText {#text} at (5,5) size 89x19 - text run at (5,5) width 89: "Blue and solid." + RenderText {#text} at (5,5) size 95x19 + text run at (5,5) width 95: "Blue and solid." RenderBlock {P} at (0,174) size 784x30 [border: (5px double #000080)] - RenderText {#text} at (5,5) size 102x19 - text run at (5,5) width 102: "Blue and double." + RenderText {#text} at (5,5) size 108x19 + text run at (5,5) width 108: "Blue and double." RenderBlock {P} at (0,220) size 784x30 [border: (5px groove #FFA500)] - RenderText {#text} at (5,5) size 121x19 - text run at (5,5) width 121: "Orange and groove." + RenderText {#text} at (5,5) size 126x19 + text run at (5,5) width 126: "Orange and groove." RenderBlock {P} at (0,266) size 784x30 [border: (5px ridge #FFA500)] - RenderText {#text} at (5,5) size 109x19 - text run at (5,5) width 109: "Orange and ridge." + RenderText {#text} at (5,5) size 114x19 + text run at (5,5) width 114: "Orange and ridge." RenderBlock {P} at (0,312) size 784x30 [border: (5px inset #FFA500)] - RenderText {#text} at (5,5) size 106x19 - text run at (5,5) width 106: "Orange and inset." + RenderText {#text} at (5,5) size 111x19 + text run at (5,5) width 111: "Orange and inset." RenderBlock {P} at (0,358) size 784x30 [border: (5px outset #FFA500)] - RenderText {#text} at (5,5) size 115x19 - text run at (5,5) width 115: "Orange and outset." + RenderText {#text} at (5,5) size 119x19 + text run at (5,5) width 119: "Orange and outset." RenderBlock {P} at (0,404) size 784x30 [border: (5px double #0000FF) (5px groove #0000FF) (5px double #0000FF) (5px groove #0000FF)] - RenderText {#text} at (5,5) size 452x19 - text run at (5,5) width 452: "Blue and double on top and bottom; Blue and grooved on the left and right." + RenderText {#text} at (5,5) size 475x19 + text run at (5,5) width 475: "Blue and double on top and bottom; Blue and grooved on the left and right." RenderBlock {P} at (0,450) size 784x30 [border: (5px dotted #0000FF) (5px double #0000FF) (5px dashed #0000FF) (5px solid #0000FF)] - RenderText {#text} at (5,5) size 501x19 - text run at (5,5) width 501: "Blue borders which are, in clockwise order from top: dotted, double, dashed, solid." + RenderText {#text} at (5,5) size 521x19 + text run at (5,5) width 521: "Blue borders which are, in clockwise order from top: dotted, double, dashed, solid." RenderBlock {P} at (0,496) size 784x20 - RenderText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This paragraph should have no border at all." + RenderText {#text} at (0,0) size 278x19 + text run at (0,0) width 278: "This paragraph should have no border at all." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt index 3aed9881cc88..b6cf1632a7c3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5517-ibrdr-s-00-a-expected.txt @@ -4,20 +4,20 @@ layer at (0,0) size 800x160 RenderBlock {HTML} at (0,0) size 800x160 RenderBody {BODY} at (8,16) size 784x128 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 260x19 - text run at (0,0) width 260: "The borders below should be as described:" + RenderText {#text} at (0,0) size 269x19 + text run at (0,0) width 269: "The borders below should be as described:" RenderBlock {P} at (0,36) size 784x20 - RenderInline {SPAN} at (0,0) size 122x29 [border: (5px dashed #000000)] - RenderText {#text} at (5,0) size 112x19 - text run at (5,0) width 112: "Black and dashed." + RenderInline {SPAN} at (0,0) size 126x29 [border: (5px dashed #000000)] + RenderText {#text} at (5,0) size 116x19 + text run at (5,0) width 116: "Black and dashed." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,72) size 784x20 - RenderInline {SPAN} at (0,0) size 139x29 [border: (5px groove #FFA500)] - RenderText {#text} at (5,0) size 129x19 - text run at (5,0) width 129: "Orange and grooved." + RenderInline {SPAN} at (0,0) size 144x29 [border: (5px groove #FFA500)] + RenderText {#text} at (5,0) size 134x19 + text run at (5,0) width 134: "Orange and grooved." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,108) size 784x20 - RenderInline {SPAN} at (0,0) size 69x19 - RenderText {#text} at (0,0) size 69x19 - text run at (0,0) width 69: "No border." + RenderInline {SPAN} at (0,0) size 68x19 + RenderText {#text} at (0,0) size 68x19 + text run at (0,0) width 68: "No border." RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5518-brdr-t-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5518-brdr-t-00-a-expected.txt index 1c18444db5fa..fcece34839a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5518-brdr-t-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5518-brdr-t-00-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {HTML} at (0,0) size 800x99 RenderBody {BODY} at (8,16) size 784x67 RenderBlock {P} at (0,0) size 784x30 [color=#0000FF] [border: (10px double #0000FF) none] - RenderText {#text} at (0,10) size 355x19 - text run at (0,10) width 355: "This paragraph should have two blue lines directly above it." + RenderText {#text} at (0,10) size 376x19 + text run at (0,10) width 376: "This paragraph should have two blue lines directly above it." RenderBlock {P} at (0,46) size 784x21 [color=#0000FF] [border: (1px solid #0000FF) none] - RenderText {#text} at (0,1) size 395x19 - text run at (0,1) width 395: "This paragraph should have a single thin blue line directly above it." + RenderText {#text} at (0,1) size 422x19 + text run at (0,1) width 422: "This paragraph should have a single thin blue line directly above it." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5518-brdr-t-01-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5518-brdr-t-01-e-expected.txt index de800f71da96..a005ad6db912 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5518-brdr-t-01-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5518-brdr-t-01-e-expected.txt @@ -4,58 +4,58 @@ layer at (0,0) size 800x326 RenderBlock {HTML} at (0,0) size 800x326 RenderBody {BODY} at (8,16) size 784x294 [color=#0000FF] RenderBlock {P} at (0,0) size 784x42 - RenderText {#text} at (0,2) size 458x19 - text run at (0,2) width 458: "There should be a solid blue line directly over every occurance of the word \"" - RenderInline {SPAN} at (0,0) size 55x21 [border: (2px solid #0000FF) none] - RenderText {#text} at (458,2) size 55x19 - text run at (458,2) width 55: "HERE \x{21E7}" - RenderText {#text} at (513,2) size 758x39 - text run at (513,2) width 245: "\". (So there should be 8 blue lines on this" - text run at (0,22) width 38: "page.)" - RenderTable {TABLE} at (0,58) size 126x88 - RenderTableSection {TBODY} at (0,0) size 126x88 - RenderTableRow {TR} at (0,2) size 126x26 - RenderTableCell {TD} at (2,2) size 122x26 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (33,5) size 56x19 - text run at (33,5) width 56: "HERE \x{21E7}" - RenderTableRow {TR} at (0,30) size 126x56 - RenderTableCell {TD} at (2,45) size 57x26 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,5) size 55x19 - text run at (1,5) width 55: "HERE \x{21E7}" - RenderTableCell {TD} at (61,30) size 63x56 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (1,3) size 61x22 - RenderText {#text} at (3,2) size 55x19 - text run at (3,2) width 55: "HERE \x{21E7}" - RenderTable {TABLE} at (1,25) size 61x30 - RenderTableSection {TBODY} at (0,0) size 61x30 - RenderTableRow {TR} at (0,2) size 61x26 - RenderTableCell {TD} at (2,2) size 57x26 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,5) size 55x19 - text run at (1,5) width 55: "HERE \x{21E7}" + RenderText {#text} at (0,2) size 481x19 + text run at (0,2) width 481: "There should be a solid blue line directly over every occurance of the word \"" + RenderInline {SPAN} at (0,0) size 59x21 [border: (2px solid #0000FF) none] + RenderText {#text} at (481,2) size 59x19 + text run at (481,2) width 59: "HERE \x{21E7}" + RenderText {#text} at (540,2) size 773x39 + text run at (540,2) width 233: "\". (So there should be 8 blue lines on" + text run at (0,22) width 65: "this page.)" + RenderTable {TABLE} at (0,58) size 134x88 + RenderTableSection {TBODY} at (0,0) size 134x88 + RenderTableRow {TR} at (0,2) size 134x26 + RenderTableCell {TD} at (2,2) size 130x26 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (35,5) size 60x19 + text run at (35,5) width 60: "HERE \x{21E7}" + RenderTableRow {TR} at (0,30) size 134x56 + RenderTableCell {TD} at (2,45) size 61x26 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,5) size 59x19 + text run at (1,5) width 59: "HERE \x{21E7}" + RenderTableCell {TD} at (65,30) size 67x56 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (1,3) size 65x22 + RenderText {#text} at (3,2) size 59x19 + text run at (3,2) width 59: "HERE \x{21E7}" + RenderTable {TABLE} at (1,25) size 65x30 + RenderTableSection {TBODY} at (0,0) size 65x30 + RenderTableRow {TR} at (0,2) size 65x26 + RenderTableCell {TD} at (2,2) size 61x26 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,5) size 59x19 + text run at (1,5) width 59: "HERE \x{21E7}" RenderBlock {UL} at (0,162) size 784x132 RenderListItem {LI} at (40,0) size 744x84 [border: (2px solid #0000FF) none] RenderBlock (anonymous) at (0,2) size 744x22 RenderListMarker at (-18,2) size 7x19: bullet - RenderText {#text} at (0,2) size 55x19 - text run at (0,2) width 55: "HERE \x{21E7}" + RenderText {#text} at (0,2) size 59x19 + text run at (0,2) width 59: "HERE \x{21E7}" RenderBlock {UL} at (0,24) size 744x60 RenderListItem {LI} at (40,0) size 704x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "dummy text" + RenderText {#text} at (0,0) size 75x19 + text run at (0,0) width 75: "dummy text" RenderListItem {LI} at (40,20) size 704x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "dummy text" + RenderText {#text} at (0,0) size 75x19 + text run at (0,0) width 75: "dummy text" RenderListItem {LI} at (40,40) size 704x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "dummy text" + RenderText {#text} at (0,0) size 75x19 + text run at (0,0) width 75: "dummy text" RenderListItem {LI} at (40,84) size 744x24 [border: (2px solid #0000FF) none] RenderListMarker at (-18,4) size 7x19: bullet - RenderText {#text} at (0,4) size 55x19 - text run at (0,4) width 55: "HERE \x{21E7}" + RenderText {#text} at (0,4) size 59x19 + text run at (0,4) width 59: "HERE \x{21E7}" RenderListItem {LI} at (40,108) size 744x24 [border: (2px solid #0000FF) none] RenderListMarker at (-18,4) size 7x19: bullet - RenderText {#text} at (0,4) size 55x19 - text run at (0,4) width 55: "HERE \x{21E7}" + RenderText {#text} at (0,4) size 59x19 + text run at (0,4) width 59: "HERE \x{21E7}" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt index aa689b5d3019..af86fcbd80ec 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5518-ibrdr-t-00-a-expected.txt @@ -1,54 +1,54 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x328 - RenderBlock {HTML} at (0,0) size 800x328 - RenderBody {BODY} at (8,8) size 784x312 +layer at (0,0) size 800x348 + RenderBlock {HTML} at (0,0) size 800x348 + RenderBody {BODY} at (8,8) size 784x332 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 330x19 - text run at (0,0) width 330: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,36) size 784x240 [color=#C0C0C0] - RenderText {#text} at (0,0) size 784x79 - text run at (0,0) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (444,0) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (0,20) width 100: "text dummy text " - text run at (100,20) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (544,20) width 218: "dummy text dummy text dummy text" - text run at (0,40) width 222: "dummy text dummy text dummy text " - text run at (222,40) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (666,40) width 118: "dummy text dummy" - text run at (0,60) width 322: "text dummy text dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 123x29 [color=#0000FF] [border: (10px double #0000FF) none] - RenderText {#text} at (322,60) size 123x19 - text run at (322,60) width 123: "two blue lines above" - RenderText {#text} at (445,60) size 784x99 - text run at (445,60) width 152: " dummy text dummy text " - text run at (597,60) width 144: "dummy text dummy text" - text run at (0,80) width 296: "dummy text dummy text dummy text dummy text " - text run at (296,80) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (740,80) width 44: "dummy" - text run at (0,100) width 396: "text dummy text dummy text dummy text dummy text dummy text " - text run at (396,100) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,120) width 74: "dummy text " - text run at (74,120) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (518,120) width 266: "dummy text dummy text dummy text dummy" - text run at (0,140) width 174: "text dummy text dummy text " - text run at (174,140) width 148: "dummy text dummy text " - RenderInline {SPAN} at (0,0) size 141x20 [color=#0000FF] [border: (1px solid #0000FF) none] - RenderText {#text} at (322,140) size 141x19 - text run at (322,140) width 104: "one thin blue line " - text run at (426,140) width 37: "above" - RenderText {#text} at (463,140) size 784x99 - text run at (463,140) width 296: " dummy text dummy text dummy text dummy text" - text run at (0,160) width 74: "dummy text " - text run at (74,160) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (518,160) width 266: "dummy text dummy text dummy text dummy" - text run at (0,180) width 174: "text dummy text dummy text " - text run at (174,180) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (618,180) width 144: "dummy text dummy text" - text run at (0,200) width 296: "dummy text dummy text dummy text dummy text " - text run at (296,200) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (740,200) width 44: "dummy" - text run at (0,220) width 244: "text dummy text dummy text dummy text" - RenderBlock {DIV} at (0,292) size 784x20 - RenderText {#text} at (0,0) size 395x19 - text run at (0,0) width 395: "(All the lines of text in the block above should be equally spaced.)" + RenderText {#text} at (0,0) size 341x19 + text run at (0,0) width 341: "The blue bits of text should be decorated as described." + RenderBlock {P} at (0,36) size 784x260 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x79 + text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (474,0) width 285: "dummy text dummy text dummy text dummy" + text run at (0,20) width 185: "text dummy text dummy text " + text run at (185,20) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,20) width 75: "dummy text" + text run at (0,40) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (395,40) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,60) width 106: "text dummy text " + text run at (106,60) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + RenderInline {SPAN} at (0,0) size 130x29 [color=#0000FF] [border: (10px double #0000FF) none] + RenderText {#text} at (580,60) size 130x19 + text run at (580,60) width 130: "two blue lines above" + RenderText {#text} at (710,60) size 762x119 + text run at (710,60) width 52: " dummy" + text run at (0,80) width 106: "text dummy text " + text run at (106,80) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (580,80) width 154: "dummy text dummy text" + text run at (0,100) width 316: "dummy text dummy text dummy text dummy text " + text run at (316,100) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,120) width 27: "text " + text run at (27,120) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (501,120) width 233: "dummy text dummy text dummy text" + text run at (0,140) width 237: "dummy text dummy text dummy text " + text run at (237,140) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (711,140) width 48: "dummy" + text run at (0,160) width 106: "text dummy text " + RenderInline {SPAN} at (0,0) size 151x20 [color=#0000FF] [border: (1px solid #0000FF) none] + RenderText {#text} at (106,160) size 151x19 + text run at (106,160) width 113: "one thin blue line " + text run at (219,160) width 38: "above" + RenderText {#text} at (257,160) size 783x99 + text run at (257,160) width 399: " dummy text dummy text dummy text dummy text dummy text " + text run at (656,160) width 127: "dummy text dummy" + text run at (0,180) width 343: "text dummy text dummy text dummy text dummy text " + text run at (343,180) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,200) width 79: "dummy text " + text run at (79,200) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (553,200) width 206: "dummy text dummy text dummy" + text run at (0,220) width 264: "text dummy text dummy text dummy text " + text run at (264,220) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (0,240) width 312: "dummy text dummy text dummy text dummy text" + RenderBlock {DIV} at (0,312) size 784x20 + RenderText {#text} at (0,0) size 416x19 + text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-00-a-expected.txt index 1fd094f4dfa7..753c2cdf263c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-00-a-expected.txt @@ -1,34 +1,37 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x212 - RenderBlock {HTML} at (0,0) size 800x212 - RenderBody {BODY} at (8,16) size 784x180 - RenderBlock {P} at (0,0) size 764x82 [color=#0000FF] [border: none (10px double #0000FF) none] - RenderText {#text} at (0,2) size 344x19 - text run at (0,2) width 344: "This paragraph should have two blue lines on its right. \x{21E8} " - RenderInline {SPAN} at (0,0) size 736x79 [color=#C0C0C0] - RenderText {#text} at (344,2) size 736x79 - text run at (344,2) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,22) width 48: "dummy " - text run at (48,22) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (492,22) width 244: "text dummy text dummy text dummy text" - text run at (0,42) width 196: "dummy text dummy text dummy " - text run at (196,42) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (640,42) width 96: "text dummy text" - text run at (0,62) width 344: "dummy text dummy text dummy text dummy text dummy " - text run at (344,62) width 318: "text dummy text dummy text dummy text dummy text" +layer at (0,0) size 800x252 + RenderBlock {HTML} at (0,0) size 800x252 + RenderBody {BODY} at (8,16) size 784x220 + RenderBlock {P} at (0,0) size 764x102 [color=#0000FF] [border: none (10px double #0000FF) none] + RenderText {#text} at (0,2) size 365x19 + text run at (0,2) width 365: "This paragraph should have two blue lines on its right. \x{21E8} " + RenderInline {SPAN} at (0,0) size 734x99 [color=#C0C0C0] + RenderText {#text} at (365,2) size 734x99 + text run at (365,2) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,22) width 79: "text dummy " + text run at (79,22) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (553,22) width 181: "text dummy text dummy text" + text run at (0,42) width 289: "dummy text dummy text dummy text dummy " + text run at (289,42) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,62) width 52: "dummy " + text run at (52,62) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,62) width 181: "text dummy text dummy text" + text run at (0,82) width 154: "dummy text dummy text" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (0,98) size 764x82 [color=#0000FF] [border: none (1px solid #0000FF) none] - RenderText {#text} at (0,2) size 347x19 - text run at (0,2) width 347: "This paragraph should have a thin blue line on its right. \x{21E8} " - RenderInline {SPAN} at (0,0) size 762x79 [color=#C0C0C0] - RenderText {#text} at (347,2) size 762x79 - text run at (347,2) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,22) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (444,22) width 318: "text dummy text dummy text dummy text dummy text" - text run at (0,42) width 122: "dummy text dummy " - text run at (122,42) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (566,42) width 170: "text dummy text dummy text" - text run at (0,62) width 270: "dummy text dummy text dummy text dummy " - text run at (270,62) width 318: "text dummy text dummy text dummy text dummy text" + RenderBlock {P} at (0,118) size 764x102 [color=#0000FF] [border: none (1px solid #0000FF) none] + RenderText {#text} at (0,2) size 370x19 + text run at (0,2) width 370: "This paragraph should have a thin blue line on its right. \x{21E8} " + RenderInline {SPAN} at (0,0) size 761x99 [color=#C0C0C0] + RenderText {#text} at (370,2) size 761x99 + text run at (370,2) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,22) width 52: "dummy " + text run at (52,22) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,22) width 233: "text dummy text dummy text dummy" + text run at (0,42) width 237: "text dummy text dummy text dummy " + text run at (237,42) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (711,42) width 23: "text" + text run at (0,62) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (447,62) width 312: "text dummy text dummy text dummy text dummy" + text run at (0,82) width 23: "text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-01-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-01-e-expected.txt index 034f116bb9a1..ec62a5b0488f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-01-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-01-e-expected.txt @@ -4,33 +4,33 @@ layer at (0,0) size 800x248 RenderBlock {HTML} at (0,0) size 800x248 RenderBody {BODY} at (8,16) size 784x216 [color=#0000FF] RenderBlock {P} at (0,0) size 784x37 - RenderText {#text} at (0,13) size 463x19 - text run at (0,13) width 463: "There should be a solid blue line to the right of every occurance of the word \"" - RenderInline {SPAN} at (0,0) size 145x36 [border: none (2px solid #0000FF) none] - RenderText {#text} at (463,0) size 143x36 - text run at (463,0) width 143: "THERE \x{2799}" - RenderText {#text} at (608,13) size 9x19 - text run at (608,13) width 9: "\"." - RenderTable {TABLE} at (0,53) size 308x127 - RenderTableSection {TBODY} at (0,0) size 308x127 - RenderTableRow {TR} at (0,2) size 308x39 - RenderTableCell {TD} at (2,2) size 304x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (158,1) size 143x36 - text run at (158,1) width 143: "THERE \x{2799}" - RenderTableRow {TR} at (0,43) size 308x82 - RenderTableCell {TD} at (2,64) size 147x40 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 143x38 - text run at (1,1) width 143: "THERE \x{2799}" - RenderTableCell {TD} at (151,43) size 155x82 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (1,1) size 151x37 - RenderText {#text} at (8,0) size 143x36 - text run at (8,0) width 143: "THERE \x{2798}" - RenderTable {TABLE} at (1,38) size 151x43 - RenderTableSection {TBODY} at (0,0) size 151x43 - RenderTableRow {TR} at (0,2) size 151x39 - RenderTableCell {TD} at (2,2) size 147x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 143x36 - text run at (1,1) width 143: "THERE \x{2799}" + RenderText {#text} at (0,13) size 487x19 + text run at (0,13) width 487: "There should be a solid blue line to the right of every occurance of the word \"" + RenderInline {SPAN} at (0,0) size 146x36 [border: none (2px solid #0000FF) none] + RenderText {#text} at (487,0) size 144x36 + text run at (487,0) width 144: "THERE \x{2799}" + RenderText {#text} at (633,13) size 11x19 + text run at (633,13) width 11: "\"." + RenderTable {TABLE} at (0,53) size 310x127 + RenderTableSection {TBODY} at (0,0) size 310x127 + RenderTableRow {TR} at (0,2) size 310x39 + RenderTableCell {TD} at (2,2) size 306x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (159,1) size 144x36 + text run at (159,1) width 144: "THERE \x{2799}" + RenderTableRow {TR} at (0,43) size 310x82 + RenderTableCell {TD} at (2,64) size 148x40 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 144x38 + text run at (1,1) width 144: "THERE \x{2799}" + RenderTableCell {TD} at (152,43) size 156x82 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (1,1) size 152x37 + RenderText {#text} at (8,0) size 144x36 + text run at (8,0) width 144: "THERE \x{2798}" + RenderTable {TABLE} at (1,38) size 152x43 + RenderTableSection {TBODY} at (0,0) size 152x43 + RenderTableRow {TR} at (0,2) size 152x39 + RenderTableCell {TD} at (2,2) size 148x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 144x36 + text run at (1,1) width 144: "THERE \x{2799}" RenderBlock {P} at (0,196) size 784x20 - RenderText {#text} at (0,0) size 318x19 - text run at (0,0) width 318: "There should be 3 short lines and 2 long lines in total." + RenderText {#text} at (0,0) size 337x19 + text run at (0,0) width 337: "There should be 3 short lines and 2 long lines in total." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-02-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-02-e-expected.txt index bf5b347027a6..9fbfe5ef122e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-02-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5519-brdr-r-02-e-expected.txt @@ -1,55 +1,55 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x348 - RenderBlock {HTML} at (0,0) size 800x348 - RenderBody {BODY} at (8,16) size 784x316 [color=#0000FF] +layer at (0,0) size 800x368 + RenderBlock {HTML} at (0,0) size 800x368 + RenderBody {BODY} at (8,16) size 784x336 [color=#0000FF] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 709x19 - text run at (0,0) width 345: "There should be a solid line to the right of the text below, " - text run at (345,0) width 364: "having three segments each of a different colour as indicated." - RenderBlock {UL} at (0,36) size 588x280 + RenderText {#text} at (0,0) size 747x19 + text run at (0,0) width 363: "There should be a solid line to the right of the text below, " + text run at (363,0) width 384: "having three segments each of a different colour as indicated." + RenderBlock {UL} at (0,36) size 588x300 RenderListItem {LI} at (40,0) size 548x80 [border: none (3px solid #FFA500) none] RenderBlock (anonymous) at (0,0) size 545x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 102x19 - text run at (0,0) width 102: "Orange orange..." + RenderText {#text} at (0,0) size 106x19 + text run at (0,0) width 106: "Orange orange..." RenderBlock {UL} at (0,20) size 409x60 RenderListItem {LI} at (40,0) size 369x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "...orange orange..." + RenderText {#text} at (0,0) size 114x19 + text run at (0,0) width 114: "...orange orange..." RenderListItem {LI} at (40,20) size 369x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "...orange orange..." + RenderText {#text} at (0,0) size 114x19 + text run at (0,0) width 114: "...orange orange..." RenderListItem {LI} at (40,40) size 369x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 102x19 - text run at (0,0) width 102: "...orange orange." + RenderText {#text} at (0,0) size 106x19 + text run at (0,0) width 106: "...orange orange." RenderListItem {LI} at (40,80) size 548x20 [border: none (3px solid #00FF00) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 34x19 - text run at (0,0) width 34: "Lime." - RenderListItem {LI} at (40,100) size 548x180 [border: none (3px solid #FFFF00) none] + RenderText {#text} at (0,0) size 37x19 + text run at (0,0) width 37: "Lime." + RenderListItem {LI} at (40,100) size 548x200 [border: none (3px solid #FFFF00) none] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 516x179 - text run at (0,0) width 305: "Yellow yellow yellow yellow yellow yellow yellow " - text run at (305,0) width 211: "yellow yellow yellow yellow yellow" - text run at (0,20) width 172: "yellow yellow yellow yellow " - text run at (172,20) width 340: "yellow yellow yellow yellow yellow yellow yellow yellow" - text run at (0,40) width 43: "yellow " - text run at (43,40) width 387: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (430,40) width 82: "yellow yellow" - text run at (0,60) width 301: "yellow yellow yellow yellow yellow yellow yellow " - text run at (301,60) width 211: "yellow yellow yellow yellow yellow" - text run at (0,80) width 172: "yellow yellow yellow yellow " - text run at (172,80) width 340: "yellow yellow yellow yellow yellow yellow yellow yellow" - text run at (0,100) width 43: "yellow " - text run at (43,100) width 387: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (430,100) width 82: "yellow yellow" - text run at (0,120) width 301: "yellow yellow yellow yellow yellow yellow yellow " - text run at (301,120) width 211: "yellow yellow yellow yellow yellow" - text run at (0,140) width 172: "yellow yellow yellow yellow " - text run at (172,140) width 340: "yellow yellow yellow yellow yellow yellow yellow yellow" - text run at (0,160) width 43: "yellow " - text run at (43,160) width 344: "yellow yellow yellow yellow yellow yellow yellow yellow." + RenderText {#text} at (0,0) size 515x199 + text run at (0,0) width 331: "Yellow yellow yellow yellow yellow yellow yellow " + text run at (331,0) width 184: "yellow yellow yellow yellow" + text run at (0,20) width 235: "yellow yellow yellow yellow yellow " + text run at (235,20) width 278: "yellow yellow yellow yellow yellow yellow" + text run at (0,40) width 141: "yellow yellow yellow " + text run at (141,40) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow" + text run at (0,60) width 47: "yellow " + text run at (47,60) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (470,60) width 43: "yellow" + text run at (0,80) width 376: "yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (376,80) width 137: "yellow yellow yellow" + text run at (0,100) width 282: "yellow yellow yellow yellow yellow yellow " + text run at (282,100) width 231: "yellow yellow yellow yellow yellow" + text run at (0,120) width 188: "yellow yellow yellow yellow " + text run at (188,120) width 325: "yellow yellow yellow yellow yellow yellow yellow" + text run at (0,140) width 94: "yellow yellow " + text run at (94,140) width 419: "yellow yellow yellow yellow yellow yellow yellow yellow yellow" + text run at (0,160) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (423,160) width 90: "yellow yellow" + text run at (0,180) width 281: "yellow yellow yellow yellow yellow yellow." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt index f618c1f0cca5..a632e5e5d800 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5519-ibrdr-r-00-a-expected.txt @@ -1,56 +1,56 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x328 - RenderBlock {HTML} at (0,0) size 800x328 - RenderBody {BODY} at (8,8) size 784x312 +layer at (0,0) size 800x348 + RenderBlock {HTML} at (0,0) size 800x348 + RenderBody {BODY} at (8,8) size 784x332 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 330x19 - text run at (0,0) width 330: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,36) size 784x240 [color=#C0C0C0] - RenderText {#text} at (0,0) size 784x59 - text run at (0,0) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (444,0) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (0,20) width 100: "text dummy text " - text run at (100,20) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (544,20) width 218: "dummy text dummy text dummy text" - text run at (0,40) width 222: "dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 784x39 [color=#0000FF] [border: none (10px double #0000FF) none] - RenderInline {SPAN} at (0,0) size 784x39 [color=#C0C0C0] - RenderText {#text} at (222,40) size 784x39 - text run at (222,40) width 296: "dummy text dummy text dummy text dummy text " - text run at (518,40) width 266: "dummy text dummy text dummy text dummy" - text run at (0,60) width 174: "text dummy text dummy text " - text run at (174,60) width 144: "dummy text dummy text" - RenderText {#text} at (318,60) size 123x19 - text run at (318,60) width 123: " two blue lines here: " - RenderText {#text} at (451,60) size 784x99 - text run at (451,60) width 48: "dummy " - text run at (499,60) width 244: "text dummy text dummy text dummy text" - text run at (0,80) width 196: "dummy text dummy text dummy " - text run at (196,80) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (640,80) width 144: "text dummy text dummy" - text run at (0,100) width 296: "text dummy text dummy text dummy text dummy " - text run at (296,100) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (740,100) width 22: "text" - text run at (0,120) width 418: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (418,120) width 366: "text dummy text dummy text dummy text dummy text dummy" - text run at (0,140) width 74: "text dummy " - text run at (74,140) width 248: "text dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 138x19 [color=#0000FF] [border: none (1px solid #0000FF) none] - RenderText {#text} at (322,140) size 137x19 - text run at (322,140) width 51: "one thin " - text run at (373,140) width 86: "blue line here: " - RenderText {#text} at (460,140) size 784x99 - text run at (460,140) width 292: "dummy text dummy text dummy text dummy text" - text run at (0,160) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (444,160) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (0,180) width 100: "text dummy text " - text run at (100,180) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (544,180) width 218: "dummy text dummy text dummy text" - text run at (0,200) width 222: "dummy text dummy text dummy text " - text run at (222,200) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (666,200) width 118: "dummy text dummy" - text run at (0,220) width 244: "text dummy text dummy text dummy text" - RenderBlock {DIV} at (0,292) size 784x20 - RenderText {#text} at (0,0) size 395x19 - text run at (0,0) width 395: "(All the lines of text in the block above should be equally spaced.)" + RenderText {#text} at (0,0) size 341x19 + text run at (0,0) width 341: "The blue bits of text should be decorated as described." + RenderBlock {P} at (0,36) size 784x260 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x59 + text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (474,0) width 285: "dummy text dummy text dummy text dummy" + text run at (0,20) width 185: "text dummy text dummy text " + text run at (185,20) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,20) width 75: "dummy text" + text run at (0,40) width 395: "dummy text dummy text dummy text dummy text dummy text " + RenderInline {SPAN} at (0,0) size 759x39 [color=#0000FF] [border: none (10px double #0000FF) none] + RenderInline {SPAN} at (0,0) size 759x39 [color=#C0C0C0] + RenderText {#text} at (395,40) size 759x39 + text run at (395,40) width 316: "dummy text dummy text dummy text dummy text " + text run at (711,40) width 48: "dummy" + text run at (0,60) width 422: "text dummy text dummy text dummy text dummy text dummy text " + text run at (422,60) width 154: "dummy text dummy text" + RenderText {#text} at (576,60) size 131x19 + text run at (576,60) width 131: " two blue lines here: " + RenderText {#text} at (717,60) size 765x119 + text run at (717,60) width 48: "dummy" + text run at (0,80) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (474,80) width 260: "text dummy text dummy text dummy text" + text run at (0,100) width 210: "dummy text dummy text dummy " + text run at (210,100) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (684,100) width 75: "text dummy" + text run at (0,120) width 395: "text dummy text dummy text dummy text dummy text dummy " + text run at (395,120) width 339: "text dummy text dummy text dummy text dummy text" + text run at (0,140) width 131: "dummy text dummy " + text run at (131,140) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (605,140) width 154: "text dummy text dummy" + text run at (0,160) width 106: "text dummy text " + RenderInline {SPAN} at (0,0) size 149x19 [color=#0000FF] [border: none (1px solid #0000FF) none] + RenderText {#text} at (106,160) size 148x19 + text run at (106,160) width 55: "one thin " + text run at (161,160) width 93: "blue line here: " + RenderText {#text} at (255,160) size 777x99 + text run at (255,160) width 316: "dummy text dummy text dummy text dummy text " + text run at (571,160) width 206: "dummy text dummy text dummy" + text run at (0,180) width 264: "text dummy text dummy text dummy text " + text run at (264,180) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (0,200) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (474,200) width 285: "dummy text dummy text dummy text dummy" + text run at (0,220) width 185: "text dummy text dummy text " + text run at (185,220) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,220) width 75: "dummy text" + text run at (0,240) width 312: "dummy text dummy text dummy text dummy text" + RenderBlock {DIV} at (0,312) size 784x20 + RenderText {#text} at (0,0) size 416x19 + text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5520-brdr-b-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5520-brdr-b-00-a-expected.txt index d8acd05547b2..3bea747bd238 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5520-brdr-b-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5520-brdr-b-00-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {HTML} at (0,0) size 800x99 RenderBody {BODY} at (8,16) size 784x67 RenderBlock {P} at (0,0) size 784x30 [color=#0000FF] [border: none (10px double #0000FF) none] - RenderText {#text} at (0,0) size 352x19 - text run at (0,0) width 352: "This paragraph should have two blue lines directly under it." + RenderText {#text} at (0,0) size 374x19 + text run at (0,0) width 374: "This paragraph should have two blue lines directly under it." RenderBlock {P} at (0,46) size 784x21 [color=#0000FF] [border: none (1px solid #0000FF) none] - RenderText {#text} at (0,0) size 392x19 - text run at (0,0) width 392: "This paragraph should have a single thin blue line directly under it." + RenderText {#text} at (0,0) size 420x19 + text run at (0,0) width 420: "This paragraph should have a single thin blue line directly under it." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5520-brdr-b-01-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5520-brdr-b-01-e-expected.txt index 53bb78bf7366..43adc4dec3df 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5520-brdr-b-01-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5520-brdr-b-01-e-expected.txt @@ -4,58 +4,58 @@ layer at (0,0) size 800x326 RenderBlock {HTML} at (0,0) size 800x326 RenderBody {BODY} at (8,16) size 784x294 [color=#0000FF] RenderBlock {P} at (0,0) size 784x42 - RenderText {#text} at (0,2) size 470x19 - text run at (0,2) width 470: "There should be a solid blue line directly under every occurrence of the word \"" - RenderInline {SPAN} at (0,0) size 55x21 [border: none (2px solid #0000FF) none] - RenderText {#text} at (470,2) size 55x19 - text run at (470,2) width 55: "HERE \x{21E9}" - RenderText {#text} at (525,2) size 770x39 - text run at (525,2) width 245: "\". (So there should be 8 blue lines on this" - text run at (0,22) width 38: "page.)" - RenderTable {TABLE} at (0,58) size 126x88 - RenderTableSection {TBODY} at (0,0) size 126x88 - RenderTableRow {TR} at (0,2) size 126x26 - RenderTableCell {TD} at (2,2) size 122x26 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (33,3) size 56x19 - text run at (33,3) width 56: "HERE \x{21E9}" - RenderTableRow {TR} at (0,30) size 126x56 - RenderTableCell {TD} at (2,45) size 57x26 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,3) size 55x19 - text run at (1,3) width 55: "HERE \x{21E9}" - RenderTableCell {TD} at (61,30) size 63x56 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] - RenderTable {TABLE} at (1,1) size 61x30 - RenderTableSection {TBODY} at (0,0) size 61x30 - RenderTableRow {TR} at (0,2) size 61x26 - RenderTableCell {TD} at (2,2) size 57x26 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,3) size 55x19 - text run at (1,3) width 55: "HERE \x{21E9}" - RenderBlock (anonymous) at (1,31) size 61x22 - RenderText {#text} at (3,2) size 55x19 - text run at (3,2) width 55: "HERE \x{21E9}" + RenderText {#text} at (0,2) size 494x19 + text run at (0,2) width 494: "There should be a solid blue line directly under every occurrence of the word \"" + RenderInline {SPAN} at (0,0) size 59x21 [border: none (2px solid #0000FF) none] + RenderText {#text} at (494,2) size 59x19 + text run at (494,2) width 59: "HERE \x{21E9}" + RenderText {#text} at (553,2) size 766x39 + text run at (553,2) width 213: "\". (So there should be 8 blue lines" + text run at (0,22) width 85: "on this page.)" + RenderTable {TABLE} at (0,58) size 134x88 + RenderTableSection {TBODY} at (0,0) size 134x88 + RenderTableRow {TR} at (0,2) size 134x26 + RenderTableCell {TD} at (2,2) size 130x26 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (35,3) size 60x19 + text run at (35,3) width 60: "HERE \x{21E9}" + RenderTableRow {TR} at (0,30) size 134x56 + RenderTableCell {TD} at (2,45) size 61x26 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,3) size 59x19 + text run at (1,3) width 59: "HERE \x{21E9}" + RenderTableCell {TD} at (65,30) size 67x56 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1] + RenderTable {TABLE} at (1,1) size 65x30 + RenderTableSection {TBODY} at (0,0) size 65x30 + RenderTableRow {TR} at (0,2) size 65x26 + RenderTableCell {TD} at (2,2) size 61x26 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,3) size 59x19 + text run at (1,3) width 59: "HERE \x{21E9}" + RenderBlock (anonymous) at (1,31) size 65x22 + RenderText {#text} at (3,2) size 59x19 + text run at (3,2) width 59: "HERE \x{21E9}" RenderBlock {UL} at (0,162) size 784x132 RenderListItem {LI} at (40,0) size 744x84 [border: none (2px solid #0000FF) none] RenderBlock {UL} at (0,0) size 744x60 RenderListItem {LI} at (40,0) size 704x20 RenderListMarker at (-18,0) size 7x19: white bullet RenderListMarker at (-58,0) size 7x19: bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "dummy text" + RenderText {#text} at (0,0) size 75x19 + text run at (0,0) width 75: "dummy text" RenderListItem {LI} at (40,20) size 704x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "dummy text" + RenderText {#text} at (0,0) size 75x19 + text run at (0,0) width 75: "dummy text" RenderListItem {LI} at (40,40) size 704x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "dummy text" + RenderText {#text} at (0,0) size 75x19 + text run at (0,0) width 75: "dummy text" RenderBlock (anonymous) at (0,60) size 744x22 - RenderText {#text} at (0,2) size 55x19 - text run at (0,2) width 55: "HERE \x{21E9}" + RenderText {#text} at (0,2) size 59x19 + text run at (0,2) width 59: "HERE \x{21E9}" RenderListItem {LI} at (40,84) size 744x24 [border: none (2px solid #0000FF) none] RenderListMarker at (-18,2) size 7x19: bullet - RenderText {#text} at (0,2) size 55x19 - text run at (0,2) width 55: "HERE \x{21E9}" + RenderText {#text} at (0,2) size 59x19 + text run at (0,2) width 59: "HERE \x{21E9}" RenderListItem {LI} at (40,108) size 744x24 [border: none (2px solid #0000FF) none] RenderListMarker at (-18,2) size 7x19: bullet - RenderText {#text} at (0,2) size 55x19 - text run at (0,2) width 55: "HERE \x{21E9}" + RenderText {#text} at (0,2) size 59x19 + text run at (0,2) width 59: "HERE \x{21E9}" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt index 8984ed295312..784bc321cf67 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5520-ibrdr-b-00-a-expected.txt @@ -1,54 +1,54 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x328 - RenderBlock {HTML} at (0,0) size 800x328 - RenderBody {BODY} at (8,8) size 784x312 +layer at (0,0) size 800x348 + RenderBlock {HTML} at (0,0) size 800x348 + RenderBody {BODY} at (8,8) size 784x332 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 330x19 - text run at (0,0) width 330: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,36) size 784x240 [color=#C0C0C0] - RenderText {#text} at (0,0) size 784x79 - text run at (0,0) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (444,0) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (0,20) width 100: "text dummy text " - text run at (100,20) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (544,20) width 218: "dummy text dummy text dummy text" - text run at (0,40) width 222: "dummy text dummy text dummy text " - text run at (222,40) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (666,40) width 118: "dummy text dummy" - text run at (0,60) width 322: "text dummy text dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 123x29 [color=#0000FF] [border: none (10px double #0000FF) none] - RenderText {#text} at (322,60) size 123x19 - text run at (322,60) width 123: "two blue lines below" - RenderText {#text} at (445,60) size 784x99 - text run at (445,60) width 152: " dummy text dummy text " - text run at (597,60) width 144: "dummy text dummy text" - text run at (0,80) width 296: "dummy text dummy text dummy text dummy text " - text run at (296,80) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (740,80) width 44: "dummy" - text run at (0,100) width 396: "text dummy text dummy text dummy text dummy text dummy text " - text run at (396,100) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (0,120) width 74: "dummy text " - text run at (74,120) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (518,120) width 266: "dummy text dummy text dummy text dummy" - text run at (0,140) width 174: "text dummy text dummy text " - text run at (174,140) width 148: "dummy text dummy text " - RenderInline {SPAN} at (0,0) size 141x20 [color=#0000FF] [border: none (1px solid #0000FF) none] - RenderText {#text} at (322,140) size 141x19 - text run at (322,140) width 104: "one thin blue line " - text run at (426,140) width 37: "below" - RenderText {#text} at (463,140) size 784x99 - text run at (463,140) width 296: " dummy text dummy text dummy text dummy text" - text run at (0,160) width 74: "dummy text " - text run at (74,160) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (518,160) width 266: "dummy text dummy text dummy text dummy" - text run at (0,180) width 174: "text dummy text dummy text " - text run at (174,180) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (618,180) width 144: "dummy text dummy text" - text run at (0,200) width 296: "dummy text dummy text dummy text dummy text " - text run at (296,200) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (740,200) width 44: "dummy" - text run at (0,220) width 244: "text dummy text dummy text dummy text" - RenderBlock {DIV} at (0,292) size 784x20 - RenderText {#text} at (0,0) size 395x19 - text run at (0,0) width 395: "(All the lines of text in the block above should be equally spaced.)" + RenderText {#text} at (0,0) size 341x19 + text run at (0,0) width 341: "The blue bits of text should be decorated as described." + RenderBlock {P} at (0,36) size 784x260 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x79 + text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (474,0) width 285: "dummy text dummy text dummy text dummy" + text run at (0,20) width 185: "text dummy text dummy text " + text run at (185,20) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,20) width 75: "dummy text" + text run at (0,40) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (395,40) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,60) width 106: "text dummy text " + text run at (106,60) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + RenderInline {SPAN} at (0,0) size 131x29 [color=#0000FF] [border: none (10px double #0000FF) none] + RenderText {#text} at (580,60) size 131x19 + text run at (580,60) width 131: "two blue lines below" + RenderText {#text} at (711,60) size 763x119 + text run at (711,60) width 52: " dummy" + text run at (0,80) width 106: "text dummy text " + text run at (106,80) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (580,80) width 154: "dummy text dummy text" + text run at (0,100) width 316: "dummy text dummy text dummy text dummy text " + text run at (316,100) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,120) width 27: "text " + text run at (27,120) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (501,120) width 233: "dummy text dummy text dummy text" + text run at (0,140) width 237: "dummy text dummy text dummy text " + text run at (237,140) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (711,140) width 48: "dummy" + text run at (0,160) width 106: "text dummy text " + RenderInline {SPAN} at (0,0) size 152x20 [color=#0000FF] [border: none (1px solid #0000FF) none] + RenderText {#text} at (106,160) size 152x19 + text run at (106,160) width 113: "one thin blue line " + text run at (219,160) width 39: "below" + RenderText {#text} at (258,160) size 784x99 + text run at (258,160) width 399: " dummy text dummy text dummy text dummy text dummy text " + text run at (657,160) width 127: "dummy text dummy" + text run at (0,180) width 343: "text dummy text dummy text dummy text dummy text " + text run at (343,180) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,200) width 79: "dummy text " + text run at (79,200) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (553,200) width 206: "dummy text dummy text dummy" + text run at (0,220) width 264: "text dummy text dummy text dummy text " + text run at (264,220) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (0,240) width 312: "dummy text dummy text dummy text dummy text" + RenderBlock {DIV} at (0,312) size 784x20 + RenderText {#text} at (0,0) size 416x19 + text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-00-a-expected.txt index f9e5f37ad2ea..39e8dc859234 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-00-a-expected.txt @@ -1,33 +1,37 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x212 - RenderBlock {HTML} at (0,0) size 800x212 - RenderBody {BODY} at (8,16) size 784x180 - RenderBlock {P} at (20,0) size 764x82 [color=#0000FF] [border: none (10px double #0000FF)] - RenderText {#text} at (10,2) size 336x19 - text run at (10,2) width 336: "\x{21E6} This paragraph should have two blue lines on its left. " - RenderInline {SPAN} at (0,0) size 750x79 [color=#C0C0C0] - RenderText {#text} at (346,2) size 750x79 - text run at (346,2) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (10,22) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (454,22) width 292: "text dummy text dummy text dummy text dummy" - text run at (10,42) width 148: "text dummy text dummy " - text run at (158,42) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (602,42) width 144: "text dummy text dummy" - text run at (10,62) width 296: "text dummy text dummy text dummy text dummy " - text run at (306,62) width 318: "text dummy text dummy text dummy text dummy text" +layer at (0,0) size 800x252 + RenderBlock {HTML} at (0,0) size 800x252 + RenderBody {BODY} at (8,16) size 784x220 + RenderBlock {P} at (20,0) size 764x102 [color=#0000FF] [border: none (10px double #0000FF)] + RenderText {#text} at (10,2) size 356x19 + text run at (10,2) width 356: "\x{21E6} This paragraph should have two blue lines on its left. " + RenderInline {SPAN} at (0,0) size 747x99 [color=#C0C0C0] + RenderText {#text} at (366,2) size 747x99 + text run at (366,2) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (10,22) width 52: "dummy " + text run at (62,22) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (536,22) width 181: "text dummy text dummy text" + text run at (10,42) width 289: "dummy text dummy text dummy text dummy " + text run at (299,42) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (10,62) width 52: "dummy " + text run at (62,62) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (536,62) width 181: "text dummy text dummy text" + text run at (10,82) width 154: "dummy text dummy text" RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (20,98) size 764x82 [color=#0000FF] [border: none (1px solid #0000FF)] - RenderText {#text} at (1,2) size 339x19 - text run at (1,2) width 339: "\x{21E6} This paragraph should have a thin blue line on its left. " - RenderInline {SPAN} at (0,0) size 762x79 [color=#C0C0C0] - RenderText {#text} at (340,2) size 762x79 - text run at (340,2) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (1,22) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (445,22) width 318: "text dummy text dummy text dummy text dummy text" - text run at (1,42) width 122: "dummy text dummy " - text run at (123,42) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (567,42) width 170: "text dummy text dummy text" - text run at (1,62) width 270: "dummy text dummy text dummy text dummy " - text run at (271,62) width 318: "text dummy text dummy text dummy text dummy text" + RenderBlock {P} at (20,118) size 764x102 [color=#0000FF] [border: none (1px solid #0000FF)] + RenderText {#text} at (1,2) size 361x19 + text run at (1,2) width 361: "\x{21E6} This paragraph should have a thin blue line on its left. " + RenderInline {SPAN} at (0,0) size 759x99 [color=#C0C0C0] + RenderText {#text} at (362,2) size 759x99 + text run at (362,2) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (1,22) width 52: "dummy " + text run at (53,22) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (527,22) width 233: "text dummy text dummy text dummy" + text run at (1,42) width 237: "text dummy text dummy text dummy " + text run at (238,42) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (712,42) width 23: "text" + text run at (1,62) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (448,62) width 312: "text dummy text dummy text dummy text dummy" + text run at (1,82) width 23: "text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-01-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-01-e-expected.txt index 81b33c22b96a..18ddb59b09b6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-01-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-01-e-expected.txt @@ -4,33 +4,33 @@ layer at (0,0) size 800x264 RenderBlock {HTML} at (0,0) size 800x264 RenderBody {BODY} at (8,16) size 784x232 [color=#0000FF] RenderBlock {P} at (0,0) size 784x41 - RenderText {#text} at (0,17) size 455x19 - text run at (0,17) width 455: "There should be a solid blue line to the left of every occurance of the word \"" - RenderInline {SPAN} at (0,0) size 135x36 [border: none (2px solid #0000FF)] - RenderText {#text} at (457,4) size 133x36 - text run at (457,4) width 133: "\x{21E6}THERE" - RenderText {#text} at (590,17) size 9x19 - text run at (590,17) width 9: "\"." - RenderTable {TABLE} at (0,57) size 288x139 - RenderTableSection {TBODY} at (0,0) size 288x139 - RenderTableRow {TR} at (0,2) size 288x43 - RenderTableCell {TD} at (2,2) size 284x43 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,5) size 133x36 - text run at (3,5) width 133: "\x{21E6}THERE" - RenderTableRow {TR} at (0,47) size 288x90 - RenderTableCell {TD} at (2,70) size 137x44 [border: none (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,4) size 133x38 - text run at (3,5) width 133: "\x{21E6}THERE" - RenderTableCell {TD} at (141,47) size 145x90 [border: none (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1] - RenderBlock (anonymous) at (3,1) size 141x41 - RenderText {#text} at (0,4) size 133x36 - text run at (0,4) width 133: "\x{21E6}THERE" - RenderTable {TABLE} at (3,42) size 141x47 - RenderTableSection {TBODY} at (0,0) size 141x47 - RenderTableRow {TR} at (0,2) size 141x43 - RenderTableCell {TD} at (2,2) size 137x43 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (3,5) size 133x36 - text run at (3,5) width 133: "\x{21E6}THERE" + RenderText {#text} at (0,17) size 478x19 + text run at (0,17) width 478: "There should be a solid blue line to the left of every occurance of the word \"" + RenderInline {SPAN} at (0,0) size 136x36 [border: none (2px solid #0000FF)] + RenderText {#text} at (480,4) size 134x36 + text run at (480,4) width 134: "\x{21E6}THERE" + RenderText {#text} at (614,17) size 11x19 + text run at (614,17) width 11: "\"." + RenderTable {TABLE} at (0,57) size 290x139 + RenderTableSection {TBODY} at (0,0) size 290x139 + RenderTableRow {TR} at (0,2) size 290x43 + RenderTableCell {TD} at (2,2) size 286x43 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (3,5) size 134x36 + text run at (3,5) width 134: "\x{21E6}THERE" + RenderTableRow {TR} at (0,47) size 290x90 + RenderTableCell {TD} at (2,70) size 138x44 [border: none (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,4) size 134x38 + text run at (3,5) width 134: "\x{21E6}THERE" + RenderTableCell {TD} at (142,47) size 146x90 [border: none (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1] + RenderBlock (anonymous) at (3,1) size 142x41 + RenderText {#text} at (0,4) size 134x36 + text run at (0,4) width 134: "\x{21E6}THERE" + RenderTable {TABLE} at (3,42) size 142x47 + RenderTableSection {TBODY} at (0,0) size 142x47 + RenderTableRow {TR} at (0,2) size 142x43 + RenderTableCell {TD} at (2,2) size 138x43 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (3,5) size 134x36 + text run at (3,5) width 134: "\x{21E6}THERE" RenderBlock {P} at (0,212) size 784x20 - RenderText {#text} at (0,0) size 318x19 - text run at (0,0) width 318: "There should be 3 short lines and 2 long lines in total." + RenderText {#text} at (0,0) size 337x19 + text run at (0,0) width 337: "There should be 3 short lines and 2 long lines in total." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-02-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-02-e-expected.txt index 76dde90037cb..f7c4fb056789 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-02-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5521-brdr-l-02-e-expected.txt @@ -4,49 +4,50 @@ layer at (0,0) size 800x308 RenderBlock {HTML} at (0,0) size 800x308 RenderBody {BODY} at (8,16) size 784x276 [color=#0000FF] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 701x19 - text run at (0,0) width 337: "There should be a solid line to the left of the text below, " - text run at (337,0) width 364: "having three segments each of a different colour as indicated." + RenderText {#text} at (0,0) size 738x19 + text run at (0,0) width 354: "There should be a solid line to the left of the text below, " + text run at (354,0) width 384: "having three segments each of a different colour as indicated." RenderBlock {UL} at (0,36) size 784x240 RenderListItem {LI} at (40,0) size 744x80 [border: none (3px solid #FFA500)] RenderBlock (anonymous) at (3,0) size 741x20 RenderListMarker at (-21,0) size 7x19: bullet - RenderText {#text} at (0,0) size 102x19 - text run at (0,0) width 102: "Orange orange..." + RenderText {#text} at (0,0) size 106x19 + text run at (0,0) width 106: "Orange orange..." RenderBlock {UL} at (3,20) size 741x60 RenderListItem {LI} at (40,0) size 701x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "...orange orange..." + RenderText {#text} at (0,0) size 114x19 + text run at (0,0) width 114: "...orange orange..." RenderListItem {LI} at (40,20) size 701x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "...orange orange..." + RenderText {#text} at (0,0) size 114x19 + text run at (0,0) width 114: "...orange orange..." RenderListItem {LI} at (40,40) size 701x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 102x19 - text run at (0,0) width 102: "...orange orange." + RenderText {#text} at (0,0) size 106x19 + text run at (0,0) width 106: "...orange orange." RenderListItem {LI} at (40,80) size 744x20 [border: none (3px solid #00FF00)] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (3,0) size 34x19 - text run at (3,0) width 34: "Lime." + RenderText {#text} at (3,0) size 37x19 + text run at (3,0) width 37: "Lime." RenderListItem {LI} at (40,100) size 744x140 [border: none (3px solid #FFFF00)] RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (3,0) size 731x139 - text run at (3,0) width 305: "Yellow yellow yellow yellow yellow yellow yellow " - text run at (308,0) width 387: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (695,0) width 39: "yellow" - text run at (3,20) width 344: "yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (347,20) width 383: "yellow yellow yellow yellow yellow yellow yellow yellow yellow" - text run at (3,40) width 387: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (390,40) width 340: "yellow yellow yellow yellow yellow yellow yellow yellow" - text run at (3,60) width 43: "yellow " - text run at (46,60) width 387: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (433,60) width 297: "yellow yellow yellow yellow yellow yellow yellow" - text run at (3,80) width 86: "yellow yellow " - text run at (89,80) width 387: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (476,80) width 254: "yellow yellow yellow yellow yellow yellow" - text run at (3,100) width 129: "yellow yellow yellow " - text run at (132,100) width 387: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " - text run at (519,100) width 211: "yellow yellow yellow yellow yellow" - text run at (3,120) width 129: "yellow yellow yellow." + RenderText {#text} at (3,0) size 704x139 + text run at (3,0) width 331: "Yellow yellow yellow yellow yellow yellow yellow " + text run at (334,0) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow" + text run at (3,20) width 47: "yellow " + text run at (50,20) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (473,20) width 231: "yellow yellow yellow yellow yellow" + text run at (3,40) width 188: "yellow yellow yellow yellow " + text run at (191,40) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (614,40) width 90: "yellow yellow" + text run at (3,60) width 329: "yellow yellow yellow yellow yellow yellow yellow " + text run at (332,60) width 372: "yellow yellow yellow yellow yellow yellow yellow yellow" + text run at (3,80) width 47: "yellow " + text run at (50,80) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (473,80) width 231: "yellow yellow yellow yellow yellow" + text run at (3,100) width 188: "yellow yellow yellow yellow " + text run at (191,100) width 423: "yellow yellow yellow yellow yellow yellow yellow yellow yellow " + text run at (614,100) width 90: "yellow yellow" + text run at (3,120) width 329: "yellow yellow yellow yellow yellow yellow yellow " + text run at (332,120) width 375: "yellow yellow yellow yellow yellow yellow yellow yellow." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt index 881b16b5287b..f5ff0525d4d4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt @@ -1,57 +1,59 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x332 - RenderBlock {HTML} at (0,0) size 800x332 - RenderBody {BODY} at (8,8) size 784x316 +layer at (0,0) size 800x352 + RenderBlock {HTML} at (0,0) size 800x352 + RenderBody {BODY} at (8,8) size 784x336 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 330x19 - text run at (0,0) width 330: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,36) size 784x244 [color=#C0C0C0] - RenderText {#text} at (0,0) size 784x61 - text run at (0,0) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (444,0) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (0,20) width 100: "text dummy text " - text run at (100,20) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (544,20) width 218: "dummy text dummy text dummy text" - text run at (0,42) width 222: "dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 763x39 [color=#0000FF] [border: none (10px double #0000FF)] - RenderText {#text} at (232,42) size 165x19 - text run at (232,42) width 165: "\x{21E6} two blue lines to the left " - RenderInline {SPAN} at (0,0) size 763x39 [color=#C0C0C0] - RenderText {#text} at (397,42) size 763x39 - text run at (397,42) width 48: "dummy " - text run at (445,42) width 318: "text dummy text dummy text dummy text dummy text" - text run at (0,62) width 122: "dummy text dummy " - text run at (122,62) width 392: "text dummy text dummy text dummy text dummy text dummy text" - RenderText {#text} at (514,62) size 4x19 - text run at (514,62) width 4: " " - RenderText {#text} at (518,62) size 784x101 - text run at (518,62) width 266: "dummy text dummy text dummy text dummy" - text run at (0,82) width 100: "text dummy text " - text run at (100,82) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (544,82) width 218: "dummy text dummy text dummy text" - text run at (0,102) width 222: "dummy text dummy text dummy text " - text run at (222,102) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (666,102) width 118: "dummy text dummy" - text run at (0,122) width 322: "text dummy text dummy text dummy text dummy text " - text run at (322,122) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (0,144) width 370: "dummy text dummy text dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 184x19 [color=#0000FF] [border: none (1px solid #0000FF)] - RenderText {#text} at (371,144) size 183x19 - text run at (371,144) width 183: "\x{21E6} one thin blue line to the left " - RenderText {#text} at (554,144) size 784x99 - text run at (554,144) width 48: "dummy " - text run at (602,144) width 170: "text dummy text dummy text" - text run at (0,164) width 270: "dummy text dummy text dummy text dummy " - text run at (270,164) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (714,164) width 70: "text dummy" - text run at (0,184) width 370: "text dummy text dummy text dummy text dummy text dummy " - text run at (370,184) width 392: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,204) width 48: "dummy " - text run at (48,204) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (492,204) width 292: "text dummy text dummy text dummy text dummy" - text run at (0,224) width 148: "text dummy text dummy " - text run at (148,224) width 170: "text dummy text dummy text" - RenderBlock {DIV} at (0,296) size 784x20 - RenderText {#text} at (0,0) size 395x19 - text run at (0,0) width 395: "(All the lines of text in the block above should be equally spaced.)" + RenderText {#text} at (0,0) size 341x19 + text run at (0,0) width 341: "The blue bits of text should be decorated as described." + RenderBlock {P} at (0,36) size 784x264 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x61 + text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (474,0) width 285: "dummy text dummy text dummy text dummy" + text run at (0,20) width 185: "text dummy text dummy text " + text run at (185,20) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,20) width 75: "dummy text" + text run at (0,42) width 395: "dummy text dummy text dummy text dummy text dummy text " + RenderInline {SPAN} at (0,0) size 759x59 [color=#0000FF] [border: none (10px double #0000FF)] + RenderText {#text} at (405,42) size 174x19 + text run at (405,42) width 174: "\x{21E6} two blue lines to the left " + RenderInline {SPAN} at (0,0) size 759x59 [color=#C0C0C0] + RenderText {#text} at (579,42) size 759x59 + text run at (579,42) width 52: "dummy " + text run at (631,42) width 102: "text dummy text" + text run at (0,62) width 368: "dummy text dummy text dummy text dummy text dummy " + text run at (368,62) width 391: "text dummy text dummy text dummy text dummy text dummy" + text run at (0,82) width 23: "text" + RenderText {#text} at (23,82) size 4x19 + text run at (23,82) width 4: " " + RenderText {#text} at (27,82) size 759x101 + text run at (27,82) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (422,82) width 312: "dummy text dummy text dummy text dummy text" + text run at (0,102) width 158: "dummy text dummy text " + text run at (158,102) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (632,102) width 127: "dummy text dummy" + text run at (0,122) width 343: "text dummy text dummy text dummy text dummy text " + text run at (343,122) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,142) width 79: "dummy text " + text run at (79,142) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (553,142) width 206: "dummy text dummy text dummy" + text run at (0,164) width 185: "text dummy text dummy text " + RenderInline {SPAN} at (0,0) size 196x19 [color=#0000FF] [border: none (1px solid #0000FF)] + RenderText {#text} at (186,164) size 195x19 + text run at (186,164) width 195: "\x{21E6} one thin blue line to the left " + RenderText {#text} at (381,164) size 772x99 + text run at (381,164) width 52: "dummy " + text run at (433,164) width 339: "text dummy text dummy text dummy text dummy text" + text run at (0,184) width 131: "dummy text dummy " + text run at (131,184) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (605,184) width 154: "text dummy text dummy" + text run at (0,204) width 316: "text dummy text dummy text dummy text dummy " + text run at (316,204) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,224) width 52: "dummy " + text run at (52,224) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,224) width 233: "text dummy text dummy text dummy" + text run at (0,244) width 237: "text dummy text dummy text dummy " + text run at (237,244) width 181: "text dummy text dummy text" + RenderBlock {DIV} at (0,316) size 784x20 + RenderText {#text} at (0,0) size 416x19 + text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-00-b-expected.txt index 58c52ebba2e2..22cf2643cbb6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-00-b-expected.txt @@ -4,29 +4,29 @@ layer at (0,0) size 800x406 RenderBlock {HTML} at (0,0) size 800x406 RenderBody {BODY} at (8,16) size 784x374 RenderBlock {P} at (0,0) size 784x20 [color=#0000FF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "The borders should be as described." + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "The borders should be as described." RenderBlock {P} at (0,36) size 784x26 [color=#0000FF] [border: (3px solid #FFA500)] - RenderText {#text} at (3,3) size 107x19 - text run at (3,3) width 107: "Orange and solid." + RenderText {#text} at (3,3) size 112x19 + text run at (3,3) width 112: "Orange and solid." RenderBlock {P} at (0,78) size 784x30 [color=#0000FF] [border: (5px outset #FFA500)] - RenderText {#text} at (5,5) size 115x19 - text run at (5,5) width 115: "Orange and outset." + RenderText {#text} at (5,5) size 119x19 + text run at (5,5) width 119: "Orange and outset." RenderBlock {P} at (0,124) size 784x30 [color=#0000FF] [border: (5px inset #FFA500)] - RenderText {#text} at (5,5) size 106x19 - text run at (5,5) width 106: "Orange and inset." + RenderText {#text} at (5,5) size 111x19 + text run at (5,5) width 111: "Orange and inset." RenderBlock {P} at (0,170) size 784x40 [color=#0000FF] [border: (10px ridge #FFA500)] - RenderText {#text} at (10,10) size 117x19 - text run at (10,10) width 117: "Orange and ridged." + RenderText {#text} at (10,10) size 122x19 + text run at (10,10) width 122: "Orange and ridged." RenderBlock {P} at (0,226) size 784x40 [color=#0000FF] [border: (10px double #FFA500)] - RenderText {#text} at (10,10) size 120x19 - text run at (10,10) width 120: "Orange and double." + RenderText {#text} at (10,10) size 125x19 + text run at (10,10) width 125: "Orange and double." RenderBlock {P} at (0,282) size 784x20 [color=#0000FF] - RenderText {#text} at (0,0) size 69x19 - text run at (0,0) width 69: "No border." + RenderText {#text} at (0,0) size 68x19 + text run at (0,0) width 68: "No border." RenderBlock {P} at (0,318) size 784x20 [color=#0000FF] - RenderText {#text} at (0,0) size 69x19 - text run at (0,0) width 69: "No border." + RenderText {#text} at (0,0) size 68x19 + text run at (0,0) width 68: "No border." RenderBlock {P} at (0,354) size 784x20 [color=#0000FF] - RenderText {#text} at (0,0) size 69x19 - text run at (0,0) width 69: "No border." + RenderText {#text} at (0,0) size 68x19 + text run at (0,0) width 68: "No border." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-01-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-01-b-g-expected.txt index d3e21924ab25..3d5316a5db09 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-01-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-01-b-g-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x204 RenderBlock {HTML} at (0,0) size 800x204 RenderBody {BODY} at (8,16) size 784x156 RenderBlock {P} at (0,0) size 784x20 [color=#0000FF] - RenderText {#text} at (0,0) size 254x19 - text run at (0,0) width 254: "There should be no border around the cat:" + RenderText {#text} at (0,0) size 264x19 + text run at (0,0) width 264: "There should be no border around the cat:" RenderBlock {DIV} at (32,52) size 720x104 [color=#FF0000] RenderInline {A} at (0,0) size 98x19 [color=#0000EE] RenderImage {IMG} at (0,0) size 98x99 diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-02-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-02-e-expected.txt index e45b229c133a..c049947a5d28 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-02-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5522-brdr-02-e-expected.txt @@ -3,28 +3,28 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x84 RenderBlock {HTML} at (0,0) size 800x84 RenderBody {BODY} at (8,8) size 784x68 [color=#0000FF] - RenderTable {TABLE} at (0,0) size 682x68 - RenderTableSection {TBODY} at (0,0) size 682x68 - RenderTableRow {TR} at (0,2) size 682x26 - RenderTableCell {TD} at (2,2) size 678x26 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2] - RenderText {#text} at (3,3) size 312x19 - text run at (3,3) width 312: "There should be a blue border around this sentence." - RenderTableRow {TR} at (0,30) size 682x36 - RenderTableCell {TD} at (2,35) size 318x26 [border: (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (3,3) size 312x19 - text run at (3,3) width 312: "There should be a blue border around this sentence." - RenderTableCell {TD} at (322,30) size 358x36 [border: (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1] - RenderTable {TABLE} at (3,3) size 352x30 - RenderTableSection {TBODY} at (0,0) size 352x30 - RenderTableRow {TR} at (0,2) size 352x26 - RenderTableCell {TD} at (2,2) size 348x26 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (3,3) size 101x19 - text run at (3,3) width 101: "There should be " - RenderInline {STRONG} at (0,0) size 111x19 - RenderInline {EM} at (0,0) size 24x19 - RenderText {#text} at (104,3) size 24x19 - text run at (104,3) width 24: "two" - RenderText {#text} at (128,3) size 87x19 - text run at (128,3) width 87: " blue borders" - RenderText {#text} at (215,3) size 130x19 - text run at (215,3) width 130: " around this sentence." + RenderTable {TABLE} at (0,0) size 708x68 + RenderTableSection {TBODY} at (0,0) size 708x68 + RenderTableRow {TR} at (0,2) size 708x26 + RenderTableCell {TD} at (2,2) size 704x26 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2] + RenderText {#text} at (3,3) size 325x19 + text run at (3,3) width 325: "There should be a blue border around this sentence." + RenderTableRow {TR} at (0,30) size 708x36 + RenderTableCell {TD} at (2,35) size 331x26 [border: (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (3,3) size 325x19 + text run at (3,3) width 325: "There should be a blue border around this sentence." + RenderTableCell {TD} at (335,30) size 371x36 [border: (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1] + RenderTable {TABLE} at (3,3) size 365x30 + RenderTableSection {TBODY} at (0,0) size 365x30 + RenderTableRow {TR} at (0,2) size 365x26 + RenderTableCell {TD} at (2,2) size 361x26 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (3,3) size 106x19 + text run at (3,3) width 106: "There should be " + RenderInline {STRONG} at (0,0) size 113x19 + RenderInline {EM} at (0,0) size 23x19 + RenderText {#text} at (109,3) size 23x19 + text run at (109,3) width 23: "two" + RenderText {#text} at (132,3) size 90x19 + text run at (132,3) width 90: " blue borders" + RenderText {#text} at (222,3) size 136x19 + text run at (222,3) width 136: " around this sentence." diff --git a/LayoutTests/platform/wincairo/css2.1/t0805-c5522-ibrdr-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0805-c5522-ibrdr-00-a-expected.txt index 55e2b3fe02ac..96f18b5d9fc0 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0805-c5522-ibrdr-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0805-c5522-ibrdr-00-a-expected.txt @@ -1,52 +1,53 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x308 - RenderBlock {HTML} at (0,0) size 800x308 - RenderBody {BODY} at (8,8) size 784x292 +layer at (0,0) size 800x328 + RenderBlock {HTML} at (0,0) size 800x328 + RenderBody {BODY} at (8,8) size 784x312 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 330x19 - text run at (0,0) width 330: "The blue bits of text should be decorated as described." - RenderBlock {P} at (0,36) size 784x220 [color=#C0C0C0] - RenderText {#text} at (0,0) size 784x59 - text run at (0,0) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (444,0) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (0,20) width 100: "text dummy text " - text run at (100,20) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (544,20) width 218: "dummy text dummy text dummy text" - text run at (0,40) width 222: "dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 244x39 [color=#0000FF] [border: (10px double #0000FF)] - RenderText {#text} at (232,40) size 224x19 - text run at (232,40) width 224: "two blue lines all around this blue text" - RenderText {#text} at (466,40) size 784x99 - text run at (466,40) width 4: " " - text run at (470,40) width 292: "dummy text dummy text dummy text dummy text" - text run at (0,60) width 148: "dummy text dummy text " - text run at (148,60) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (592,60) width 192: "dummy text dummy text dummy" - text run at (0,80) width 248: "text dummy text dummy text dummy text " - text run at (248,80) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (692,80) width 70: "dummy text" - text run at (0,100) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (370,100) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,120) width 26: "text " - text run at (26,120) width 296: "dummy text dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 219x21 [color=#0000FF] [border: (1px solid #0000FF)] - RenderText {#text} at (323,120) size 217x19 - text run at (323,120) width 26: "one " - text run at (349,120) width 191: "blue line all around this blue text" - RenderText {#text} at (541,120) size 784x99 - text run at (541,120) width 152: " dummy text dummy text " - text run at (693,120) width 70: "dummy text" - text run at (0,140) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (370,140) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,160) width 26: "text " - text run at (26,160) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (470,160) width 292: "dummy text dummy text dummy text dummy text" - text run at (0,180) width 148: "dummy text dummy text " - text run at (148,180) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (592,180) width 192: "dummy text dummy text dummy" - text run at (0,200) width 248: "text dummy text dummy text dummy text " - text run at (248,200) width 70: "dummy text" - RenderBlock {DIV} at (0,272) size 784x20 - RenderText {#text} at (0,0) size 395x19 - text run at (0,0) width 395: "(All the lines of text in the block above should be equally spaced.)" + RenderText {#text} at (0,0) size 341x19 + text run at (0,0) width 341: "The blue bits of text should be decorated as described." + RenderBlock {P} at (0,36) size 784x240 [color=#C0C0C0] + RenderText {#text} at (0,0) size 759x59 + text run at (0,0) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (474,0) width 285: "dummy text dummy text dummy text dummy" + text run at (0,20) width 185: "text dummy text dummy text " + text run at (185,20) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,20) width 75: "dummy text" + text run at (0,40) width 395: "dummy text dummy text dummy text dummy text dummy text " + RenderInline {SPAN} at (0,0) size 259x39 [color=#0000FF] [border: (10px double #0000FF)] + RenderText {#text} at (405,40) size 239x19 + text run at (405,40) width 239: "two blue lines all around this blue text" + RenderText {#text} at (654,40) size 759x119 + text run at (654,40) width 4: " " + text run at (658,40) width 75: "dummy text" + text run at (0,60) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (395,60) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,80) width 106: "text dummy text " + text run at (106,80) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (580,80) width 154: "dummy text dummy text" + text run at (0,100) width 316: "dummy text dummy text dummy text dummy text " + text run at (316,100) width 443: "dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,120) width 27: "text " + text run at (27,120) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (501,120) width 233: "dummy text dummy text dummy text" + text run at (0,140) width 79: "dummy text " + RenderInline {SPAN} at (0,0) size 234x21 [color=#0000FF] [border: (1px solid #0000FF)] + RenderText {#text} at (80,140) size 232x19 + text run at (80,140) width 27: "one " + text run at (107,140) width 205: "blue line all around this blue text" + RenderText {#text} at (313,140) size 760x99 + text run at (313,140) width 162: " dummy text dummy text " + text run at (475,140) width 285: "dummy text dummy text dummy text dummy" + text run at (0,160) width 185: "text dummy text dummy text " + text run at (185,160) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (659,160) width 75: "dummy text" + text run at (0,180) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (395,180) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (0,200) width 106: "text dummy text " + text run at (106,200) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (580,200) width 154: "dummy text dummy text" + text run at (0,220) width 316: "dummy text dummy text dummy text dummy text " + text run at (316,220) width 75: "dummy text" + RenderBlock {DIV} at (0,292) size 784x20 + RenderText {#text} at (0,0) size 416x19 + text run at (0,0) width 416: "(All the lines of text in the block above should be equally spaced.)" diff --git a/LayoutTests/platform/wincairo/css2.1/t09-c5526c-display-00-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t09-c5526c-display-00-e-expected.txt index 7e6114fbb177..9706c795d772 100644 --- a/LayoutTests/platform/wincairo/css2.1/t09-c5526c-display-00-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t09-c5526c-display-00-e-expected.txt @@ -1,71 +1,69 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x433 - RenderBlock {HTML} at (0,0) size 800x433 [color=#FFFFFF] [bgcolor=#0000FF] - RenderBody {BODY} at (15,15) size 490x403 [bgcolor=#FFFFFF] [border: (5px solid #000000)] +layer at (0,0) size 800x420 + RenderBlock {HTML} at (0,0) size 800x420 [color=#FFFFFF] [bgcolor=#0000FF] + RenderBody {BODY} at (15,15) size 490x390 [bgcolor=#FFFFFF] [border: (5px solid #000000)] RenderBlock {DL} at (5,5) size 480x10 RenderBlock (floating) {DT} at (5,5) size 80x310 [bgcolor=#CC0000] [border: (5px solid #000000)] - RenderText {#text} at (15,14) size 35x12 - text run at (15,14) width 35: "toggle" + RenderText {#text} at (15,14) size 31x12 + text run at (15,14) width 31: "toggle" RenderBlock (floating) {DD} at (95,5) size 380x310 [border: (10px solid #000000)] RenderBlock {UL} at (20,20) size 340x0 RenderBlock (floating) {LI} at (0,0) size 80x120 [color=#000000] [bgcolor=#FFCC00] [border: (5px solid #000000)] - RenderText {#text} at (15,14) size 42x12 - text run at (15,14) width 42: "the way" + RenderText {#text} at (15,14) size 40x12 + text run at (15,14) width 40: "the way" RenderBlock (floating) {LI} at (90,0) size 160x110 [bgcolor=#000000] RenderBlock {P} at (10,10) size 140x10 - RenderText {#text} at (0,-1) size 81x12 - text run at (0,-1) width 81: "the world ends" + RenderText {#text} at (0,-1) size 74x12 + text run at (0,-1) width 74: "the world ends" RenderBlock (anonymous) at (10,20) size 140x0 RenderInline {FORM} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (10,20) size 140x42 RenderBlock {P} at (0,0) size 140x21 - RenderText {#text} at (0,5) size 32x12 - text run at (0,5) width 32: "bang " - RenderBlock {INPUT} at (34,3) size 12x12 [color=#000000] + RenderText {#text} at (0,5) size 28x12 + text run at (0,5) width 28: "bang " + RenderBlock {INPUT} at (30,3) size 12x12 [color=#000000] RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,21) size 140x21 - RenderText {#text} at (0,5) size 50x12 - text run at (0,5) width 50: "whimper " - RenderBlock {INPUT} at (52,3) size 12x12 [color=#000000] + RenderText {#text} at (0,5) size 47x12 + text run at (0,5) width 47: "whimper " + RenderBlock {INPUT} at (49,3) size 12x12 [color=#000000] RenderText {#text} at (0,0) size 0x0 RenderBlock (anonymous) at (10,62) size 140x0 RenderInline {FORM} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderBlock (floating) {LI} at (259,0) size 81x120 [color=#000000] [bgcolor=#FFCC00] [border: (5px solid #000000)] - RenderText {#text} at (15,14) size 32x22 - text run at (15,14) width 32: "i grow" - text run at (15,24) width 17: "old" + RenderText {#text} at (15,14) size 50x12 + text run at (15,14) width 50: "i grow old" RenderBlock (floating) {LI} at (0,130) size 120x120 [bgcolor=#000000] - RenderText {#text} at (10,9) size 34x12 - text run at (10,9) width 34: "pluot?" + RenderText {#text} at (10,9) size 30x12 + text run at (10,9) width 30: "pluot?" RenderBlock (floating) {BLOCKQUOTE} at (160,150) size 70x140 [color=#000000] [bgcolor=#FFCC00] [border: (10px solid #000000) (15px solid #000000) (20px solid #000000) (5px solid #000000)] RenderBlock {ADDRESS} at (5,20) size 50x20 - RenderText {#text} at (0,-1) size 38x22 - text run at (0,-1) width 18: "bar" - text run at (0,9) width 38: "maids," + RenderText {#text} at (0,-1) size 34x22 + text run at (0,-1) width 16: "bar" + text run at (0,9) width 34: "maids," RenderBlock (floating) {H1} at (240,150) size 120x120 [bgcolor=#000000] - RenderText {#text} at (10,9) size 73x22 - text run at (10,9) width 64: "sing to me," - text run at (10,19) width 73: "erbarme dich" - RenderBlock {P} at (5,320) size 480x78 [color=#000000] - RenderText {#text} at (0,0) size 479x38 - text run at (0,0) width 419: "This is a nonsensical document, but syntactically valid HTML 4.0. All 100%-" - text run at (0,13) width 479: "conformant CSS1 agents should be able to render the document elements above this" - text run at (0,26) width 290: "paragraph indistinguishably (to the pixel) from this " - RenderInline {A} at (0,0) size 113x12 [color=#999999] - RenderText {#text} at (290,26) size 113x12 - text run at (290,26) width 113: "reference rendering," - RenderText {#text} at (403,26) size 475x38 - text run at (403,26) width 4: " " - text run at (407,26) width 68: "(except font" - text run at (0,39) width 435: "rasterization and form widgets). All discrepancies should be traceable to CSS1" - text run at (0,52) width 174: "implementation shortcomings. " - text run at (174,52) width 41: "Please " - RenderInline {A} at (0,0) size 93x12 [color=#CC0000] - RenderText {#text} at (215,52) size 93x12 - text run at (215,52) width 93: "report any errors" - RenderText {#text} at (308,52) size 480x25 - text run at (308,52) width 172: " you find between the CSS and" - text run at (0,65) width 135: "the reference rendering." + RenderText {#text} at (10,9) size 66x22 + text run at (10,9) width 58: "sing to me," + text run at (10,19) width 66: "erbarme dich" + RenderBlock {P} at (5,320) size 480x65 [color=#000000] + RenderText {#text} at (0,0) size 480x38 + text run at (0,0) width 473: "This is a nonsensical document, but syntactically valid HTML 4.0. All 100%-conformant CSS1" + text run at (0,13) width 480: "agents should be able to render the document elements above this paragraph indistinguishably" + text run at (0,26) width 122: "(to the pixel) from this " + RenderInline {A} at (0,0) size 102x12 [color=#999999] + RenderText {#text} at (122,26) size 102x12 + text run at (122,26) width 102: "reference rendering," + RenderText {#text} at (224,26) size 474x25 + text run at (224,26) width 4: " " + text run at (228,26) width 246: "(except font rasterization and form widgets). All" + text run at (0,39) width 374: "discrepancies should be traceable to CSS1 implementation shortcomings. " + text run at (374,39) width 36: "Please " + RenderInline {A} at (0,0) size 462x25 [color=#CC0000] + RenderText {#text} at (410,39) size 462x25 + text run at (410,39) width 52: "report any" + text run at (0,52) width 29: "errors" + RenderText {#text} at (29,52) size 284x12 + text run at (29,52) width 284: " you find between the CSS and the reference rendering." diff --git a/LayoutTests/platform/wincairo/css2.1/t090204-display-change-01-b-ao-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090204-display-change-01-b-ao-expected.txt index 4137839dd65b..baf21f2806d9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090204-display-change-01-b-ao-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090204-display-change-01-b-ao-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x92 RenderBlock {HTML} at (0,0) size 800x92 RenderBody {BODY} at (8,16) size 784x68 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 255x19 - text run at (0,0) width 255: "There should be no red below, only green." + RenderText {#text} at (0,0) size 267x19 + text run at (0,0) width 267: "There should be no red below, only green." RenderBlock (floating) {DIV} at (0,36) size 784x16 [color=#008000] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 16x16 text run at (0,0) width 16: "X" diff --git a/LayoutTests/platform/wincairo/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt index 2935a5c90bb2..37e35a912982 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x188 RenderBlock {HTML} at (0,0) size 800x188 RenderBody {BODY} at (8,16) size 784x164 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 458x19 - text run at (0,0) width 458: "The two diagrams below should be identical to the pixel with no red present." + RenderText {#text} at (0,0) size 482x19 + text run at (0,0) width 482: "The two diagrams below should be identical to the pixel with no red present." RenderTable {TABLE} at (0,36) size 434x128 RenderTableSection {TBODY} at (0,0) size 434x128 RenderTableRow {TR} at (0,2) size 434x124 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-00-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-00-d-expected.txt index bea9128f829b..e2b317fcb64f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-00-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-00-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x180 RenderBlock {HTML} at (0,0) size 800x180 RenderBody {BODY} at (8,16) size 784x108 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 386x19 - text run at (0,0) width 386: "The two patterns below should be identical, with no red present." + RenderText {#text} at (0,0) size 404x19 + text run at (0,0) width 404: "The two patterns below should be identical, with no red present." RenderBlock {DIV} at (0,36) size 784x72 RenderBlock {DIV} at (16,16) size 160x20 [color=#FFFF00] [bgcolor=#000080] RenderText {#text} at (0,0) size 12x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-01-d-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-01-d-g-expected.txt index 42d886ebe324..10fc39a5de33 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-01-d-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-01-d-g-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x164 RenderBlock {HTML} at (0,0) size 800x164 RenderBody {BODY} at (8,16) size 784x100 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 386x19 - text run at (0,0) width 386: "The two patterns below should be identical, with no red present." + RenderText {#text} at (0,0) size 404x19 + text run at (0,0) width 404: "The two patterns below should be identical, with no red present." RenderBlock {DIV} at (0,36) size 784x64 RenderImage {IMG} at (16,16) size 160x16 [color=#FFFF00] [bgcolor=#FF0000] RenderImage {IMG} at (96,32) size 160x16 [color=#FFFF00] [bgcolor=#FF0000] diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-02-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-02-c-expected.txt index 88369c0c8537..2b5e4c8fa707 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-02-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-02-c-expected.txt @@ -4,33 +4,34 @@ layer at (0,0) size 800x292 RenderBlock {HTML} at (0,0) size 800x292 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 [color=#000080] - RenderText {#text} at (0,0) size 782x39 - text run at (0,0) width 399: "The blue boxes below should be in numeric order and form a \"D\". " - text run at (399,0) width 383: "(Boxes labelled \"A\" should be in the first column; boxes labelled" - text run at (0,20) width 338: "\"B\" should be in the second; arrows indicate the correct " - text run at (338,20) width 65: "alignment.)" + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 423: "The blue boxes below should be in numeric order and form a \"D\". " + text run at (423,0) width 356: "(Boxes labelled \"A\" should be in the first column; boxes" + text run at (0,20) width 53: "labelled " + text run at (53,20) width 355: "\"B\" should be in the second; arrows indicate the correct " + text run at (408,20) width 71: "alignment.)" RenderBlock {DIV} at (16,56) size 320x0 RenderBlock (floating) {P} at (4,4) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 1" RenderBlock (floating) {P} at (138,4) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (7,9) size 41x19 - text run at (7,9) width 41: "\x{21E6} B 2" + RenderText {#text} at (7,9) size 42x19 + text run at (7,9) width 42: "\x{21E6} B 2" RenderBlock (floating) {P} at (4,48) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 3" RenderBlock (floating) {P} at (190,48) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (78,9) size 41x19 - text run at (78,9) width 41: "B 4 \x{21E8}" + RenderText {#text} at (77,9) size 42x19 + text run at (77,9) width 42: "B 4 \x{21E8}" RenderBlock (floating) {P} at (4,92) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 5" RenderBlock (floating) {P} at (190,92) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (78,9) size 41x19 - text run at (78,9) width 41: "B 6 \x{21E8}" + RenderText {#text} at (77,9) size 42x19 + text run at (77,9) width 42: "B 6 \x{21E8}" RenderBlock (floating) {P} at (190,136) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (78,9) size 41x19 - text run at (78,9) width 41: "B 8 \x{21E8}" + RenderText {#text} at (77,9) size 42x19 + text run at (77,9) width 42: "B 8 \x{21E8}" RenderBlock (floating) {P} at (4,136) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 7" @@ -38,5 +39,5 @@ layer at (0,0) size 800x292 RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 9" RenderBlock (floating) {P} at (138,180) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (7,9) size 49x19 - text run at (7,9) width 49: "\x{21E6} B 10" + RenderText {#text} at (7,9) size 50x19 + text run at (7,9) width 50: "\x{21E6} B 10" diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-03-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-03-c-expected.txt index e79e0601a5c8..154a6f45c70f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-03-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-03-c-expected.txt @@ -4,27 +4,28 @@ layer at (0,0) size 800x292 RenderBlock {HTML} at (0,0) size 800x292 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 [color=#000080] - RenderText {#text} at (0,0) size 763x39 - text run at (0,0) width 370: "The blue boxes below should be in numeric order and form a " - text run at (370,0) width 393: "backwards \"D\". (Boxes labelled \"A\" should be in the first column;" - text run at (0,20) width 381: "boxes labelled \"B\" should be in the second; arrows indicate the " - text run at (381,20) width 112: "correct alignment.)" + RenderText {#text} at (0,0) size 755x39 + text run at (0,0) width 389: "The blue boxes below should be in numeric order and form a " + text run at (389,0) width 366: "backwards \"D\". (Boxes labelled \"A\" should be in the first" + text run at (0,20) width 55: "column; " + text run at (55,20) width 402: "boxes labelled \"B\" should be in the second; arrows indicate the " + text run at (457,20) width 118: "correct alignment.)" RenderBlock {DIV} at (16,56) size 320x0 RenderBlock (floating) {P} at (190,4) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (78,9) size 41x19 - text run at (78,9) width 41: "B 2 \x{21E8}" + RenderText {#text} at (77,9) size 42x19 + text run at (77,9) width 42: "B 2 \x{21E8}" RenderBlock (floating) {P} at (56,4) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (77,9) size 42x19 text run at (77,9) width 42: "A 1 \x{21E8}" RenderBlock (floating) {P} at (190,48) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (78,9) size 41x19 - text run at (78,9) width 41: "B 4 \x{21E8}" + RenderText {#text} at (77,9) size 42x19 + text run at (77,9) width 42: "B 4 \x{21E8}" RenderBlock (floating) {P} at (4,48) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 3" RenderBlock (floating) {P} at (190,92) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (78,9) size 41x19 - text run at (78,9) width 41: "B 6 \x{21E8}" + RenderText {#text} at (77,9) size 42x19 + text run at (77,9) width 42: "B 6 \x{21E8}" RenderBlock (floating) {P} at (4,92) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 5" @@ -32,11 +33,11 @@ layer at (0,0) size 800x292 RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 7" RenderBlock (floating) {P} at (190,136) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (78,9) size 41x19 - text run at (78,9) width 41: "B 8 \x{21E8}" + RenderText {#text} at (77,9) size 42x19 + text run at (77,9) width 42: "B 8 \x{21E8}" RenderBlock (floating) {P} at (190,180) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (70,9) size 49x19 - text run at (70,9) width 49: "B 10 \x{21E8}" + RenderText {#text} at (69,9) size 50x19 + text run at (69,9) width 50: "B 10 \x{21E8}" RenderBlock (floating) {P} at (56,180) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (77,9) size 42x19 text run at (77,9) width 42: "A 9 \x{21E8}" diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-04-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-04-c-expected.txt index fd10092ad392..6959f963d76f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-04-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-04-c-expected.txt @@ -4,51 +4,52 @@ layer at (0,0) size 800x380 RenderBlock {HTML} at (0,0) size 800x380 RenderBody {BODY} at (8,16) size 784x40 RenderBlock {P} at (0,0) size 784x40 [color=#000080] - RenderText {#text} at (0,0) size 781x39 - text run at (0,0) width 398: "The blue boxes below should be in numeric order and form a \"B\". " - text run at (398,0) width 383: "(Boxes labelled \"A\" should be in the first column; boxes labelled" - text run at (0,20) width 338: "\"B\" should be in the second; arrows indicate the correct " - text run at (338,20) width 65: "alignment.)" + RenderText {#text} at (0,0) size 778x39 + text run at (0,0) width 422: "The blue boxes below should be in numeric order and form a \"B\". " + text run at (422,0) width 356: "(Boxes labelled \"A\" should be in the first column; boxes" + text run at (0,20) width 53: "labelled " + text run at (53,20) width 355: "\"B\" should be in the second; arrows indicate the correct " + text run at (408,20) width 71: "alignment.)" RenderBlock {DIV} at (16,56) size 320x0 RenderBlock (floating) {P} at (4,4) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 1" RenderBlock (floating) {P} at (138,4) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (7,9) size 41x19 - text run at (7,9) width 41: "\x{21E6} B 2" + RenderText {#text} at (7,9) size 42x19 + text run at (7,9) width 42: "\x{21E6} B 2" RenderBlock (floating) {P} at (4,48) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 3" RenderBlock (floating) {P} at (190,48) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (78,9) size 41x19 - text run at (78,9) width 41: "B 4 \x{21E8}" + RenderText {#text} at (77,9) size 42x19 + text run at (77,9) width 42: "B 4 \x{21E8}" RenderBlock (floating) {P} at (4,92) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 5" RenderBlock (floating) {P} at (190,92) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (78,9) size 41x19 - text run at (78,9) width 41: "B 6 \x{21E8}" + RenderText {#text} at (77,9) size 42x19 + text run at (77,9) width 42: "B 6 \x{21E8}" RenderBlock (floating) {P} at (4,136) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 7" RenderBlock (floating) {P} at (138,136) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (7,9) size 41x19 - text run at (7,9) width 41: "\x{21E6} B 8" + RenderText {#text} at (7,9) size 42x19 + text run at (7,9) width 42: "\x{21E6} B 8" RenderBlock (floating) {P} at (4,180) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 42x19 text run at (7,9) width 42: "\x{21E6} A 9" RenderBlock (floating) {P} at (190,180) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (70,9) size 49x19 - text run at (70,9) width 49: "B 10 \x{21E8}" + RenderText {#text} at (69,9) size 50x19 + text run at (69,9) width 50: "B 10 \x{21E8}" RenderBlock (floating) {P} at (4,224) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (7,9) size 50x19 - text run at (7,9) width 50: "\x{21E6} A 11" + RenderText {#text} at (7,9) size 49x19 + text run at (7,9) width 49: "\x{21E6} A 11" RenderBlock (floating) {P} at (190,224) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (70,9) size 49x19 - text run at (70,9) width 49: "B 12 \x{21E8}" + RenderText {#text} at (69,9) size 50x19 + text run at (69,9) width 50: "B 12 \x{21E8}" RenderBlock (floating) {P} at (4,268) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] RenderText {#text} at (7,9) size 50x19 text run at (7,9) width 50: "\x{21E6} A 13" RenderBlock (floating) {P} at (138,268) size 126x36 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)] - RenderText {#text} at (7,9) size 49x19 - text run at (7,9) width 49: "\x{21E6} B 14" + RenderText {#text} at (7,9) size 50x19 + text run at (7,9) width 50: "\x{21E6} B 14" diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-fit-00-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-fit-00-d-expected.txt index ac37d20ec6e2..20004a188b3a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-fit-00-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-fit-00-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x140 RenderBlock {HTML} at (0,0) size 800x140 RenderBody {BODY} at (8,16) size 784x114 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 648x19 - text run at (0,0) width 648: "There should be five numbers, in numerical order, below: on the first line 1, 2 and 3, on the second, 4 and 5." + RenderText {#text} at (0,0) size 681x19 + text run at (0,0) width 681: "There should be five numbers, in numerical order, below: on the first line 1, 2 and 3, on the second, 4 and 5." RenderBlock {DIV} at (10,36) size 262x78 [color=#000080] [border: (3px solid #0000FF)] RenderBlock (floating) {P} at (19,19) size 80x20 RenderText {#text} at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt index f1b7ca651f7a..cf0338d81ad1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x274 RenderBlock {HTML} at (0,0) size 800x274 RenderBody {BODY} at (8,16) size 784x248 RenderBlock {P} at (0,0) size 784x22 [color=#000080] - RenderText {#text} at (0,2) size 729x19 - text run at (0,2) width 729: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below, slightly on the left (\x{21E6}) inside a blue box." + RenderText {#text} at (0,2) size 769x19 + text run at (0,2) width 769: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below, slightly on the left (\x{21E6}) inside a blue box." RenderBlock {DIV} at (10,38) size 260x210 [border: (5px solid #0000FF)] RenderBlock (floating) {P} at (5,5) size 100x100 [color=#000080] RenderImage {IMG} at (0,0) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-wrap-00-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-wrap-00-e-expected.txt index adb0ea1e284a..17ed0eac1a7a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-wrap-00-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-wrap-00-e-expected.txt @@ -1,24 +1,26 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x189 - RenderBlock {HTML} at (0,0) size 800x189 - RenderBody {BODY} at (8,16) size 784x157 +layer at (0,0) size 800x209 + RenderBlock {HTML} at (0,0) size 800x209 + RenderBody {BODY} at (8,16) size 784x177 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 247x19 - text run at (0,0) width 247: "The word \"fail\" should not appear below." - RenderBlock {DIV} at (16,36) size 240x121 [color=#FFFFFF] [bgcolor=#FFFFFF] - RenderBlock (floating) {P} at (0,0) size 40x21 [color=#000080] - RenderText {#text} at (0,0) size 40x20 - text run at (0,0) width 40: "TEST:" + RenderText {#text} at (0,0) size 262x19 + text run at (0,0) width 262: "The word \"fail\" should not appear below." + RenderBlock {DIV} at (16,36) size 240x141 [color=#FFFFFF] [bgcolor=#FFFFFF] + RenderBlock (floating) {P} at (0,0) size 43x21 [color=#000080] + RenderText {#text} at (0,0) size 43x20 + text run at (0,0) width 43: "TEST:" RenderBlock (floating) {P} at (0,20) size 240x21 [color=#00FFFF] [bgcolor=#008080] - RenderText {#text} at (100,0) size 39x20 - text run at (100,0) width 39: "PASS" - RenderText {#text} at (39,0) size 227x120 - text run at (39,0) width 186: "fail fail fail fail fail fail fail fail fail" - text run at (0,40) width 21: "fail " - text run at (21,40) width 206: "fail fail fail fail fail fail fail fail fail fail" - text run at (0,60) width 210: "fail fail fail fail fail fail fail fail fail fail " - text run at (210,60) width 17: "fail" - text run at (0,80) width 189: "fail fail fail fail fail fail fail fail fail " - text run at (189,80) width 38: "fail fail" - text run at (0,100) width 164: "fail fail fail fail fail fail fail fail" + RenderText {#text} at (101,0) size 38x20 + text run at (101,0) width 38: "PASS" + RenderText {#text} at (42,0) size 236x140 + text run at (42,0) width 189: "fail fail fail fail fail fail fail fail" + text run at (0,40) width 48: "fail fail " + text run at (48,40) width 188: "fail fail fail fail fail fail fail fail" + text run at (0,60) width 48: "fail fail " + text run at (48,60) width 188: "fail fail fail fail fail fail fail fail" + text run at (0,80) width 48: "fail fail " + text run at (48,80) width 188: "fail fail fail fail fail fail fail fail" + text run at (0,100) width 48: "fail fail " + text run at (48,100) width 188: "fail fail fail fail fail fail fail fail" + text run at (0,120) width 44: "fail fail" diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt index 4c063517f2ee..e8ae41c57629 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x264 RenderBlock {HTML} at (0,0) size 800x264 RenderBody {BODY} at (8,16) size 784x232 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 362x19 - text run at (0,0) width 362: "The word \"fail\" should not appear below, just a green block." + RenderText {#text} at (0,0) size 381x19 + text run at (0,0) width 381: "The word \"fail\" should not appear below, just a green block." RenderBlock {DIV} at (16,36) size 240x196 [color=#FFFFFF] [bgcolor=#FFFFFF] RenderImage {IMG} at (0,0) size 1x1 RenderImage {IMG} at (0,1) size 240x112 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt index a5b6c1d3ea74..03ac6f64530c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x186 RenderBlock {HTML} at (0,0) size 800x186 RenderBody {BODY} at (8,8) size 784x170 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "There should be a green box to the right. \x{2798}" + RenderText {#text} at (0,0) size 276x19 + text run at (0,0) width 276: "There should be a green box to the right. \x{2798}" RenderBlock {DIV} at (0,20) size 784x150 [bgcolor=#FFFFFF] RenderBlock (floating) {P} at (458,10) size 316x91 [color=#008000] [border: (3px solid #008000)] RenderText {#text} at (8,8) size 300x75 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltblck-01-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltblck-01-d-expected.txt index f2822c938461..468d962debe9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltblck-01-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltblck-01-d-expected.txt @@ -6,10 +6,10 @@ layer at (0,0) size 800x137 RenderBlock {DIV} at (0,0) size 784x121 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF) (96px solid #0000FF) (3px solid #0000FF)] RenderBlock (floating) {DIV} at (421,11) size 352x72 [bgcolor=#008080] RenderBlock {P} at (16,16) size 320x40 - RenderText {#text} at (0,0) size 298x39 - text run at (0,0) width 298: "This teal box should start inside the dark blue box" - text run at (0,20) width 76: "and spill out " - text run at (76,20) width 164: "onto the blue area below it." + RenderText {#text} at (0,0) size 313x39 + text run at (0,0) width 313: "This teal box should start inside the dark blue box" + text run at (0,20) width 81: "and spill out " + text run at (81,20) width 171: "onto the blue area below it." RenderBlock {P} at (3,3) size 778x22 - RenderText {#text} at (0,2) size 247x19 - text run at (0,2) width 247: "You should see a teal box to the right. \x{21E8}" + RenderText {#text} at (0,2) size 256x19 + text run at (0,2) width 256: "You should see a teal box to the right. \x{21E8}" diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt index 6e19d99126b6..4f38c8b1f2c9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltclr-00-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x711 RenderBlock {HTML} at (0,0) size 785x711 RenderBody {BODY} at (8,16) size 769x687 RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 239x19 - text run at (0,0) width 239: "There should be a big green box below." + RenderText {#text} at (0,0) size 250x19 + text run at (0,0) width 250: "There should be a big green box below." RenderBlock {DIV} at (0,36) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 50x50 RenderBlock {P} at (3,18) size 300x90 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt index b97f237196b2..05817d127d00 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt @@ -8,38 +8,40 @@ layer at (0,0) size 800x290 RenderBlock {P} at (0,0) size 294x82 RenderText {#text} at (0,0) size 294x81 text run at (0,0) width 294: "To the right of this teal box there should be a" - text run at (0,20) width 96: "purple square, " - text run at (96,20) width 198: "tightly squeezed in between the" - text run at (0,40) width 178: "edge of the teal box and the " - text run at (177,40) width 117: "outside edge of the" - text run at (0,62) width 86: "blue block. \x{21E8}" + text run at (0,20) width 94: "purple square, " + text run at (94,20) width 200: "tightly squeezed in between the" + text run at (0,40) width 194: "edge of the teal box and the " + text run at (193,40) width 101: "outside edge of" + text run at (0,62) width 112: "the blue block. \x{21E8}" RenderBlock {P} at (0,0) size 588x282 RenderText {#text} at (0,0) size 277x41 - text run at (0,0) width 277: "Inside this blue block on the right there should" - text run at (0,22) width 120: "be a teal box. \x{21E8} " + text run at (0,0) width 277: "Inside this blue block on the right there" + text run at (0,22) width 164: "should be a teal box. \x{21E8} " RenderInline {SPAN} at (0,0) size 588x259 [color=#000080] - RenderText {#text} at (120,22) size 588x259 - text run at (120,22) width 157: "FAIL FAIL FAIL FAIL" + RenderText {#text} at (163,22) size 588x259 + text run at (163,22) width 114: "FAIL FAIL FAIL" text run at (0,42) width 277: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,62) width 41: "FAIL " - text run at (40,62) width 237: "FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,82) width 238: "FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (237,82) width 351: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,102) width 119: "FAIL FAIL FAIL " - text run at (118,102) width 470: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,122) width 475: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (474,122) width 114: "FAIL FAIL FAIL" - text run at (0,142) width 357: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (356,142) width 232: "FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,162) width 238: "FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (237,162) width 351: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,182) width 119: "FAIL FAIL FAIL " - text run at (118,182) width 470: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,202) width 475: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (474,202) width 114: "FAIL FAIL FAIL" - text run at (0,222) width 357: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (356,222) width 232: "FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,242) width 238: "FAIL FAIL FAIL FAIL FAIL FAIL " - text run at (237,242) width 351: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" - text run at (0,262) width 110: "FAIL FAIL FAIL" + text run at (0,62) width 82: "FAIL FAIL " + text run at (81,62) width 196: "FAIL FAIL FAIL FAIL FAIL" + text run at (0,82) width 278: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (277,82) width 311: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,102) width 159: "FAIL FAIL FAIL FAIL " + text run at (159,102) width 429: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,122) width 41: "FAIL " + text run at (40,122) width 475: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (514,122) width 74: "FAIL FAIL" + text run at (0,142) width 396: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (396,142) width 192: "FAIL FAIL FAIL FAIL FAIL" + text run at (0,162) width 278: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (277,162) width 311: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,182) width 159: "FAIL FAIL FAIL FAIL " + text run at (159,182) width 429: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,202) width 41: "FAIL " + text run at (40,202) width 475: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (514,202) width 74: "FAIL FAIL" + text run at (0,222) width 396: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (396,222) width 192: "FAIL FAIL FAIL FAIL FAIL" + text run at (0,242) width 278: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL " + text run at (277,242) width 311: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL" + text run at (0,262) width 149: "FAIL FAIL FAIL FAIL" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-flthw-00-c-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-flthw-00-c-g-expected.txt index 73b2914152e0..2d20300e0e22 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-flthw-00-c-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-flthw-00-c-g-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x260 RenderBlock {HTML} at (0,0) size 800x260 RenderBody {BODY} at (8,16) size 784x236 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 484x19 - text run at (0,0) width 484: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below." + RenderText {#text} at (0,0) size 508x19 + text run at (0,0) width 508: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below." RenderBlock {DIV} at (0,36) size 784x200 RenderBlock (floating) {DIV} at (0,0) size 100x100 RenderBlock (floating) {DIV} at (0,100) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt index cbec288c9dba..4ad3a39e41f1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltinln-00-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x184 RenderBlock {HTML} at (0,0) size 800x184 RenderBody {BODY} at (8,16) size 784x153 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 262x19 - text run at (0,0) width 262: "There should be two boxes of green below." + RenderText {#text} at (0,0) size 273x19 + text run at (0,0) width 273: "There should be two boxes of green below." RenderBlock {DIV} at (15,36) size 96x51 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock (floating) {SPAN} at (3,3) size 45x30 RenderText {#text} at (0,0) size 30x30 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt index 354c0e149a2c..f8bfda3494b1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x621 RenderBlock {HTML} at (0,0) size 785x621 RenderBody {BODY} at (8,16) size 769x597 RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 314x19 - text run at (0,0) width 314: "There should be a tall green box below, with no red." + RenderText {#text} at (0,0) size 329x19 + text run at (0,0) width 329: "There should be a tall green box below, with no red." RenderBlock {DIV} at (0,36) size 126x561 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (18,18) size 90x45 RenderText {#text} at (0,0) size 90x45 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt index dea6dc63a593..eae0a489822b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt @@ -4,25 +4,25 @@ layer at (0,0) size 800x234 RenderBlock {HTML} at (0,0) size 800x234 RenderBody {BODY} at (8,16) size 784x208 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 618x19 - text run at (0,0) width 369: "Below you should see four blocks side by side followed by a " - text run at (369,0) width 249: "matching cross section of the four blocks." + RenderText {#text} at (0,0) size 649x19 + text run at (0,0) width 388: "Below you should see four blocks side by side followed by a " + text run at (388,0) width 261: "matching cross section of the four blocks." RenderBlock (floating) {DIV} at (0,46) size 140x132 [bgcolor=#FFFF00] [border: (20px solid #000000)] RenderBlock {P} at (40,56) size 60x20 - RenderText {#text} at (8,0) size 44x19 - text run at (8,0) width 44: "Yellow" + RenderText {#text} at (7,0) size 46x19 + text run at (7,0) width 46: "Yellow" RenderBlock (floating) {DIV} at (160,46) size 140x132 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] RenderBlock {P} at (40,56) size 60x20 - RenderText {#text} at (16,0) size 28x19 - text run at (16,0) width 28: "Blue" + RenderText {#text} at (15,0) size 30x19 + text run at (15,0) width 30: "Blue" RenderBlock (floating) {DIV} at (320,46) size 140x132 [bgcolor=#FF0000] [border: (20px solid #000000)] RenderBlock {P} at (40,56) size 60x20 RenderText {#text} at (17,0) size 26x19 text run at (17,0) width 26: "Red" RenderBlock (floating) {DIV} at (480,46) size 140x132 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] RenderBlock {P} at (40,56) size 60x20 - RenderText {#text} at (11,0) size 38x19 - text run at (11,0) width 38: "Green" + RenderText {#text} at (10,0) size 40x19 + text run at (10,0) width 40: "Green" RenderBlock {DIV} at (0,188) size 784x20 RenderTable {TABLE} at (0,0) size 620x20 RenderTableSection {TBODY} at (0,0) size 620x20 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt index ceedf6f7052f..d523fb2651ec 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt @@ -1,104 +1,104 @@ -layer at (0,0) size 785x784 +layer at (0,0) size 785x841 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x784 - RenderBlock {HTML} at (0,0) size 785x784 - RenderBody {BODY} at (8,32) size 769x720 +layer at (0,0) size 785x841 + RenderBlock {HTML} at (0,0) size 785x841 + RenderBody {BODY} at (8,32) size 769x777 RenderBlock {P} at (32,0) size 705x115 [color=#000080] - RenderText {#text} at (0,4) size 656x110 - text run at (0,4) width 656: "\x{21E9} The following blue box should be exactly half the" - text run at (0,41) width 80: "width " - text run at (80,41) width 551: "of the viewport, on the left of the 50% ruler" - text run at (0,78) width 72: "mark." + RenderText {#text} at (0,4) size 671x110 + text run at (0,4) width 671: "\x{21E9} The following blue box should be exactly half the" + text run at (0,41) width 81: "width " + text run at (81,41) width 560: "of the viewport, on the left of the 50% ruler" + text run at (0,78) width 74: "mark." RenderBlock (floating) {DIV} at (0,147) size 385x380 [color=#FFFFFF] [bgcolor=#0000FF] RenderText {#text} at (0,0) size 385x379 text run at (0,0) width 385: "ignore this float text ignore this float text ignore this" - text run at (0,20) width 43: "float " - text run at (42,20) width 343: "text ignore this float text ignore this float text" - text run at (0,40) width 78: "ignore this " - text run at (77,40) width 308: "float text ignore this float text ignore this" + text run at (0,20) width 42: "float " + text run at (41,20) width 344: "text ignore this float text ignore this float text" + text run at (0,40) width 80: "ignore this " + text run at (79,40) width 306: "float text ignore this float text ignore this" text run at (0,60) width 126: "float text ignore " text run at (125,60) width 260: "this float text ignore this float text" - text run at (0,80) width 157: "ignore this float text " - text run at (156,80) width 229: "ignore this float text ignore this" - text run at (0,100) width 198: "float text ignore this float " - text run at (197,100) width 188: "text ignore this float text" - text run at (0,120) width 234: "ignore this float text ignore this " - text run at (233,120) width 152: "float text ignore this" - text run at (0,140) width 281: "float text ignore this float text ignore " - text run at (280,140) width 105: "this float text" - text run at (0,160) width 313: "ignore this float text ignore this float text " - text run at (312,160) width 73: "ignore this" - text run at (0,180) width 354: "float text ignore this float text ignore this float " - text run at (353,180) width 32: "text" + text run at (0,80) width 156: "ignore this float text " + text run at (155,80) width 230: "ignore this float text ignore this" + text run at (0,100) width 199: "float text ignore this float " + text run at (198,100) width 187: "text ignore this float text" + text run at (0,120) width 235: "ignore this float text ignore this " + text run at (235,120) width 150: "float text ignore this" + text run at (0,140) width 283: "float text ignore this float text ignore " + text run at (282,140) width 103: "this float text" + text run at (0,160) width 312: "ignore this float text ignore this float text " + text run at (311,160) width 74: "ignore this" + text run at (0,180) width 356: "float text ignore this float text ignore this float " + text run at (355,180) width 30: "text" text run at (0,200) width 385: "ignore this float text ignore this float text ignore this" text run at (0,220) width 385: "float text ignore this float text ignore this float text" - text run at (0,240) width 47: "ignore " - text run at (46,240) width 339: "this float text ignore this float text ignore this" - text run at (0,260) width 79: "float text " - text run at (78,260) width 307: "ignore this float text ignore this float text" - text run at (0,280) width 120: "ignore this float " - text run at (119,280) width 266: "text ignore this float text ignore this" - text run at (0,300) width 156: "float text ignore this " - text run at (155,300) width 230: "float text ignore this float text" + text run at (0,240) width 49: "ignore " + text run at (48,240) width 337: "this float text ignore this float text ignore this" + text run at (0,260) width 77: "float text " + text run at (77,260) width 308: "ignore this float text ignore this float text" + text run at (0,280) width 121: "ignore this float " + text run at (120,280) width 265: "text ignore this float text ignore this" + text run at (0,300) width 157: "float text ignore this " + text run at (157,300) width 228: "float text ignore this float text" text run at (0,320) width 204: "ignore this float text ignore " text run at (203,320) width 182: "this float text ignore this" - text run at (0,340) width 235: "float text ignore this float text " + text run at (0,340) width 234: "float text ignore this float text " text run at (234,340) width 151: "ignore this float text" - text run at (0,360) width 261: "ignore this float text ignore this float" - RenderBlock {DIV} at (0,147) size 769x500 [color=#C0C0C0] - RenderText {#text} at (384,0) size 769x499 - text run at (384,0) width 385: "this is some dummy text this is some dummy text this is some" - text run at (384,20) width 51: "dummy " - text run at (434,20) width 335: "text this is some dummy text this is some dummy text" - text run at (384,40) width 79: "this is some " - text run at (462,40) width 307: "dummy text this is some dummy text this is some" - text run at (384,60) width 119: "dummy text this is " - text run at (502,60) width 267: "some dummy text this is some dummy text" - text run at (384,80) width 157: "this is some dummy text " - text run at (540,80) width 229: "this is some dummy text this is some" - text run at (384,100) width 207: "dummy text this is some dummy " - text run at (590,100) width 179: "text this is some dummy text" - text run at (384,120) width 235: "this is some dummy text this is some " - text run at (618,120) width 151: "dummy text this is some" - text run at (384,140) width 276: "dummy text this is some dummy text this is " - text run at (659,140) width 110: "some dummy text" - text run at (384,160) width 313: "this is some dummy text this is some dummy text " - text run at (696,160) width 73: "this is some" - text run at (384,180) width 363: "dummy text this is some dummy text this is some dummy " - text run at (747,180) width 22: "text" - text run at (384,200) width 385: "this is some dummy text this is some dummy text this is some" - text run at (384,220) width 385: "dummy text this is some dummy text this is some dummy text" - text run at (384,240) width 42: "this is " - text run at (425,240) width 344: "some dummy text this is some dummy text this is some" - text run at (384,260) width 79: "dummy text " - text run at (462,260) width 307: "this is some dummy text this is some dummy text" - text run at (384,280) width 129: "this is some dummy " - text run at (512,280) width 257: "text this is some dummy text this is some" - text run at (384,300) width 157: "dummy text this is some " - text run at (540,300) width 229: "dummy text this is some dummy text" - text run at (384,320) width 198: "this is some dummy text this is " - text run at (581,320) width 188: "some dummy text this is some" - text run at (384,340) width 235: "dummy text this is some dummy text " - text run at (618,340) width 151: "this is some dummy text" - text run at (384,360) width 285: "this is some dummy text this is some dummy " - text run at (668,360) width 101: "text this is some" - text run at (0,380) width 310: "dummy text this is some dummy text this is some " - text run at (309,380) width 428: "dummy text this is some dummy text this is some dummy text this is " - text run at (737,380) width 32: "some" - text run at (0,400) width 387: "dummy text this is some dummy text this is some dummy text " - text run at (387,400) width 382: "this is some dummy text this is some dummy text this is some" - text run at (0,420) width 50: "dummy " - text run at (49,420) width 416: "text this is some dummy text this is some dummy text this is some " - text run at (464,420) width 305: "dummy text this is some dummy text this is some" - text run at (0,440) width 118: "dummy text this is " - text run at (117,440) width 425: "some dummy text this is some dummy text this is some dummy text " - text run at (541,440) width 228: "this is some dummy text this is some" - text run at (0,460) width 205: "dummy text this is some dummy " - text run at (204,460) width 416: "text this is some dummy text this is some dummy text this is some " - text run at (619,460) width 150: "dummy text this is some" - text run at (0,480) width 258: "dummy text this is some dummy text this is " - text run at (258,480) width 253: "some dummy text this is some dummy text" - RenderBlock {P} at (32,679) size 705x41 [color=#000080] - RenderText {#text} at (1,4) size 704x36 - text run at (1,4) width 679: "The above gray text should flow around the blue box. " - text run at (680,4) width 25: "\x{21E7}" + text run at (0,360) width 257: "ignore this float text ignore this float" + RenderBlock {DIV} at (0,147) size 769x520 [color=#C0C0C0] + RenderText {#text} at (384,0) size 770x519 + text run at (384,0) width 385: "this is some dummy text this is some dummy text this is" + text run at (384,20) width 98: "some dummy " + text run at (481,20) width 288: "text this is some dummy text this is some" + text run at (384,40) width 169: "dummy text this is some " + text run at (552,40) width 217: "dummy text this is some dummy" + text run at (384,60) width 230: "text this is some dummy text this is " + text run at (613,60) width 156: "some dummy text this is" + text run at (384,80) width 305: "some dummy text this is some dummy text " + text run at (688,80) width 81: "this is some" + text run at (384,100) width 385: "dummy text this is some dummy text this is some dummy" + text run at (384,120) width 385: "text this is some dummy text this is some dummy text this is" + text run at (384,140) width 42: "some " + text run at (425,140) width 344: "dummy text this is some dummy text this is some" + text run at (384,160) width 130: "dummy text this is " + text run at (513,160) width 256: "some dummy text this is some dummy" + text run at (384,180) width 189: "text this is some dummy text " + text run at (572,180) width 197: "this is some dummy text this is" + text run at (384,200) width 274: "some dummy text this is some dummy " + text run at (657,200) width 112: "text this is some" + text run at (384,220) width 337: "dummy text this is some dummy text this is some " + text run at (721,220) width 48: "dummy" + text run at (384,240) width 385: "text this is some dummy text this is some dummy text this is" + text run at (384,260) width 385: "some dummy text this is some dummy text this is some" + text run at (384,280) width 85: "dummy text " + text run at (468,280) width 301: "this is some dummy text this is some dummy" + text run at (384,300) width 161: "text this is some dummy " + text run at (544,300) width 225: "text this is some dummy text this is" + text run at (384,320) width 218: "some dummy text this is some " + text run at (601,320) width 168: "dummy text this is some" + text run at (384,340) width 298: "dummy text this is some dummy text this is " + text run at (681,340) width 88: "some dummy" + text run at (384,360) width 349: "text this is some dummy text this is some dummy text " + text run at (732,360) width 38: "this is" + text run at (0,380) width 405: "some dummy text this is some dummy text this is some dummy " + text run at (404,380) width 365: "text this is some dummy text this is some dummy text this" + text run at (0,400) width 53: "is some " + text run at (52,400) width 444: "dummy text this is some dummy text this is some dummy text this is " + text run at (495,400) width 274: "some dummy text this is some dummy text" + text run at (0,420) width 161: "this is some dummy text " + text run at (160,420) width 454: "this is some dummy text this is some dummy text this is some dummy " + text run at (613,420) width 156: "text this is some dummy" + text run at (0,440) width 278: "text this is some dummy text this is some " + text run at (277,440) width 459: "dummy text this is some dummy text this is some dummy text this is " + text run at (736,440) width 33: "some" + text run at (0,460) width 407: "dummy text this is some dummy text this is some dummy text " + text run at (406,460) width 363: "this is some dummy text this is some dummy text this is" + text run at (0,480) width 90: "some dummy " + text run at (89,480) width 421: "text this is some dummy text this is some dummy text this is some " + text run at (509,480) width 260: "dummy text this is some dummy text this" + text run at (0,500) width 170: "is some dummy text this is " + text run at (170,500) width 268: "some dummy text this is some dummy text" + RenderBlock {P} at (32,699) size 705x78 [color=#000080] + RenderText {#text} at (19,0) size 686x77 + text run at (19,0) width 686: "The above gray text should flow around the blue box." + text run at (680,41) width 25: "\x{21E7}" diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-01-c-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-01-c-g-expected.txt index 665b00e9287b..6124fcfae0ce 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-01-c-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-01-c-g-expected.txt @@ -5,7 +5,7 @@ layer at (0,0) size 800x54 RenderBody {BODY} at (8,8) size 784x38 RenderBlock {DIV} at (0,0) size 784x38 RenderBlock (floating) {P} at (0,0) size 784x23 - RenderText {#text} at (0,0) size 368x22 - text run at (0,0) width 368: "There should be a green block on the next line:" + RenderText {#text} at (0,0) size 381x22 + text run at (0,0) width 381: "There should be a green block on the next line:" RenderImage {IMG} at (0,23) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt index 396b7f802ba0..1f5b43779124 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt @@ -5,8 +5,8 @@ layer at (0,0) size 800x56 RenderBody {BODY} at (8,8) size 784x17 RenderBlock {DIV} at (0,0) size 784x17 RenderBlock (floating) {P} at (0,0) size 392x48 - RenderText {#text} at (0,0) size 340x47 - text run at (0,0) width 340: "There should be a green square to the right," - text run at (0,25) width 300: "roughly in the middle, horizontally. \x{21E8}" + RenderText {#text} at (0,0) size 352x47 + text run at (0,0) width 352: "There should be a green square to the right," + text run at (0,25) width 313: "roughly in the middle, horizontally. \x{21E8}" RenderImage {IMG} at (392,0) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt index 615551c7f652..c458f17ae1e6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt @@ -7,9 +7,9 @@ layer at (0,0) size 800x50 RenderBlock {DIV} at (0,0) size 784x20 RenderBlock (floating) {P} at (392,0) size 392x42 RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000] - RenderText {#text} at (15,2) size 348x39 + RenderText {#text} at (15,2) size 361x39 text run at (15,2) width 4: " " - text run at (19,2) width 329: "\x{21E6} There should be a green square at the top left of the" - text run at (0,22) width 52: "window." + text run at (19,2) width 342: "\x{21E6} There should be a green square at the top left of the" + text run at (0,22) width 55: "window." RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000] RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwrap-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwrap-00-b-expected.txt index b514f2ba61b6..b2a2d30abd9e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwrap-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5525-fltwrap-00-b-expected.txt @@ -5,24 +5,24 @@ layer at (0,0) size 800x311 RenderBody {BODY} at (8,8) size 784x295 RenderBlock (floating) {DIV} at (0,0) size 196x290 [color=#FFFFFF] [bgcolor=#000080] RenderBlock {P} at (0,0) size 196x290 - RenderText {#text} at (0,6) size 182x283 - text run at (0,6) width 140: "\x{21E6} This" - text run at (0,63) width 164: "blue box" - text run at (0,120) width 182: "should be" - text run at (0,177) width 115: "on the" - text run at (0,234) width 73: "left." + RenderText {#text} at (0,6) size 185x283 + text run at (0,6) width 142: "\x{21E6} This" + text run at (0,63) width 166: "blue box" + text run at (0,120) width 185: "should be" + text run at (0,177) width 118: "on the" + text run at (0,234) width 75: "left." RenderBlock (floating) {DIV} at (588,0) size 196x290 [color=#FFFFFF] [bgcolor=#008080] RenderBlock {P} at (0,0) size 196x290 - RenderText {#text} at (0,1) size 182x288 - text run at (0,1) width 162: "This teal" - text run at (0,58) width 71: "box" - text run at (0,115) width 182: "should be" - text run at (0,172) width 115: "on the" - text run at (0,234) width 157: "right. \x{21E8}" + RenderText {#text} at (0,1) size 185x288 + text run at (0,1) width 165: "This teal" + text run at (0,58) width 72: "box" + text run at (0,115) width 185: "should be" + text run at (0,172) width 118: "on the" + text run at (0,234) width 159: "right. \x{21E8}" RenderBlock {P} at (0,0) size 784x295 - RenderText {#text} at (196,1) size 390x293 - text run at (196,1) width 360: "This text should be" - text run at (196,58) width 331: "in between a blue" - text run at (196,120) width 316: "box on the \x{21E6}left" - text run at (196,177) width 390: "and a teal box on the" - text run at (196,239) width 145: "right\x{21E8}." + RenderText {#text} at (196,1) size 365x293 + text run at (196,1) width 365: "This text should be" + text run at (196,58) width 335: "in between a blue" + text run at (196,120) width 322: "box on the \x{21E6}left" + text run at (196,177) width 326: "and a teal box on" + text run at (196,239) width 217: "the right\x{21E8}." diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt index 6e19d99126b6..4f38c8b1f2c9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5526-fltclr-00-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 785x711 RenderBlock {HTML} at (0,0) size 785x711 RenderBody {BODY} at (8,16) size 769x687 RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 239x19 - text run at (0,0) width 239: "There should be a big green box below." + RenderText {#text} at (0,0) size 250x19 + text run at (0,0) width 250: "There should be a big green box below." RenderBlock {DIV} at (0,36) size 306x651 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderImage {IMG} at (3,3) size 50x50 RenderBlock {P} at (3,18) size 300x90 diff --git a/LayoutTests/platform/wincairo/css2.1/t0905-c5526-flthw-00-c-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t0905-c5526-flthw-00-c-g-expected.txt index 73b2914152e0..2d20300e0e22 100644 --- a/LayoutTests/platform/wincairo/css2.1/t0905-c5526-flthw-00-c-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t0905-c5526-flthw-00-c-g-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x260 RenderBlock {HTML} at (0,0) size 800x260 RenderBody {BODY} at (8,16) size 784x236 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 484x19 - text run at (0,0) width 484: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below." + RenderText {#text} at (0,0) size 508x19 + text run at (0,0) width 508: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below." RenderBlock {DIV} at (0,36) size 784x200 RenderBlock (floating) {DIV} at (0,0) size 100x100 RenderBlock (floating) {DIV} at (0,100) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-00-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-00-d-expected.txt index 64604335d6ec..deab8259049e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-00-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-00-d-expected.txt @@ -1,28 +1,30 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x164 - RenderBlock {HTML} at (0,0) size 800x164 - RenderBody {BODY} at (8,16) size 784x132 +layer at (0,0) size 800x184 + RenderBlock {HTML} at (0,0) size 800x184 + RenderBody {BODY} at (8,16) size 784x152 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 561x19 - text run at (0,0) width 352: "In the following test, the teal blocks must be just inside the " - text run at (352,0) width 209: "top and sides of the blue rectangle." - RenderBlock {DIV} at (0,36) size 784x96 - RenderBlock {DIV} at (16,0) size 752x96 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)] + RenderText {#text} at (0,0) size 589x19 + text run at (0,0) width 371: "In the following test, the teal blocks must be just inside the " + text run at (371,0) width 218: "top and sides of the blue rectangle." + RenderBlock {DIV} at (0,36) size 784x116 + RenderBlock {DIV} at (16,0) size 752x116 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)] RenderBlock (floating) {P} at (8,8) size 176x96 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)] - RenderText {#text} at (8,8) size 140x79 - text run at (8,8) width 140: "Teal block. Teal block." - text run at (8,28) width 140: "Teal block. Teal block." - text run at (8,48) width 140: "Teal block. Teal block." - text run at (8,68) width 140: "Teal block. Teal block." + RenderText {#text} at (8,8) size 144x79 + text run at (8,8) width 144: "Teal block. Teal block." + text run at (8,28) width 144: "Teal block. Teal block." + text run at (8,48) width 144: "Teal block. Teal block." + text run at (8,68) width 144: "Teal block. Teal block." RenderBlock (floating) {P} at (568,8) size 176x96 [color=#00FFFF] [bgcolor=#008080] [border: (4px solid #00FFFF)] - RenderText {#text} at (8,8) size 140x79 - text run at (8,8) width 140: "Teal block. Teal block." - text run at (8,28) width 140: "Teal block. Teal block." - text run at (8,48) width 140: "Teal block. Teal block." - text run at (8,68) width 140: "Teal block. Teal block." - RenderText {#text} at (184,8) size 368x79 - text run at (184,8) width 368: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." - text run at (184,28) width 368: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." - text run at (184,48) width 368: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." - text run at (184,68) width 368: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + RenderText {#text} at (8,8) size 144x79 + text run at (8,8) width 144: "Teal block. Teal block." + text run at (8,28) width 144: "Teal block. Teal block." + text run at (8,48) width 144: "Teal block. Teal block." + text run at (8,68) width 144: "Teal block. Teal block." + RenderText {#text} at (184,8) size 358x99 + text run at (184,8) width 327: "Blue rectangle. Blue rectangle. Blue rectangle. Blue" + text run at (184,28) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (184,48) width 99: "Blue rectangle. " + text run at (283,48) width 228: "Blue rectangle. Blue rectangle. Blue" + text run at (184,68) width 358: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (184,88) width 194: "Blue rectangle. Blue rectangle." diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-01-b-expected.txt index 786c5d7f9493..c481536f887c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-01-b-expected.txt @@ -4,20 +4,20 @@ layer at (0,0) size 800x144 RenderBlock {HTML} at (0,0) size 800x144 RenderBody {BODY} at (8,16) size 784x112 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 513x19 - text run at (0,0) width 513: "In the following test, the blue blocks should be on the given sides of the teal rectangle." + RenderText {#text} at (0,0) size 542x19 + text run at (0,0) width 542: "In the following test, the blue blocks should be on the given sides of the teal rectangle." RenderBlock {DIV} at (0,36) size 784x76 RenderBlock {DIV} at (16,0) size 752x76 [color=#00FFFF] [bgcolor=#008080] RenderBlock (floating) {P} at (8,8) size 176x58 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)] - RenderText {#text} at (8,10) size 154x39 - text run at (8,10) width 154: "\x{21E6} This blue block should" - text run at (8,30) width 82: "be on the left." + RenderText {#text} at (8,10) size 132x39 + text run at (8,10) width 117: "\x{21E6} This blue block" + text run at (8,30) width 132: "should be on the left." RenderBlock (floating) {P} at (568,8) size 176x58 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)] - RenderText {#text} at (8,10) size 154x39 - text run at (8,10) width 154: "\x{21E8} This blue block should" - text run at (8,30) width 90: "be on the right." - RenderText {#text} at (184,8) size 364x59 - text run at (184,8) width 364: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle." - text run at (184,28) width 184: "Teal rectangle. Teal rectangle. " - text run at (368,28) width 180: "Teal rectangle. Teal rectangle." - text run at (184,48) width 364: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle." + RenderText {#text} at (8,10) size 141x39 + text run at (8,10) width 117: "\x{21E8} This blue block" + text run at (8,30) width 141: "should be on the right." + RenderText {#text} at (184,8) size 380x59 + text run at (184,8) width 380: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle." + text run at (184,28) width 192: "Teal rectangle. Teal rectangle. " + text run at (376,28) width 188: "Teal rectangle. Teal rectangle." + text run at (184,48) width 380: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle." diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-02-d-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-02-d-g-expected.txt index ba28c296d2ce..6a733a9d1bf9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-02-d-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-02-d-g-expected.txt @@ -4,16 +4,15 @@ layer at (0,0) size 800x220 RenderBlock {HTML} at (0,0) size 800x220 RenderBody {BODY} at (8,16) size 784x132 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 567x19 - text run at (0,0) width 358: "In the following test, the teal squares must be just inside the " - text run at (358,0) width 209: "top and sides of the blue rectangle." + RenderText {#text} at (0,0) size 595x19 + text run at (0,0) width 377: "In the following test, the teal squares must be just inside the " + text run at (377,0) width 218: "top and sides of the blue rectangle." RenderBlock {DIV} at (0,36) size 784x96 RenderBlock {DIV} at (16,0) size 752x96 [color=#0000FF] [bgcolor=#000080] [border: (8px solid #0000FF) none (8px solid #0000FF)] RenderImage {IMG} at (8,8) size 160x160 [color=#FFFF00] [bgcolor=#FF0000] RenderImage {IMG} at (584,8) size 160x160 [color=#FFFF00] [bgcolor=#FF0000] - RenderText {#text} at (168,8) size 399x79 - text run at (168,8) width 399: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle. Blue" - text run at (168,28) width 341: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle. " - text run at (509,28) width 27: "Blue" - text run at (168,48) width 368: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle. Blue" - text run at (168,68) width 337: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + RenderText {#text} at (168,8) size 392x79 + text run at (168,8) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (168,28) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (168,48) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (168,68) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-03-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-03-b-g-expected.txt index 6249e8131c0d..90db7746eba8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-03-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-03-b-g-expected.txt @@ -1,25 +1,25 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x222 - RenderBlock {HTML} at (0,0) size 800x222 - RenderBody {BODY} at (8,16) size 784x114 - RenderBlock {P} at (0,0) size 784x22 [color=#000080] - RenderText {#text} at (0,2) size 378x19 - text run at (0,2) width 233: "In the following test, the purple square " - text run at (233,2) width 145: "should be on the left (\x{21E6}" - RenderImage {IMG} at (378,2) size 20x20 - RenderText {#text} at (397,2) size 207x19 - text run at (397,2) width 207: "), and the teal square on the right (" - RenderImage {IMG} at (603,2) size 20x20 - RenderText {#text} at (622,2) size 150x19 - text run at (622,2) width 92: "\x{21E8}) of the blue " - text run at (713,2) width 59: "rectangle." - RenderBlock {DIV} at (0,38) size 784x76 +layer at (0,0) size 800x242 + RenderBlock {HTML} at (0,0) size 800x242 + RenderBody {BODY} at (8,16) size 784x134 + RenderBlock {P} at (0,0) size 784x42 [color=#000080] + RenderText {#text} at (0,2) size 398x19 + text run at (0,2) width 246: "In the following test, the purple square " + text run at (246,2) width 152: "should be on the left (\x{21E6}" + RenderImage {IMG} at (398,2) size 20x20 + RenderText {#text} at (417,2) size 216x19 + text run at (417,2) width 216: "), and the teal square on the right (" + RenderImage {IMG} at (632,2) size 20x20 + RenderText {#text} at (651,2) size 743x39 + text run at (651,2) width 92: "\x{21E8}) of the blue" + text run at (0,22) width 61: "rectangle." + RenderBlock {DIV} at (0,58) size 784x76 RenderBlock {DIV} at (16,0) size 752x76 [color=#0000FF] [bgcolor=#000080] RenderImage {IMG} at (8,8) size 160x160 RenderImage {IMG} at (584,8) size 160x160 - RenderText {#text} at (168,8) size 399x59 - text run at (168,8) width 399: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle. Blue" - text run at (168,28) width 155: "rectangle. Blue rectangle. " - text run at (323,28) width 213: "Blue rectangle. Blue rectangle. Blue" - text run at (168,48) width 337: "rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + RenderText {#text} at (168,8) size 392x59 + text run at (168,8) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." + text run at (168,28) width 198: "Blue rectangle. Blue rectangle. " + text run at (366,28) width 194: "Blue rectangle. Blue rectangle." + text run at (168,48) width 392: "Blue rectangle. Blue rectangle. Blue rectangle. Blue rectangle." diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-00-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-00-d-expected.txt index b96262168d48..04b68ef17e9d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-00-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-00-d-expected.txt @@ -1,68 +1,71 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x470 - RenderBlock {HTML} at (0,0) size 800x470 - RenderBody {BODY} at (8,16) size 784x438 +layer at (0,0) size 800x490 + RenderBlock {HTML} at (0,0) size 800x490 + RenderBody {BODY} at (8,16) size 784x458 RenderBlock {P} at (0,0) size 784x60 [color=#000080] - RenderText {#text} at (0,0) size 770x59 - text run at (0,0) width 386: "The big coloured boxes should be level with the top of the small " - text run at (386,0) width 363: "coloured boxes of the same color (unless there is not enough" - text run at (0,20) width 36: "room " - text run at (36,20) width 376: "for the big box to fit on the small box's line after the small box, " - text run at (412,20) width 358: "in which case the big box should be level with the bottom of" - text run at (0,40) width 22: "the " - text run at (22,40) width 131: "respective small box)." - RenderBlock {DIV} at (16,76) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)] - RenderText {#text} at (171,21) size 444x19 - text run at (171,21) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + RenderText {#text} at (0,0) size 778x59 + text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small " + text run at (408,0) width 329: "coloured boxes of the same color (unless there is not" + text run at (0,20) width 88: "enough room " + text run at (88,20) width 398: "for the big box to fit on the small box's line after the small box, " + text run at (486,20) width 292: "in which case the big box should be level with" + text run at (0,40) width 111: "the bottom of the " + text run at (111,40) width 137: "respective small box)." + RenderBlock {DIV} at (16,76) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)] + RenderText {#text} at (171,21) size 474x19 + text run at (171,21) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (618,21) size 11x19 - text run at (618,21) width 11: "A" - RenderText {#text} at (632,21) size 4x19 - text run at (632,21) width 4: " " + RenderText {#text} at (648,21) size 11x19 + text run at (648,21) width 11: "A" + RenderText {#text} at (662,21) size 4x19 + text run at (662,21) width 4: " " RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (19,19) size 44x19 - text run at (19,19) width 44: "AAAA" - RenderText {#text} at (636,21) size 535x39 - text run at (636,21) width 70: "dummy text" - text run at (171,41) width 370: "dummy text dummy text dummy text dummy text dummy text " + RenderText {#text} at (19,19) size 48x19 + text run at (19,19) width 48: "AAAA" + RenderText {#text} at (666,21) size 543x39 + text run at (666,21) width 48: "dummy" + text run at (171,41) width 422: "text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 16x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (544,41) size 10x19 - text run at (544,41) width 10: "B" - RenderText {#text} at (0,0) size 0x0 - RenderBlock (floating) {P} at (581,41) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (19,19) size 40x19 - text run at (19,19) width 40: "BBBB" - RenderText {#text} at (171,61) size 710x279 - text run at (171,61) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,81) width 74: "dummy text " - text run at (95,81) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (21,101) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (465,101) width 266: "dummy text dummy text dummy text dummy" - text run at (21,121) width 174: "text dummy text dummy text " - text run at (195,121) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (639,121) width 70: "dummy text" - text run at (21,141) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (391,141) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (21,161) width 100: "text dummy text " - text run at (121,161) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (565,161) width 144: "dummy text dummy text" - text run at (21,181) width 296: "dummy text dummy text dummy text dummy text " - text run at (317,181) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (21,201) width 26: "text " - text run at (47,201) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (491,201) width 218: "dummy text dummy text dummy text" - text run at (21,221) width 222: "dummy text dummy text dummy text " - text run at (243,221) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (687,221) width 44: "dummy" - text run at (21,241) width 396: "text dummy text dummy text dummy text dummy text dummy text " - text run at (417,241) width 292: "dummy text dummy text dummy text dummy text" - text run at (21,261) width 148: "dummy text dummy text " - text run at (169,261) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (613,261) width 118: "dummy text dummy" - text run at (21,281) width 322: "text dummy text dummy text dummy text dummy text " - text run at (343,281) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,301) width 74: "dummy text " - text run at (95,301) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (539,301) width 192: "dummy text dummy text dummy" - text run at (21,321) width 244: "text dummy text dummy text dummy text" + RenderText {#text} at (596,41) size 10x19 + text run at (596,41) width 10: "B" + RenderText {#text} at (609,41) size 4x19 + text run at (609,41) width 4: " " + RenderBlock (floating) {P} at (581,61) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] + RenderText {#text} at (19,19) size 44x19 + text run at (19,19) width 44: "BBBB" + RenderText {#text} at (613,41) size 707x319 + text run at (613,41) width 75: "dummy text" + text run at (171,61) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,81) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (495,81) width 75: "dummy text" + text run at (21,101) width 395: "dummy text dummy text dummy text dummy text dummy text " + text run at (416,101) width 154: "dummy text dummy text" + text run at (21,121) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,121) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,141) width 79: "dummy text " + text run at (100,141) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (574,141) width 154: "dummy text dummy text" + text run at (21,161) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,161) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,181) width 79: "dummy text " + text run at (100,181) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (574,181) width 154: "dummy text dummy text" + text run at (21,201) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,201) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,221) width 79: "dummy text " + text run at (100,221) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (574,221) width 154: "dummy text dummy text" + text run at (21,241) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,241) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,261) width 79: "dummy text " + text run at (100,261) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (574,261) width 154: "dummy text dummy text" + text run at (21,281) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,281) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,301) width 79: "dummy text " + text run at (100,301) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (574,301) width 154: "dummy text dummy text" + text run at (21,321) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,321) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,341) width 75: "dummy text" diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt index 79ce1dd36653..0349d14db006 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt @@ -1,64 +1,67 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x470 - RenderBlock {HTML} at (0,0) size 800x470 - RenderBody {BODY} at (8,16) size 784x438 +layer at (0,0) size 800x490 + RenderBlock {HTML} at (0,0) size 800x490 + RenderBody {BODY} at (8,16) size 784x458 RenderBlock {P} at (0,0) size 784x60 [color=#000080] - RenderText {#text} at (0,0) size 777x59 - text run at (0,0) width 386: "The big coloured boxes should be level with the top of the small " - text run at (386,0) width 363: "coloured boxes of the same color (unless there is not enough" - text run at (0,20) width 36: "room " - text run at (36,20) width 368: "for the big box to fit on the small box's line, in which case the " - text run at (404,20) width 373: "big box should be level with the bottom of the respective small" - text run at (0,40) width 32: "box)." - RenderBlock {DIV} at (16,76) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)] - RenderText {#text} at (133,21) size 444x19 - text run at (133,21) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " + RenderText {#text} at (0,0) size 769x59 + text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small " + text run at (408,0) width 329: "coloured boxes of the same color (unless there is not" + text run at (0,20) width 88: "enough room " + text run at (88,20) width 391: "for the big box to fit on the small box's line, in which case the " + text run at (479,20) width 290: "big box should be level with the bottom of the" + text run at (0,40) width 104: "respective small " + text run at (104,40) width 33: "box)." + RenderBlock {DIV} at (16,76) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)] + RenderText {#text} at (133,21) size 474x19 + text run at (133,21) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 21x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (580,21) size 15x19 - text run at (580,21) width 15: "\x{21E6}" - RenderText {#text} at (598,21) size 4x19 - text run at (598,21) width 4: " " + RenderText {#text} at (610,21) size 15x19 + text run at (610,21) width 15: "\x{21E6}" + RenderText {#text} at (628,21) size 4x19 + text run at (628,21) width 4: " " RenderImage {IMG} at (21,21) size 112x112 [color=#FF0000] - RenderText {#text} at (602,21) size 587x39 - text run at (602,21) width 118: "dummy text dummy" - text run at (133,41) width 322: "text dummy text dummy text dummy text dummy text " + RenderText {#text} at (632,21) size 574x39 + text run at (632,21) width 75: "dummy text" + text run at (133,41) width 395: "dummy text dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 21x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (458,41) size 15x19 - text run at (458,41) width 15: "\x{21E8}" - RenderText {#text} at (476,41) size 4x19 - text run at (476,41) width 4: " " + RenderText {#text} at (531,41) size 15x19 + text run at (531,41) width 15: "\x{21E8}" + RenderText {#text} at (549,41) size 4x19 + text run at (549,41) width 4: " " RenderImage {IMG} at (619,41) size 112x112 [color=#FF0000] - RenderText {#text} at (480,41) size 710x299 - text run at (480,41) width 118: "dummy text dummy" - text run at (133,61) width 322: "text dummy text dummy text dummy text dummy text " - text run at (455,61) width 144: "dummy text dummy text" - text run at (133,81) width 296: "dummy text dummy text dummy text dummy text " - text run at (429,81) width 144: "dummy text dummy text" - text run at (133,101) width 296: "dummy text dummy text dummy text dummy text " - text run at (429,101) width 144: "dummy text dummy text" - text run at (133,121) width 296: "dummy text dummy text dummy text dummy text " - text run at (429,121) width 144: "dummy text dummy text" - text run at (21,141) width 296: "dummy text dummy text dummy text dummy text " - text run at (317,141) width 292: "dummy text dummy text dummy text dummy text" - text run at (21,161) width 148: "dummy text dummy text " - text run at (169,161) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (613,161) width 118: "dummy text dummy" - text run at (21,181) width 322: "text dummy text dummy text dummy text dummy text " - text run at (343,181) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,201) width 74: "dummy text " - text run at (95,201) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (539,201) width 192: "dummy text dummy text dummy" - text run at (21,221) width 248: "text dummy text dummy text dummy text " - text run at (269,221) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (21,241) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (465,241) width 266: "dummy text dummy text dummy text dummy" - text run at (21,261) width 174: "text dummy text dummy text " - text run at (195,261) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (639,261) width 70: "dummy text" - text run at (21,281) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (391,281) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (21,301) width 100: "text dummy text " - text run at (121,301) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (565,301) width 144: "dummy text dummy text" - text run at (21,321) width 292: "dummy text dummy text dummy text dummy text" + RenderText {#text} at (553,41) size 707x319 + text run at (553,41) width 48: "dummy" + text run at (133,61) width 422: "text dummy text dummy text dummy text dummy text dummy text " + text run at (555,61) width 48: "dummy" + text run at (133,81) width 422: "text dummy text dummy text dummy text dummy text dummy text " + text run at (555,81) width 48: "dummy" + text run at (133,101) width 422: "text dummy text dummy text dummy text dummy text dummy text " + text run at (555,101) width 48: "dummy" + text run at (133,121) width 422: "text dummy text dummy text dummy text dummy text dummy text " + text run at (555,121) width 48: "dummy" + text run at (21,141) width 422: "text dummy text dummy text dummy text dummy text dummy text " + text run at (443,141) width 154: "dummy text dummy text" + text run at (21,161) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,161) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,181) width 79: "dummy text " + text run at (100,181) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (574,181) width 154: "dummy text dummy text" + text run at (21,201) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,201) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,221) width 79: "dummy text " + text run at (100,221) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (574,221) width 154: "dummy text dummy text" + text run at (21,241) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,241) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,261) width 79: "dummy text " + text run at (100,261) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (574,261) width 154: "dummy text dummy text" + text run at (21,281) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,281) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,301) width 79: "dummy text " + text run at (100,301) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (574,301) width 154: "dummy text dummy text" + text run at (21,321) width 316: "dummy text dummy text dummy text dummy text " + text run at (337,321) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (21,341) width 75: "dummy text" diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-02-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-02-d-expected.txt index f2e5e2851fbe..f1522c1270a7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-02-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-02-d-expected.txt @@ -1,92 +1,83 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x530 - RenderBlock {HTML} at (0,0) size 800x530 - RenderBody {BODY} at (8,16) size 784x498 +layer at (0,0) size 800x550 + RenderBlock {HTML} at (0,0) size 800x550 + RenderBody {BODY} at (8,16) size 784x518 RenderBlock {P} at (0,0) size 784x60 [color=#000080] - RenderText {#text} at (0,0) size 781x59 - text run at (0,0) width 386: "The big coloured boxes should be level with the top of the small " - text run at (386,0) width 363: "coloured boxes of the same color (unless there is not enough" - text run at (0,20) width 36: "room " - text run at (36,20) width 376: "for the big box to fit on the small box's line after the small box, " - text run at (412,20) width 369: "in which case the big box should be as high as possible below" - text run at (0,40) width 22: "the " - text run at (22,40) width 66: "small box)." - RenderBlock {DIV} at (16,76) size 752x422 [color=#C0C0C0] [border: (5px solid #800080)] - RenderText {#text} at (171,21) size 518x19 - text run at (171,21) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (615,21) width 74: "dummy text " + RenderText {#text} at (0,0) size 778x59 + text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small " + text run at (408,0) width 329: "coloured boxes of the same color (unless there is not" + text run at (0,20) width 88: "enough room " + text run at (88,20) width 398: "for the big box to fit on the small box's line after the small box, " + text run at (486,20) width 292: "in which case the big box should be as high as" + text run at (0,40) width 121: "possible below the " + text run at (121,40) width 70: "small box)." + RenderBlock {DIV} at (16,76) size 752x442 [color=#C0C0C0] [border: (5px solid #800080)] + RenderText {#text} at (21,21) size 553x19 + text run at (21,21) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (495,21) width 79: "dummy text " RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (692,21) size 11x19 - text run at (692,21) width 11: "A" + RenderText {#text} at (577,21) size 11x19 + text run at (577,21) width 11: "A" + RenderText {#text} at (591,21) size 4x19 + text run at (591,21) width 4: " " + RenderBlock (floating) {P} at (21,41) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] + RenderText {#text} at (19,19) size 48x19 + text run at (19,19) width 48: "AAAA" + RenderText {#text} at (595,21) size 551x39 + text run at (595,21) width 127: "dummy text dummy" + text run at (171,41) width 343: "text dummy text dummy text dummy text dummy text " + RenderInline {SPAN} at (0,0) size 16x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] + RenderText {#text} at (517,41) size 10x19 + text run at (517,41) width 10: "B" RenderText {#text} at (0,0) size 0x0 - RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] + RenderBlock (floating) {P} at (581,41) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] RenderText {#text} at (19,19) size 44x19 - text run at (19,19) width 44: "AAAA" - RenderText {#text} at (171,41) size 444x19 - text run at (171,41) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - RenderInline {SPAN} at (0,0) size 16x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (618,41) size 10x19 - text run at (618,41) width 10: "B" - RenderText {#text} at (631,41) size 4x19 - text run at (631,41) width 4: " " - RenderBlock (floating) {P} at (581,61) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (19,19) size 40x19 - text run at (19,19) width 40: "BBBB" - RenderText {#text} at (635,41) size 384x39 - text run at (635,41) width 70: "dummy text" - text run at (321,61) width 148: "dummy text dummy text " + text run at (19,19) width 44: "BBBB" + RenderText {#text} at (321,61) size 237x19 + text run at (321,61) width 237: "dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)] - RenderText {#text} at (472,61) size 11x19 - text run at (472,61) width 11: "C" - RenderText {#text} at (486,61) size 4x19 - text run at (486,61) width 4: " " + RenderText {#text} at (561,61) size 11x19 + text run at (561,61) width 11: "C" + RenderText {#text} at (0,0) size 0x0 RenderBlock (floating) {P} at (171,61) size 150x58 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)] RenderText {#text} at (19,19) size 44x19 text run at (19,19) width 44: "CCCC" - RenderText {#text} at (490,61) size 239x59 - text run at (490,61) width 70: "dummy text" - text run at (321,81) width 218: "dummy text dummy text dummy text" - text run at (321,101) width 148: "dummy text dummy text " + RenderText {#text} at (321,81) size 387x39 + text run at (321,81) width 233: "dummy text dummy text dummy text" + text run at (471,101) width 237: "dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)] - RenderText {#text} at (472,101) size 11x19 - text run at (472,101) width 11: "D" - RenderText {#text} at (486,101) size 4x19 - text run at (486,101) width 4: " " - RenderBlock (floating) {P} at (21,121) size 150x58 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)] - RenderText {#text} at (19,19) size 44x19 - text run at (19,19) width 44: "DDDD" - RenderText {#text} at (490,101) size 710x299 - text run at (490,101) width 70: "dummy text" - text run at (171,121) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (541,121) width 144: "dummy text dummy text" - text run at (171,141) width 296: "dummy text dummy text dummy text dummy text " - text run at (467,141) width 218: "dummy text dummy text dummy text" - text run at (171,161) width 222: "dummy text dummy text dummy text " - text run at (393,161) width 292: "dummy text dummy text dummy text dummy text" - text run at (21,181) width 148: "dummy text dummy text " - text run at (169,181) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (613,181) width 118: "dummy text dummy" - text run at (21,201) width 322: "text dummy text dummy text dummy text dummy text " - text run at (343,201) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,221) width 74: "dummy text " - text run at (95,221) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (539,221) width 192: "dummy text dummy text dummy" - text run at (21,241) width 248: "text dummy text dummy text dummy text " - text run at (269,241) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (21,261) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (465,261) width 266: "dummy text dummy text dummy text dummy" - text run at (21,281) width 174: "text dummy text dummy text " - text run at (195,281) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (639,281) width 70: "dummy text" - text run at (21,301) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (391,301) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (21,321) width 100: "text dummy text " - text run at (121,321) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (565,321) width 144: "dummy text dummy text" - text run at (21,341) width 296: "dummy text dummy text dummy text dummy text " - text run at (317,341) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (21,361) width 26: "text " - text run at (47,361) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (491,361) width 218: "dummy text dummy text dummy text" - text run at (21,381) width 218: "dummy text dummy text dummy text" + RenderText {#text} at (711,101) size 11x19 + text run at (711,101) width 11: "D" + RenderText {#text} at (0,0) size 0x0 + RenderBlock (floating) {P} at (321,101) size 150x58 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)] + RenderText {#text} at (19,19) size 48x19 + text run at (19,19) width 48: "DDDD" + RenderText {#text} at (471,121) size 707x299 + text run at (471,121) width 233: "dummy text dummy text dummy text" + text run at (471,141) width 233: "dummy text dummy text dummy text" + text run at (21,161) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (495,161) width 233: "dummy text dummy text dummy text" + text run at (21,181) width 237: "dummy text dummy text dummy text " + text run at (258,181) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,201) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (495,201) width 233: "dummy text dummy text dummy text" + text run at (21,221) width 237: "dummy text dummy text dummy text " + text run at (258,221) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,241) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (495,241) width 233: "dummy text dummy text dummy text" + text run at (21,261) width 237: "dummy text dummy text dummy text " + text run at (258,261) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,281) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (495,281) width 233: "dummy text dummy text dummy text" + text run at (21,301) width 237: "dummy text dummy text dummy text " + text run at (258,301) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,321) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (495,321) width 233: "dummy text dummy text dummy text" + text run at (21,341) width 237: "dummy text dummy text dummy text " + text run at (258,341) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,361) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (495,361) width 233: "dummy text dummy text dummy text" + text run at (21,381) width 237: "dummy text dummy text dummy text " + text run at (258,381) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" + text run at (21,401) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text" diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-03-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-03-d-expected.txt index c38ce3b20533..4a53c9ce5fcf 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-03-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c414-flt-ln-03-d-expected.txt @@ -1,67 +1,70 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x450 - RenderBlock {HTML} at (0,0) size 800x450 - RenderBody {BODY} at (8,16) size 784x418 +layer at (0,0) size 800x470 + RenderBlock {HTML} at (0,0) size 800x470 + RenderBody {BODY} at (8,16) size 784x438 RenderBlock {P} at (0,0) size 784x60 [color=#000080] - RenderText {#text} at (0,0) size 781x59 - text run at (0,0) width 386: "The big coloured boxes should be level with the top of the small " - text run at (386,0) width 363: "coloured boxes of the same color (unless there is not enough" - text run at (0,20) width 36: "room " - text run at (36,20) width 376: "for the big box to fit on the small box's line after the small box, " - text run at (412,20) width 369: "in which case the big box should be as high as possible below" - text run at (0,40) width 22: "the " - text run at (22,40) width 66: "small box)." - RenderBlock {DIV} at (16,76) size 752x342 [color=#C0C0C0] [border: (5px solid #800080)] - RenderText {#text} at (171,21) size 296x19 - text run at (171,21) width 296: "dummy text dummy text dummy text dummy text " + RenderText {#text} at (0,0) size 778x59 + text run at (0,0) width 408: "The big coloured boxes should be level with the top of the small " + text run at (408,0) width 329: "coloured boxes of the same color (unless there is not" + text run at (0,20) width 88: "enough room " + text run at (88,20) width 398: "for the big box to fit on the small box's line after the small box, " + text run at (486,20) width 292: "in which case the big box should be as high as" + text run at (0,40) width 121: "possible below the " + text run at (121,40) width 70: "small box)." + RenderBlock {DIV} at (16,76) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)] + RenderText {#text} at (171,21) size 316x19 + text run at (171,21) width 316: "dummy text dummy text dummy text dummy text " RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (470,21) size 11x19 - text run at (470,21) width 11: "A" - RenderText {#text} at (484,21) size 4x19 - text run at (484,21) width 4: " " + RenderText {#text} at (490,21) size 11x19 + text run at (490,21) width 11: "A" + RenderText {#text} at (504,21) size 4x19 + text run at (504,21) width 4: " " RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)] - RenderText {#text} at (19,19) size 44x19 - text run at (19,19) width 44: "AAAA" + RenderText {#text} at (19,19) size 48x19 + text run at (19,19) width 48: "AAAA" RenderText {#text} at (0,0) size 0x0 RenderInline {SPAN} at (0,0) size 16x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (491,21) size 10x19 - text run at (491,21) width 10: "B" - RenderText {#text} at (504,21) size 4x19 - text run at (504,21) width 4: " " + RenderText {#text} at (511,21) size 10x19 + text run at (511,21) width 10: "B" + RenderText {#text} at (524,21) size 4x19 + text run at (524,21) width 4: " " RenderBlock (floating) {P} at (581,21) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)] - RenderText {#text} at (19,19) size 40x19 - text run at (19,19) width 40: "BBBB" - RenderText {#text} at (508,21) size 710x299 - text run at (508,21) width 70: "dummy text" - text run at (171,41) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (171,61) width 366: "dummy text dummy text dummy text dummy text dummy text" - text run at (21,81) width 74: "dummy text " - text run at (95,81) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (539,81) width 192: "dummy text dummy text dummy" - text run at (21,101) width 248: "text dummy text dummy text dummy text " - text run at (269,101) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text" - text run at (21,121) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (465,121) width 266: "dummy text dummy text dummy text dummy" - text run at (21,141) width 174: "text dummy text dummy text " - text run at (195,141) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (639,141) width 70: "dummy text" - text run at (21,161) width 370: "dummy text dummy text dummy text dummy text dummy text " - text run at (391,161) width 340: "dummy text dummy text dummy text dummy text dummy" - text run at (21,181) width 100: "text dummy text " - text run at (121,181) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (565,181) width 144: "dummy text dummy text" - text run at (21,201) width 296: "dummy text dummy text dummy text dummy text " - text run at (317,201) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (21,221) width 26: "text " - text run at (47,221) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (491,221) width 218: "dummy text dummy text dummy text" - text run at (21,241) width 222: "dummy text dummy text dummy text " - text run at (243,241) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (687,241) width 44: "dummy" - text run at (21,261) width 396: "text dummy text dummy text dummy text dummy text dummy text " - text run at (417,261) width 292: "dummy text dummy text dummy text dummy text" - text run at (21,281) width 148: "dummy text dummy text " - text run at (169,281) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text " - text run at (613,281) width 118: "dummy text dummy" - text run at (21,301) width 318: "text dummy text dummy text dummy text dummy text" + RenderText {#text} at (19,19) size 44x19 + text run at (19,19) width 44: "BBBB" + RenderText {#text} at (528,21) size 707x319 + text run at (528,21) width 48: "dummy" + text run at (171,41) width 391: "text dummy text dummy text dummy text dummy text dummy" + text run at (171,61) width 27: "text " + text run at (198,61) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (21,81) width 106: "text dummy text " + text run at (127,81) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (601,81) width 127: "dummy text dummy" + text run at (21,101) width 343: "text dummy text dummy text dummy text dummy text " + text run at (364,101) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (21,121) width 106: "text dummy text " + text run at (127,121) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (601,121) width 127: "dummy text dummy" + text run at (21,141) width 343: "text dummy text dummy text dummy text dummy text " + text run at (364,141) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (21,161) width 106: "text dummy text " + text run at (127,161) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (601,161) width 127: "dummy text dummy" + text run at (21,181) width 343: "text dummy text dummy text dummy text dummy text " + text run at (364,181) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (21,201) width 106: "text dummy text " + text run at (127,201) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (601,201) width 127: "dummy text dummy" + text run at (21,221) width 343: "text dummy text dummy text dummy text dummy text " + text run at (364,221) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (21,241) width 106: "text dummy text " + text run at (127,241) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (601,241) width 127: "dummy text dummy" + text run at (21,261) width 343: "text dummy text dummy text dummy text dummy text " + text run at (364,261) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (21,281) width 106: "text dummy text " + text run at (127,281) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text " + text run at (601,281) width 127: "dummy text dummy" + text run at (21,301) width 343: "text dummy text dummy text dummy text dummy text " + text run at (364,301) width 364: "dummy text dummy text dummy text dummy text dummy" + text run at (21,321) width 102: "text dummy text" diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt index 56574bd215d7..de5b2e343a00 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt @@ -1,44 +1,45 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x294 - RenderBlock {HTML} at (0,0) size 800x294 - RenderBody {BODY} at (8,16) size 784x262 - RenderBlock {P} at (0,0) size 784x262 [color=#000080] +layer at (0,0) size 800x314 + RenderBlock {HTML} at (0,0) size 800x314 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x282 [color=#000080] RenderImage {IMG} at (0,0) size 50x50 - RenderText {#text} at (50,2) size 309x19 - text run at (50,2) width 309: "\x{21E6} This text should flow around the box on the left. " - RenderInline {SPAN} at (0,0) size 784x259 [color=#C0C0C0] - RenderText {#text} at (359,2) size 784x259 - text run at (359,2) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (50,22) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (494,22) width 244: "text dummy text dummy text dummy text" - text run at (50,42) width 196: "dummy text dummy text dummy " - text run at (246,42) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (690,42) width 70: "text dummy" - text run at (0,62) width 370: "text dummy text dummy text dummy text dummy text dummy " - text run at (370,62) width 392: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,82) width 48: "dummy " - text run at (48,82) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (492,82) width 292: "text dummy text dummy text dummy text dummy" - text run at (0,102) width 148: "text dummy text dummy " - text run at (148,102) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (592,102) width 170: "text dummy text dummy text" - text run at (0,122) width 270: "dummy text dummy text dummy text dummy " - text run at (270,122) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (714,122) width 70: "text dummy" - text run at (0,142) width 370: "text dummy text dummy text dummy text dummy text dummy " - text run at (370,142) width 392: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,162) width 48: "dummy " - text run at (48,162) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (492,162) width 292: "text dummy text dummy text dummy text dummy" - text run at (0,182) width 148: "text dummy text dummy " - text run at (148,182) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (592,182) width 170: "text dummy text dummy text" - text run at (0,202) width 270: "dummy text dummy text dummy text dummy " - text run at (270,202) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (714,202) width 70: "text dummy" - text run at (0,222) width 370: "text dummy text dummy text dummy text dummy text dummy " - text run at (370,222) width 392: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,242) width 48: "dummy " - text run at (48,242) width 392: "text dummy text dummy text dummy text dummy text dummy text" + RenderText {#text} at (50,2) size 327x19 + text run at (50,2) width 327: "\x{21E6} This text should flow around the box on the left. " + RenderInline {SPAN} at (0,0) size 768x279 [color=#C0C0C0] + RenderText {#text} at (377,2) size 768x279 + text run at (377,2) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (50,22) width 52: "dummy " + text run at (102,22) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (576,22) width 181: "text dummy text dummy text" + text run at (50,42) width 289: "dummy text dummy text dummy text dummy " + text run at (339,42) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,62) width 52: "dummy " + text run at (52,62) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,62) width 233: "text dummy text dummy text dummy" + text run at (0,82) width 237: "text dummy text dummy text dummy " + text run at (237,82) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (711,82) width 23: "text" + text run at (0,102) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (447,102) width 312: "text dummy text dummy text dummy text dummy" + text run at (0,122) width 158: "text dummy text dummy " + text run at (158,122) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (632,122) width 102: "text dummy text" + text run at (0,142) width 368: "dummy text dummy text dummy text dummy text dummy " + text run at (368,142) width 391: "text dummy text dummy text dummy text dummy text dummy" + text run at (0,162) width 79: "text dummy " + text run at (79,162) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (553,162) width 181: "text dummy text dummy text" + text run at (0,182) width 289: "dummy text dummy text dummy text dummy " + text run at (289,182) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,202) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (474,202) width 260: "text dummy text dummy text dummy text" + text run at (0,222) width 210: "dummy text dummy text dummy " + text run at (210,222) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (684,222) width 75: "text dummy" + text run at (0,242) width 395: "text dummy text dummy text dummy text dummy text dummy " + text run at (395,242) width 339: "text dummy text dummy text dummy text dummy text" + text run at (0,262) width 131: "dummy text dummy " + text run at (131,262) width 418: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt index ff9e830499af..351062c3aaf5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt @@ -1,44 +1,45 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x294 - RenderBlock {HTML} at (0,0) size 800x294 - RenderBody {BODY} at (8,16) size 784x262 - RenderBlock {P} at (0,0) size 784x262 [color=#000080] +layer at (0,0) size 800x314 + RenderBlock {HTML} at (0,0) size 800x314 + RenderBody {BODY} at (8,16) size 784x282 + RenderBlock {P} at (0,0) size 784x282 [color=#000080] RenderImage {IMG} at (734,0) size 50x50 - RenderText {#text} at (0,2) size 317x19 - text run at (0,2) width 317: "This text should flow around the box on the right. \x{21E8} " - RenderInline {SPAN} at (0,0) size 784x259 [color=#C0C0C0] - RenderText {#text} at (317,2) size 784x259 - text run at (317,2) width 414: "dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,22) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (444,22) width 244: "text dummy text dummy text dummy text" - text run at (0,42) width 196: "dummy text dummy text dummy " - text run at (196,42) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (640,42) width 70: "text dummy" - text run at (0,62) width 370: "text dummy text dummy text dummy text dummy text dummy " - text run at (370,62) width 392: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,82) width 48: "dummy " - text run at (48,82) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (492,82) width 292: "text dummy text dummy text dummy text dummy" - text run at (0,102) width 148: "text dummy text dummy " - text run at (148,102) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (592,102) width 170: "text dummy text dummy text" - text run at (0,122) width 270: "dummy text dummy text dummy text dummy " - text run at (270,122) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (714,122) width 70: "text dummy" - text run at (0,142) width 370: "text dummy text dummy text dummy text dummy text dummy " - text run at (370,142) width 392: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,162) width 48: "dummy " - text run at (48,162) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (492,162) width 292: "text dummy text dummy text dummy text dummy" - text run at (0,182) width 148: "text dummy text dummy " - text run at (148,182) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (592,182) width 170: "text dummy text dummy text" - text run at (0,202) width 270: "dummy text dummy text dummy text dummy " - text run at (270,202) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (714,202) width 70: "text dummy" - text run at (0,222) width 370: "text dummy text dummy text dummy text dummy text dummy " - text run at (370,222) width 392: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,242) width 48: "dummy " - text run at (48,242) width 392: "text dummy text dummy text dummy text dummy text dummy text" + RenderText {#text} at (0,2) size 336x19 + text run at (0,2) width 336: "This text should flow around the box on the right. \x{21E8} " + RenderInline {SPAN} at (0,0) size 759x279 [color=#C0C0C0] + RenderText {#text} at (336,2) size 759x279 + text run at (336,2) width 391: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,22) width 52: "dummy " + text run at (52,22) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,22) width 181: "text dummy text dummy text" + text run at (0,42) width 289: "dummy text dummy text dummy text dummy " + text run at (289,42) width 418: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,62) width 52: "dummy " + text run at (52,62) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (526,62) width 233: "text dummy text dummy text dummy" + text run at (0,82) width 237: "text dummy text dummy text dummy " + text run at (237,82) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (711,82) width 23: "text" + text run at (0,102) width 447: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (447,102) width 312: "text dummy text dummy text dummy text dummy" + text run at (0,122) width 158: "text dummy text dummy " + text run at (158,122) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (632,122) width 102: "text dummy text" + text run at (0,142) width 368: "dummy text dummy text dummy text dummy text dummy " + text run at (368,142) width 391: "text dummy text dummy text dummy text dummy text dummy" + text run at (0,162) width 79: "text dummy " + text run at (79,162) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (553,162) width 181: "text dummy text dummy text" + text run at (0,182) width 289: "dummy text dummy text dummy text dummy " + text run at (289,182) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,202) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (474,202) width 260: "text dummy text dummy text dummy text" + text run at (0,222) width 210: "dummy text dummy text dummy " + text run at (210,222) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (684,222) width 75: "text dummy" + text run at (0,242) width 395: "text dummy text dummy text dummy text dummy text dummy " + text run at (395,242) width 339: "text dummy text dummy text dummy text dummy text" + text run at (0,262) width 131: "dummy text dummy " + text run at (131,262) width 418: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-01-b-expected.txt index d92c5c9f9726..6ffdd3af1a8d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-01-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x100 RenderBody {BODY} at (100,100) size 600x0 [bgcolor=#FF0000] layer at (0,0) size 800x600 RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-02-b-expected.txt index d92c5c9f9726..6ffdd3af1a8d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-02-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x100 RenderBody {BODY} at (100,100) size 600x0 [bgcolor=#FF0000] layer at (0,0) size 800x600 RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-03-b-expected.txt index d92c5c9f9726..6ffdd3af1a8d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-03-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x100 RenderBody {BODY} at (100,100) size 600x0 [bgcolor=#FF0000] layer at (0,0) size 800x600 RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-04-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-04-b-expected.txt index d92c5c9f9726..6ffdd3af1a8d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-04-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-04-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x100 RenderBody {BODY} at (100,100) size 600x0 [bgcolor=#FF0000] layer at (0,0) size 800x600 RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-05-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-05-b-expected.txt index 058aa59c15e7..8dcbfa6f4ed3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-05-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-05-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (160,100) size 480x0 [bgcolor=#FF0000] layer at (0,0) size 800x600 RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-06-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-06-b-expected.txt index 058aa59c15e7..8dcbfa6f4ed3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-06-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-06-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (160,100) size 480x0 [bgcolor=#FF0000] layer at (0,0) size 800x600 RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-07-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-07-b-expected.txt index 896bb0977e2b..90d8b2d50943 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-07-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-07-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x208 RenderBody {BODY} at (108,108) size 584x0 layer at (0,0) size 800x600 RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-08-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-08-b-expected.txt index 896bb0977e2b..90d8b2d50943 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-08-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-08-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x208 RenderBody {BODY} at (108,108) size 584x0 layer at (0,0) size 800x600 RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-09-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-09-b-expected.txt index 896bb0977e2b..90d8b2d50943 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-09-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1001-abs-pos-cb-09-b-expected.txt @@ -5,5 +5,5 @@ layer at (0,0) size 800x208 RenderBody {BODY} at (108,108) size 584x0 layer at (0,0) size 800x600 RenderBlock (positioned) {DIV} at (0,0) size 800x600 [color=#008000] [bgcolor=#FFFFFF] - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." diff --git a/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-00-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-00-b-g-expected.txt index 8c5e94b64188..6e8d3ca4dafe 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-00-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-00-b-g-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x156 RenderBlock {HTML} at (0,0) size 800x156 RenderBody {BODY} at (8,16) size 784x132 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 383x19 - text run at (0,0) width 383: "The square below should be exactly 50 pixels wide on the ruler." + RenderText {#text} at (0,0) size 402x19 + text run at (0,0) width 402: "The square below should be exactly 50 pixels wide on the ruler." RenderBlock {DIV} at (0,36) size 784x96 RenderImage {IMG} at (0,0) size 50x50 diff --git a/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-01-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-01-b-g-expected.txt index 474f3a123289..966830d9d314 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-01-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-01-b-g-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x497 RenderBlock {HTML} at (0,0) size 800x497 RenderBody {BODY} at (8,16) size 784x473 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 442x19 - text run at (0,0) width 442: "The square below should be exactly 50% wide on the ruler at the bottom." + RenderText {#text} at (0,0) size 461x19 + text run at (0,0) width 461: "The square below should be exactly 50% wide on the ruler at the bottom." RenderBlock {DIV} at (0,36) size 784x397 RenderImage {IMG} at (0,0) size 392x392 diff --git a/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-02-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-02-b-g-expected.txt index bbc3b739b187..b8e453dca228 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-02-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1002-c5523-width-02-b-g-expected.txt @@ -4,58 +4,61 @@ layer at (0,0) size 785x660 RenderBlock {HTML} at (0,0) size 785x660 RenderBody {BODY} at (8,16) size 769x636 RenderBlock {P} at (0,0) size 769x20 - RenderText {#text} at (0,0) size 399x19 - text run at (0,0) width 358: "The blue text should not go past the 50% mark on the ruler " - text run at (358,0) width 41: "below." + RenderText {#text} at (0,0) size 416x19 + text run at (0,0) width 374: "The blue text should not go past the 50% mark on the ruler " + text run at (374,0) width 42: "below." RenderBlock {DIV} at (0,36) size 385x560 [color=#0000FF] - RenderText {#text} at (0,0) size 375x559 - text run at (0,0) width 367: "a bit of dummy text a bit of dummy text a bit of dummy text a" - text run at (0,20) width 375: "bit of dummy text a bit of dummy text a bit of dummy text a bit" - text run at (0,40) width 16: "of " - text run at (16,40) width 356: "dummy text a bit of dummy text a bit of dummy text a bit of" - text run at (0,60) width 48: "dummy " - text run at (48,60) width 308: "text a bit of dummy text a bit of dummy text a bit of" - text run at (0,80) width 85: "dummy text a " - text run at (85,80) width 271: "bit of dummy text a bit of dummy text a bit of" - text run at (0,100) width 120: "dummy text a bit of " - text run at (120,100) width 236: "dummy text a bit of dummy text a bit of" - text run at (0,120) width 168: "dummy text a bit of dummy " - text run at (168,120) width 188: "text a bit of dummy text a bit of" - text run at (0,140) width 205: "dummy text a bit of dummy text a " - text run at (205,140) width 151: "bit of dummy text a bit of" - text run at (0,160) width 240: "dummy text a bit of dummy text a bit of " - text run at (240,160) width 116: "dummy text a bit of" - text run at (0,180) width 288: "dummy text a bit of dummy text a bit of dummy " - text run at (288,180) width 68: "text a bit of" - text run at (0,200) width 325: "dummy text a bit of dummy text a bit of dummy text a " - text run at (325,200) width 31: "bit of" - text run at (0,220) width 356: "dummy text a bit of dummy text a bit of dummy text a bit of" - text run at (0,240) width 356: "dummy text a bit of dummy text a bit of dummy text a bit of" - text run at (0,260) width 48: "dummy " - text run at (48,260) width 308: "text a bit of dummy text a bit of dummy text a bit of" - text run at (0,280) width 85: "dummy text a " - text run at (85,280) width 271: "bit of dummy text a bit of dummy text a bit of" - text run at (0,300) width 120: "dummy text a bit of " - text run at (120,300) width 236: "dummy text a bit of dummy text a bit of" - text run at (0,320) width 168: "dummy text a bit of dummy " - text run at (168,320) width 188: "text a bit of dummy text a bit of" - text run at (0,340) width 205: "dummy text a bit of dummy text a " - text run at (205,340) width 151: "bit of dummy text a bit of" - text run at (0,360) width 240: "dummy text a bit of dummy text a bit of " - text run at (240,360) width 116: "dummy text a bit of" - text run at (0,380) width 288: "dummy text a bit of dummy text a bit of dummy " - text run at (288,380) width 68: "text a bit of" - text run at (0,400) width 325: "dummy text a bit of dummy text a bit of dummy text a " - text run at (325,400) width 31: "bit of" - text run at (0,420) width 356: "dummy text a bit of dummy text a bit of dummy text a bit of" - text run at (0,440) width 356: "dummy text a bit of dummy text a bit of dummy text a bit of" - text run at (0,460) width 48: "dummy " - text run at (48,460) width 308: "text a bit of dummy text a bit of dummy text a bit of" - text run at (0,480) width 85: "dummy text a " - text run at (85,480) width 271: "bit of dummy text a bit of dummy text a bit of" - text run at (0,500) width 120: "dummy text a bit of " - text run at (120,500) width 236: "dummy text a bit of dummy text a bit of" - text run at (0,520) width 168: "dummy text a bit of dummy " - text run at (168,520) width 188: "text a bit of dummy text a bit of" - text run at (0,540) width 168: "dummy text a bit of dummy " - text run at (168,540) width 22: "text" + RenderText {#text} at (0,0) size 377x559 + text run at (0,0) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,20) width 11: "a " + text run at (11,20) width 366: "bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,40) width 48: "a bit of " + text run at (48,40) width 329: "dummy text a bit of dummy text a bit of dummy text" + text run at (0,60) width 100: "a bit of dummy " + text run at (100,60) width 277: "text a bit of dummy text a bit of dummy text" + text run at (0,80) width 138: "a bit of dummy text a " + text run at (138,80) width 239: "bit of dummy text a bit of dummy text" + text run at (0,100) width 175: "a bit of dummy text a bit of " + text run at (175,100) width 202: "dummy text a bit of dummy text" + text run at (0,120) width 227: "a bit of dummy text a bit of dummy " + text run at (227,120) width 150: "text a bit of dummy text" + text run at (0,140) width 265: "a bit of dummy text a bit of dummy text a " + text run at (265,140) width 112: "bit of dummy text" + text run at (0,160) width 302: "a bit of dummy text a bit of dummy text a bit of " + text run at (302,160) width 75: "dummy text" + text run at (0,180) width 354: "a bit of dummy text a bit of dummy text a bit of dummy " + text run at (354,180) width 23: "text" + text run at (0,200) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,220) width 11: "a " + text run at (11,220) width 366: "bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,240) width 48: "a bit of " + text run at (48,240) width 329: "dummy text a bit of dummy text a bit of dummy text" + text run at (0,260) width 100: "a bit of dummy " + text run at (100,260) width 277: "text a bit of dummy text a bit of dummy text" + text run at (0,280) width 138: "a bit of dummy text a " + text run at (138,280) width 239: "bit of dummy text a bit of dummy text" + text run at (0,300) width 175: "a bit of dummy text a bit of " + text run at (175,300) width 202: "dummy text a bit of dummy text" + text run at (0,320) width 227: "a bit of dummy text a bit of dummy " + text run at (227,320) width 150: "text a bit of dummy text" + text run at (0,340) width 265: "a bit of dummy text a bit of dummy text a " + text run at (265,340) width 112: "bit of dummy text" + text run at (0,360) width 302: "a bit of dummy text a bit of dummy text a bit of " + text run at (302,360) width 75: "dummy text" + text run at (0,380) width 354: "a bit of dummy text a bit of dummy text a bit of dummy " + text run at (354,380) width 23: "text" + text run at (0,400) width 377: "a bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,420) width 11: "a " + text run at (11,420) width 366: "bit of dummy text a bit of dummy text a bit of dummy text" + text run at (0,440) width 48: "a bit of " + text run at (48,440) width 329: "dummy text a bit of dummy text a bit of dummy text" + text run at (0,460) width 100: "a bit of dummy " + text run at (100,460) width 277: "text a bit of dummy text a bit of dummy text" + text run at (0,480) width 138: "a bit of dummy text a " + text run at (138,480) width 239: "bit of dummy text a bit of dummy text" + text run at (0,500) width 175: "a bit of dummy text a bit of " + text run at (175,500) width 202: "dummy text a bit of dummy text" + text run at (0,520) width 227: "a bit of dummy text a bit of dummy " + text run at (227,520) width 150: "text a bit of dummy text" + text run at (0,540) width 227: "a bit of dummy text a bit of dummy " + text run at (227,540) width 23: "text" diff --git a/LayoutTests/platform/wincairo/css2.1/t100303-c412-blockw-00-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100303-c412-blockw-00-d-ag-expected.txt index 135864f16f74..d99b4939d7b9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100303-c412-blockw-00-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100303-c412-blockw-00-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x312 RenderBlock {HTML} at (0,0) size 800x312 RenderBody {BODY} at (8,16) size 784x286 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 328x19 - text run at (0,0) width 328: "There should be no red below, just two green squares." + RenderText {#text} at (0,0) size 340x19 + text run at (0,0) width 340: "There should be no red below, just two green squares." RenderBlock {DIV} at (10,36) size 120x120 [color=#008000] [bgcolor=#FF0000] [border: (10px solid #008000)] RenderBlock {P} at (20,10) size 90x10 RenderText {#text} at (0,0) size 10x10 diff --git a/LayoutTests/platform/wincairo/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt index 19feff8a5d73..63f3575cb171 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x460 RenderBlock {HTML} at (0,0) size 800x460 RenderBody {BODY} at (8,16) size 784x428 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 586x19 - text run at (0,0) width 377: "Below this paragraph there should be a big teal square half the " - text run at (377,0) width 209: "width of the window and centered." + RenderText {#text} at (0,0) size 616x19 + text run at (0,0) width 396: "Below this paragraph there should be a big teal square half the " + text run at (396,0) width 220: "width of the window and centered." RenderBlock {P} at (0,36) size 784x392 [color=#000080] RenderImage {IMG} at (196,0) size 392x392 diff --git a/LayoutTests/platform/wincairo/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt index 44fefdc5a0b3..c3600ba8317f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt @@ -1,12 +1,12 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x462 - RenderBlock {HTML} at (0,0) size 800x462 - RenderBody {BODY} at (8,16) size 784x430 - RenderBlock {P} at (0,0) size 784x22 [color=#000080] - RenderText {#text} at (0,2) size 756x19 - text run at (0,2) width 377: "Below this paragraph there should be a big teal square half the " - text run at (377,2) width 350: "width of the window, aligned flush with the right hand side " - text run at (727,2) width 29: "(\x{21E8})." - RenderBlock {P} at (0,38) size 784x392 [color=#000080] +layer at (0,0) size 800x482 + RenderBlock {HTML} at (0,0) size 800x482 + RenderBody {BODY} at (8,16) size 784x450 + RenderBlock {P} at (0,0) size 784x42 [color=#000080] + RenderText {#text} at (0,0) size 768x41 + text run at (0,0) width 396: "Below this paragraph there should be a big teal square half the " + text run at (396,0) width 372: "width of the window, aligned flush with the right hand side" + text run at (0,22) width 29: "(\x{21E8})." + RenderBlock {P} at (0,58) size 784x392 [color=#000080] RenderImage {IMG} at (392,0) size 392x392 diff --git a/LayoutTests/platform/wincairo/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt index 18d3561389a8..a0245d817498 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.txt @@ -4,19 +4,19 @@ layer at (0,0) size 800x324 RenderBlock {HTML} at (0,0) size 800x324 RenderBody {BODY} at (8,16) size 784x292 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "There should be no red anywhere." + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "There should be no red anywhere." RenderBlock {P} at (0,36) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 309x19 - text run at (0,0) width 309: "There should be two identical squares after this line:" + RenderText {#text} at (0,0) size 327x19 + text run at (0,0) width 327: "There should be two identical squares after this line:" RenderBlock {DIV} at (16,72) size 752x35 RenderImage {IMG} at (0,0) size 15x15 RenderBlock {SPAN} at (0,20) size 15x15 [color=#0000FF] [bgcolor=#FF0000] RenderText {#text} at (0,0) size 15x15 text run at (0,0) width 15: "X" RenderBlock {P} at (0,123) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 309x19 - text run at (0,0) width 309: "There should be two identical squares after this line:" + RenderText {#text} at (0,0) size 327x19 + text run at (0,0) width 327: "There should be two identical squares after this line:" RenderBlock {DIV} at (16,159) size 752x133 RenderImage {IMG} at (0,0) size 64x64 RenderBlock {SPAN} at (0,69) size 64x64 [color=#0000FF] [bgcolor=#FF0000] diff --git a/LayoutTests/platform/wincairo/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt index b0d87541740e..41bac2cc496a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.txt @@ -4,25 +4,25 @@ layer at (0,0) size 800x173 RenderBlock {HTML} at (0,0) size 800x173 RenderBody {BODY} at (8,16) size 784x141 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "There should be no red anywhere." + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "There should be no red anywhere." RenderBlock {P} at (0,36) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be two identical squares at the end of this line: " - RenderImage {IMG} at (361,0) size 15x15 - RenderText {#text} at (376,0) size 4x19 - text run at (376,0) width 4: " " + RenderText {#text} at (0,0) size 381x19 + text run at (0,0) width 381: "There should be two identical squares at the end of this line: " + RenderImage {IMG} at (381,0) size 15x15 + RenderText {#text} at (396,0) size 4x19 + text run at (396,0) width 4: " " RenderInline {SPAN} at (0,0) size 15x15 [color=#0000FF] [bgcolor=#FF0000] - RenderText {#text} at (380,0) size 15x15 - text run at (380,0) width 15: "X" + RenderText {#text} at (400,0) size 15x15 + text run at (400,0) width 15: "X" RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,72) size 784x69 [color=#000080] - RenderText {#text} at (0,49) size 361x19 - text run at (0,49) width 361: "There should be two identical squares at the end of this line: " - RenderImage {IMG} at (361,0) size 64x64 - RenderText {#text} at (425,49) size 4x19 - text run at (425,49) width 4: " " + RenderText {#text} at (0,49) size 381x19 + text run at (0,49) width 381: "There should be two identical squares at the end of this line: " + RenderImage {IMG} at (381,0) size 64x64 + RenderText {#text} at (445,49) size 4x19 + text run at (445,49) width 4: " " RenderInline {SPAN} at (0,0) size 64x64 [color=#0000FF] [bgcolor=#FF0000] - RenderText {#text} at (429,0) size 64x64 - text run at (429,0) width 64: "X" + RenderText {#text} at (449,0) size 64x64 + text run at (449,0) width 64: "X" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1004-c5524-width-00-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1004-c5524-width-00-b-g-expected.txt index 7652dc5c35dd..e774c2d647be 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1004-c5524-width-00-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1004-c5524-width-00-b-g-expected.txt @@ -4,10 +4,9 @@ layer at (0,0) size 800x565 RenderBlock {HTML} at (0,0) size 800x565 RenderBody {BODY} at (8,16) size 784x541 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 763x39 - text run at (0,0) width 376: "The blue rectangle below should be exactly 200 pixels by 120 " - text run at (376,0) width 362: "pixels on the ruler (and the aqua bars should stick out of the " - text run at (738,0) width 25: "blue" - text run at (0,20) width 156: "box, with no red present)." + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 395: "The blue rectangle below should be exactly 200 pixels by 120 " + text run at (395,0) width 375: "pixels on the ruler (and the aqua bars should stick out of the" + text run at (0,20) width 193: "blue box, with no red present)." RenderBlock {DIV} at (0,56) size 784x485 RenderImage {IMG} at (40,40) size 120x200 diff --git a/LayoutTests/platform/wincairo/css2.1/t1005-c5524-width-00-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1005-c5524-width-00-b-g-expected.txt index ee19837e52b3..739129838f97 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1005-c5524-width-00-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1005-c5524-width-00-b-g-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x216 RenderBlock {HTML} at (0,0) size 800x216 RenderBody {BODY} at (8,16) size 784x192 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 378x19 - text run at (0,0) width 378: "The square below should be exactly 50 pixels high on the ruler." + RenderText {#text} at (0,0) size 399x19 + text run at (0,0) width 399: "The square below should be exactly 50 pixels high on the ruler." RenderBlock {DIV} at (0,36) size 784x156 RenderImage {IMG} at (45,0) size 50x50 diff --git a/LayoutTests/platform/wincairo/css2.1/t1005-c5524-width-01-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1005-c5524-width-01-b-g-expected.txt index 1a77a4ee7b45..690fb229debe 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1005-c5524-width-01-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1005-c5524-width-01-b-g-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x266 RenderBlock {HTML} at (0,0) size 800x266 RenderBody {BODY} at (8,16) size 784x242 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 386x19 - text run at (0,0) width 386: "The square below should be exactly 100 pixels high on the ruler." + RenderText {#text} at (0,0) size 407x19 + text run at (0,0) width 407: "The square below should be exactly 100 pixels high on the ruler." RenderBlock {DIV} at (0,36) size 784x206 RenderImage {IMG} at (45,0) size 100x100 diff --git a/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt index fa5c973cf8ab..e5802fdc6b91 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-00-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x220 RenderBlock {HTML} at (0,0) size 800x220 RenderBody {BODY} at (8,16) size 784x196 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 418x19 - text run at (0,0) width 418: "There should be no red below, just the outline of an empty green box." + RenderText {#text} at (0,0) size 438x19 + text run at (0,0) width 438: "There should be no red below, just the outline of an empty green box." RenderBlock {DIV} at (0,36) size 230x160 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)] RenderText {#text} at (20,20) size 190x30 text run at (20,20) width 190: "xxxx xxxx xxxx xxxx" diff --git a/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt index 51844e0fab4f..2e92446c57aa 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-01-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x300 RenderBlock {HTML} at (0,0) size 800x300 RenderBody {BODY} at (8,16) size 784x276 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 418x19 - text run at (0,0) width 418: "There should be no red below, just the outline of an empty green box." + RenderText {#text} at (0,0) size 438x19 + text run at (0,0) width 438: "There should be no red below, just the outline of an empty green box." RenderBlock {DIV} at (0,36) size 430x240 [color=#FFFFFF] [bgcolor=#FF0000] [border: (10px solid #008000)] RenderText {#text} at (20,20) size 390x105 text run at (20,20) width 390: "xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx" diff --git a/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt index 13a356be8fc4..b48536d7407d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-02-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x322 RenderBlock {HTML} at (0,0) size 800x322 RenderBody {BODY} at (8,16) size 784x298 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 418x19 - text run at (0,0) width 418: "There should be no red below, just the outline of an empty green box." + RenderText {#text} at (0,0) size 438x19 + text run at (0,0) width 438: "There should be no red below, just the outline of an empty green box." RenderBlock {DIV} at (0,36) size 360x262 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)] RenderText {#text} at (40,40) size 280x102 text run at (40,40) width 280: "xxxx xxxx xxxx" diff --git a/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt index c9a35d3043df..e7f06e1df4f4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1008-c44-ln-box-03-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x320 RenderBlock {HTML} at (0,0) size 800x320 RenderBody {BODY} at (8,16) size 784x296 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 418x19 - text run at (0,0) width 418: "There should be no red below, just the outline of an empty green box." + RenderText {#text} at (0,0) size 438x19 + text run at (0,0) width 438: "There should be no red below, just the outline of an empty green box." RenderBlock {DIV} at (0,36) size 360x260 [color=#FFFFFF] [bgcolor=#FF0000] [border: (20px solid #008000)] RenderText {#text} at (40,40) size 280x100 text run at (40,40) width 280: "xxxx xxxx xxxx" diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt index 58fc3f9ea155..2ef2852374a1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c42-ibx-ht-00-d-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x120 RenderBlock {HTML} at (0,0) size 800x120 RenderBody {BODY} at (8,16) size 784x96 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 341x19 - text run at (0,0) width 341: "There should be no red below, only green lines and dots." + RenderText {#text} at (0,0) size 357x19 + text run at (0,0) width 357: "There should be no red below, only green lines and dots." RenderBlock {DIV} at (0,36) size 200x60 [color=#008000] RenderText {#text} at (0,1) size 40x10 text run at (0,1) width 40: "z z " diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-00-a-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-00-a-ag-expected.txt index 7413378ed5ea..f8bfe593f2ee 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-00-a-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-00-a-ag-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x260 RenderBlock {HTML} at (0,0) size 800x260 RenderBody {BODY} at (8,16) size 784x194 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 769x39 - text run at (0,0) width 769: "There should be four identical white boxes in the teal block below, all the same size, each one a little lower down on the line, in a" - text run at (0,20) width 75: "step pattern." + RenderText {#text} at (0,0) size 754x39 + text run at (0,0) width 754: "There should be four identical white boxes in the teal block below, all the same size, each one a little lower down on the" + text run at (0,20) width 134: "line, in a step pattern." RenderBlock {DIV} at (50,90) size 684x104 [color=#FFFFFF] [bgcolor=#008080] RenderInline {SPAN} at (0,0) size 51x51 RenderText {#text} at (12,12) size 51x51 diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-01-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-01-d-ag-expected.txt index 6c8e37614c3e..93df29e8dbea 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-01-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-01-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x300 RenderBlock {HTML} at (0,0) size 800x300 RenderBody {BODY} at (8,16) size 784x276 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 300x19 - text run at (0,0) width 300: "There should be a green block with no red below." + RenderText {#text} at (0,0) size 313x19 + text run at (0,0) width 313: "There should be a green block with no red below." RenderBlock {DIV} at (15,36) size 90x240 [color=#008000] [bgcolor=#FF0000] RenderBlock {DIV} at (0,0) size 90x33 RenderImage {IMG} at (0,0) size 30x30 diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-02-d-agi-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-02-d-agi-expected.txt index e16345fa7c6d..6751e6b19d62 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-02-d-agi-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-02-d-agi-expected.txt @@ -4,10 +4,11 @@ layer at (0,0) size 800x360 RenderBlock {HTML} at (0,0) size 800x360 RenderBody {BODY} at (8,16) size 784x329 RenderBlock {P} at (0,0) size 784x40 - RenderText {#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." + RenderText {#text} at (0,0) size 727x39 + text run at (0,0) width 387: "Change your window size. However the lines wrap, the blue " + text run at (387,0) width 340: "rectanglues should always have their tops on the same" + text run at (0,20) width 83: "alignment as " + text run at (83,20) width 204: "other blue rectangles on the line." RenderBlock {P} at (15,56) size 754x273 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] RenderText {#text} at (8,26) size 61x16 text run at (8,26) width 61: "xxx " diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-03-d-agi-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-03-d-agi-expected.txt index b012c512b5c9..ece3676cafde 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-03-d-agi-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-03-d-agi-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x323 RenderBlock {HTML} at (0,0) size 800x323 RenderBody {BODY} at (8,16) size 784x292 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 768x39 - text run at (0,0) width 365: "Change your window size. However the lines wrap, the blue " - text run at (365,0) width 403: "rectanglues should always have their middles on the same alignment" - text run at (0,20) width 17: "as " - text run at (17,20) width 193: "other blue rectangles on the line." + RenderText {#text} at (0,0) size 750x39 + text run at (0,0) width 387: "Change your window size. However the lines wrap, the blue " + text run at (387,0) width 363: "rectanglues should always have their middles on the same" + text run at (0,20) width 83: "alignment as " + text run at (83,20) width 204: "other blue rectangles on the line." RenderBlock {P} at (15,56) size 754x236 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] RenderText {#text} at (8,35) size 61x16 text run at (8,35) width 61: "\x{C9}\x{C9}\x{C9} " diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-04-d-agi-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-04-d-agi-expected.txt index 139c567044ce..30a4e13d2c36 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-04-d-agi-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c544-valgn-04-d-agi-expected.txt @@ -4,10 +4,11 @@ layer at (0,0) size 800x259 RenderBlock {HTML} at (0,0) size 800x259 RenderBody {BODY} at (8,16) size 784x228 RenderBlock {P} at (0,0) size 784x40 - RenderText {#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." + RenderText {#text} at (0,0) size 727x39 + text run at (0,0) width 387: "Change your window size. However the lines wrap, the blue " + text run at (387,0) width 340: "rectanglues should always have their tops on the same" + text run at (0,20) width 83: "alignment as " + text run at (83,20) width 204: "other blue rectangles on the line." RenderBlock {P} at (15,56) size 754x172 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)] RenderInline {SPAN} at (0,0) size 46x16 RenderText {#text} at (8,8) size 46x16 diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c548-leadin-00-d-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c548-leadin-00-d-a-expected.txt index 16fe38c06854..126e1f18b79e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c548-leadin-00-d-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c548-leadin-00-d-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x166 RenderBlock {HTML} at (0,0) size 800x166 RenderBody {BODY} at (8,16) size 784x142 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 437x19 - text run at (0,0) width 437: "There should be stripes of dark green and light green below, with no red." + RenderText {#text} at (0,0) size 458x19 + text run at (0,0) width 458: "There should be stripes of dark green and light green below, with no red." RenderBlock {DIV} at (0,36) size 81x106 [color=#00FF00] [bgcolor=#008000] [border: (3px solid #000000)] RenderInline {SPAN} at (0,0) size 75x75 [bgcolor=#FF0000] RenderText {#text} at (3,15) size 75x75 diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt index 9caf6ed705d8..5f5b4bb681e9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-00-c-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x328 RenderBlock {HTML} at (0,0) size 800x328 RenderBody {BODY} at (8,16) size 784x300 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 253x19 - text run at (0,0) width 253: "The two blocks below should be identical:" + RenderText {#text} at (0,0) size 267x19 + text run at (0,0) width 267: "The two blocks below should be identical:" RenderBlock {DIV} at (12,36) size 126x126 [color=#00FFFF] [bgcolor=#008080] [border: (3px solid #000080)] RenderText {#text} at (27,27) size 72x72 text run at (27,27) width 72: "X X" diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt index 7ecb874e79b2..3376ffa0198e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-01-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x348 RenderBlock {HTML} at (0,0) size 800x348 RenderBody {BODY} at (8,8) size 784x332 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 482x19 - text run at (0,0) width 482: "There should be a big pattern of green and lime dots below, with no red present." + RenderText {#text} at (0,0) size 503x19 + text run at (0,0) width 503: "There should be a big pattern of green and lime dots below, with no red present." RenderBlock {DIV} at (6,26) size 66x306 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (15,9) size 48x48 RenderText {#text} at (0,6) size 36x36 diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt index adefe669d802..72a9842d6c60 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-02-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x302 RenderBlock {HTML} at (0,0) size 800x302 RenderBody {BODY} at (8,8) size 784x286 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 482x19 - text run at (0,0) width 482: "There should be a big pattern of green and lime dots below, with no red present." + RenderText {#text} at (0,0) size 503x19 + text run at (0,0) width 503: "There should be a big pattern of green and lime dots below, with no red present." RenderBlock {DIV} at (6,26) size 66x260 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (15,9) size 48x48 RenderText {#text} at (0,6) size 36x36 diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt index 348f22e98ae0..726cddf27b41 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-03-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x314 RenderBlock {HTML} at (0,0) size 800x314 RenderBody {BODY} at (8,8) size 784x286 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "There should be no red below:" + RenderText {#text} at (0,0) size 193x19 + text run at (0,0) width 193: "There should be no red below:" RenderBlock {DIV} at (20,40) size 86x246 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 80x80 RenderText {#text} at (0,10) size 60x60 diff --git a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt index 5a93640f2f63..b26e84bb31fd 100644 --- a/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t100801-c548-ln-ht-04-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x394 RenderBlock {HTML} at (0,0) size 800x394 RenderBody {BODY} at (8,8) size 784x366 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "There should be no red below:" + RenderText {#text} at (0,0) size 193x19 + text run at (0,0) width 193: "There should be no red below:" RenderBlock {DIV} at (20,40) size 86x326 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock (anonymous) at (3,3) size 80x80 RenderText {#text} at (0,10) size 60x60 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-00-b-expected.txt index e7cb316efa30..d625a75cabf7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-00-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 8x19 RenderInline (generated) at (0,0) size 8x19 @@ -67,19 +67,19 @@ layer at (0,0) size 800x100 text run at (108,0) width 16: "10" RenderText {#text} at (124,0) size 4x19 text run at (124,0) width 4: " " + RenderInline {SPAN} at (0,0) size 15x19 + RenderInline (generated) at (0,0) size 15x19 + RenderCounter at (128,0) size 15x19 + text run at (128,0) width 15: "11" + RenderText {#text} at (143,0) size 4x19 + text run at (143,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (128,0) size 16x19 - text run at (128,0) width 16: "11" - RenderText {#text} at (144,0) size 4x19 - text run at (144,0) width 4: " " - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (148,0) size 16x19 - text run at (148,0) width 16: "12" + RenderCounter at (147,0) size 16x19 + text run at (147,0) width 16: "12" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 164x19 + RenderText {#text} at (0,0) size 163x19 text run at (0,0) width 12: "1 " text run at (12,0) width 12: "2 " text run at (24,0) width 12: "3 " @@ -90,5 +90,5 @@ layer at (0,0) size 800x100 text run at (84,0) width 12: "8 " text run at (96,0) width 12: "9 " text run at (108,0) width 20: "10 " - text run at (128,0) width 20: "11 " - text run at (148,0) width 16: "12" + text run at (128,0) width 19: "11 " + text run at (147,0) width 16: "12" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-01-b-expected.txt index c0204982c2b2..58fdcc865a19 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-01-b-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 216x19 - text run at (0,0) width 216: "The following two lines should look " - RenderInline {EM} at (0,0) size 93x19 - RenderText {#text} at (216,0) size 93x19 - text run at (216,0) width 93: "approximately" - RenderText {#text} at (309,0) size 60x19 - text run at (309,0) width 60: " the same:" + RenderText {#text} at (0,0) size 233x19 + text run at (0,0) width 233: "The following two lines should look " + RenderInline {EM} at (0,0) size 91x19 + RenderText {#text} at (233,0) size 91x19 + text run at (233,0) width 91: "approximately" + RenderText {#text} at (324,0) size 63x19 + text run at (324,0) width 63: " the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 6x19 RenderInline (generated) at (0,0) size 6x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-02-b-expected.txt index f261a0b87e91..80555266e9d4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-02-b-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 216x19 - text run at (0,0) width 216: "The following two lines should look " - RenderInline {EM} at (0,0) size 93x19 - RenderText {#text} at (216,0) size 93x19 - text run at (216,0) width 93: "approximately" - RenderText {#text} at (309,0) size 60x19 - text run at (309,0) width 60: " the same:" + RenderText {#text} at (0,0) size 233x19 + text run at (0,0) width 233: "The following two lines should look " + RenderInline {EM} at (0,0) size 91x19 + RenderText {#text} at (233,0) size 91x19 + text run at (233,0) width 91: "approximately" + RenderText {#text} at (324,0) size 63x19 + text run at (324,0) width 63: " the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 6x19 RenderInline (generated) at (0,0) size 6x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-03-b-expected.txt index 26b7902ea805..140c1e361a40 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-03-b-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 216x19 - text run at (0,0) width 216: "The following two lines should look " - RenderInline {EM} at (0,0) size 93x19 - RenderText {#text} at (216,0) size 93x19 - text run at (216,0) width 93: "approximately" - RenderText {#text} at (309,0) size 60x19 - text run at (309,0) width 60: " the same:" + RenderText {#text} at (0,0) size 233x19 + text run at (0,0) width 233: "The following two lines should look " + RenderInline {EM} at (0,0) size 91x19 + RenderText {#text} at (233,0) size 91x19 + text run at (233,0) width 91: "approximately" + RenderText {#text} at (324,0) size 63x19 + text run at (324,0) width 63: " the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 6x19 RenderInline (generated) at (0,0) size 6x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-04-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-04-b-expected.txt index ee094765bd9e..ee3a06330e72 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-04-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-04-b-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x102 RenderBlock {HTML} at (0,0) size 800x102 RenderBody {BODY} at (8,16) size 784x78 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 216x19 - text run at (0,0) width 216: "The following two lines should look " - RenderInline {EM} at (0,0) size 93x19 - RenderText {#text} at (216,0) size 93x19 - text run at (216,0) width 93: "approximately" - RenderText {#text} at (309,0) size 60x19 - text run at (309,0) width 60: " the same:" + RenderText {#text} at (0,0) size 233x19 + text run at (0,0) width 233: "The following two lines should look " + RenderInline {EM} at (0,0) size 91x19 + RenderText {#text} at (233,0) size 91x19 + text run at (233,0) width 91: "approximately" + RenderText {#text} at (324,0) size 63x19 + text run at (324,0) width 63: " the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 9x19 RenderInline (generated) at (0,0) size 9x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-05-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-05-b-expected.txt index e7cb316efa30..d625a75cabf7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-05-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-05-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 8x19 RenderInline (generated) at (0,0) size 8x19 @@ -67,19 +67,19 @@ layer at (0,0) size 800x100 text run at (108,0) width 16: "10" RenderText {#text} at (124,0) size 4x19 text run at (124,0) width 4: " " + RenderInline {SPAN} at (0,0) size 15x19 + RenderInline (generated) at (0,0) size 15x19 + RenderCounter at (128,0) size 15x19 + text run at (128,0) width 15: "11" + RenderText {#text} at (143,0) size 4x19 + text run at (143,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (128,0) size 16x19 - text run at (128,0) width 16: "11" - RenderText {#text} at (144,0) size 4x19 - text run at (144,0) width 4: " " - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (148,0) size 16x19 - text run at (148,0) width 16: "12" + RenderCounter at (147,0) size 16x19 + text run at (147,0) width 16: "12" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 164x19 + RenderText {#text} at (0,0) size 163x19 text run at (0,0) width 12: "1 " text run at (12,0) width 12: "2 " text run at (24,0) width 12: "3 " @@ -90,5 +90,5 @@ layer at (0,0) size 800x100 text run at (84,0) width 12: "8 " text run at (96,0) width 12: "9 " text run at (108,0) width 20: "10 " - text run at (128,0) width 20: "11 " - text run at (148,0) width 16: "12" + text run at (128,0) width 19: "11 " + text run at (147,0) width 16: "12" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-06-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-06-b-expected.txt index 10001510eafa..e6fb5c598373 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-06-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-06-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 @@ -67,37 +67,37 @@ layer at (0,0) size 800x100 text run at (180,0) width 16: "10" RenderText {#text} at (196,0) size 4x19 text run at (196,0) width 4: " " + RenderInline {SPAN} at (0,0) size 15x19 + RenderInline (generated) at (0,0) size 15x19 + RenderCounter at (200,0) size 15x19 + text run at (200,0) width 15: "11" + RenderText {#text} at (215,0) size 4x19 + text run at (215,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (200,0) size 16x19 - text run at (200,0) width 16: "11" - RenderText {#text} at (216,0) size 4x19 - text run at (216,0) width 4: " " + RenderCounter at (219,0) size 16x19 + text run at (219,0) width 16: "12" + RenderText {#text} at (235,0) size 4x19 + text run at (235,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (220,0) size 16x19 - text run at (220,0) width 16: "12" - RenderText {#text} at (236,0) size 4x19 - text run at (236,0) width 4: " " - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (240,0) size 16x19 - text run at (240,0) width 16: "99" - RenderText {#text} at (256,0) size 4x19 - text run at (256,0) width 4: " " + RenderCounter at (239,0) size 16x19 + text run at (239,0) width 16: "99" + RenderText {#text} at (255,0) size 4x19 + text run at (255,0) width 4: " " RenderInline {SPAN} at (0,0) size 24x19 RenderInline (generated) at (0,0) size 24x19 - RenderCounter at (260,0) size 24x19 - text run at (260,0) width 24: "100" - RenderText {#text} at (284,0) size 4x19 - text run at (284,0) width 4: " " + RenderCounter at (259,0) size 24x19 + text run at (259,0) width 24: "100" + RenderText {#text} at (283,0) size 4x19 + text run at (283,0) width 4: " " RenderInline {SPAN} at (0,0) size 24x19 RenderInline (generated) at (0,0) size 24x19 - RenderCounter at (288,0) size 24x19 - text run at (288,0) width 24: "101" + RenderCounter at (287,0) size 24x19 + text run at (287,0) width 24: "101" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 312x19 + RenderText {#text} at (0,0) size 311x19 text run at (0,0) width 20: "01 " text run at (20,0) width 20: "02 " text run at (40,0) width 20: "03 " @@ -108,8 +108,8 @@ layer at (0,0) size 800x100 text run at (140,0) width 20: "08 " text run at (160,0) width 20: "09 " text run at (180,0) width 20: "10 " - text run at (200,0) width 20: "11 " - text run at (220,0) width 20: "12 " - text run at (240,0) width 20: "99 " - text run at (260,0) width 28: "100 " - text run at (288,0) width 24: "101" + text run at (200,0) width 19: "11 " + text run at (219,0) width 20: "12 " + text run at (239,0) width 20: "99 " + text run at (259,0) width 28: "100 " + text run at (287,0) width 24: "101" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-07-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-07-b-expected.txt index 2d15e015d215..981dbe93ded7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-07-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-07-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 3x19 RenderInline (generated) at (0,0) size 3x19 @@ -13,131 +13,131 @@ layer at (0,0) size 800x100 text run at (0,0) width 3: "i" RenderText {#text} at (3,0) size 4x19 text run at (3,0) width 4: " " - RenderInline {SPAN} at (0,0) size 6x19 - RenderInline (generated) at (0,0) size 6x19 - RenderCounter at (7,0) size 6x19 - text run at (7,0) width 6: "ii" - RenderText {#text} at (13,0) size 4x19 - text run at (13,0) width 4: " " - RenderInline {SPAN} at (0,0) size 9x19 - RenderInline (generated) at (0,0) size 9x19 - RenderCounter at (17,0) size 9x19 - text run at (17,0) width 9: "iii" - RenderText {#text} at (26,0) size 4x19 - text run at (26,0) width 4: " " - RenderInline {SPAN} at (0,0) size 10x19 - RenderInline (generated) at (0,0) size 10x19 - RenderCounter at (30,0) size 10x19 - text run at (30,0) width 10: "iv" - RenderText {#text} at (40,0) size 4x19 - text run at (40,0) width 4: " " + RenderInline {SPAN} at (0,0) size 8x19 + RenderInline (generated) at (0,0) size 8x19 + RenderCounter at (7,0) size 8x19 + text run at (7,0) width 8: "ii" + RenderText {#text} at (15,0) size 4x19 + text run at (15,0) width 4: " " + RenderInline {SPAN} at (0,0) size 12x19 + RenderInline (generated) at (0,0) size 12x19 + RenderCounter at (19,0) size 12x19 + text run at (19,0) width 12: "iii" + RenderText {#text} at (31,0) size 4x19 + text run at (31,0) width 4: " " + RenderInline {SPAN} at (0,0) size 12x19 + RenderInline (generated) at (0,0) size 12x19 + RenderCounter at (35,0) size 12x19 + text run at (35,0) width 12: "iv" + RenderText {#text} at (47,0) size 4x19 + text run at (47,0) width 4: " " RenderInline {SPAN} at (0,0) size 7x19 RenderInline (generated) at (0,0) size 7x19 - RenderCounter at (44,0) size 7x19 - text run at (44,0) width 7: "v" - RenderText {#text} at (51,0) size 4x19 - text run at (51,0) width 4: " " - RenderInline {SPAN} at (0,0) size 10x19 - RenderInline (generated) at (0,0) size 10x19 - RenderCounter at (55,0) size 10x19 - text run at (55,0) width 10: "vi" - RenderText {#text} at (65,0) size 4x19 - text run at (65,0) width 4: " " - RenderInline {SPAN} at (0,0) size 13x19 - RenderInline (generated) at (0,0) size 13x19 - RenderCounter at (69,0) size 13x19 - text run at (69,0) width 13: "vii" - RenderText {#text} at (82,0) size 4x19 - text run at (82,0) width 4: " " + RenderCounter at (51,0) size 7x19 + text run at (51,0) width 7: "v" + RenderText {#text} at (58,0) size 4x19 + text run at (58,0) width 4: " " + RenderInline {SPAN} at (0,0) size 12x19 + RenderInline (generated) at (0,0) size 12x19 + RenderCounter at (62,0) size 12x19 + text run at (62,0) width 12: "vi" + RenderText {#text} at (74,0) size 4x19 + text run at (74,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (86,0) size 16x19 - text run at (86,0) width 16: "viii" - RenderText {#text} at (102,0) size 4x19 - text run at (102,0) width 4: " " - RenderInline {SPAN} at (0,0) size 10x19 - RenderInline (generated) at (0,0) size 10x19 - RenderCounter at (106,0) size 10x19 - text run at (106,0) width 10: "ix" - RenderText {#text} at (116,0) size 4x19 - text run at (116,0) width 4: " " - RenderInline {SPAN} at (0,0) size 7x19 - RenderInline (generated) at (0,0) size 7x19 - RenderCounter at (120,0) size 7x19 - text run at (120,0) width 7: "x" - RenderText {#text} at (127,0) size 4x19 - text run at (127,0) width 4: " " - RenderInline {SPAN} at (0,0) size 10x19 - RenderInline (generated) at (0,0) size 10x19 - RenderCounter at (131,0) size 10x19 - text run at (131,0) width 10: "xi" - RenderText {#text} at (141,0) size 4x19 - text run at (141,0) width 4: " " - RenderInline {SPAN} at (0,0) size 13x19 - RenderInline (generated) at (0,0) size 13x19 - RenderCounter at (145,0) size 13x19 - text run at (145,0) width 13: "xii" - RenderText {#text} at (158,0) size 4x19 - text run at (158,0) width 4: " " + RenderCounter at (78,0) size 16x19 + text run at (78,0) width 16: "vii" + RenderText {#text} at (94,0) size 4x19 + text run at (94,0) width 4: " " RenderInline {SPAN} at (0,0) size 20x19 RenderInline (generated) at (0,0) size 20x19 - RenderCounter at (162,0) size 20x19 - text run at (162,0) width 20: "xlix" - RenderText {#text} at (182,0) size 4x19 - text run at (182,0) width 4: " " + RenderCounter at (98,0) size 20x19 + text run at (98,0) width 20: "viii" + RenderText {#text} at (118,0) size 4x19 + text run at (118,0) width 4: " " + RenderInline {SPAN} at (0,0) size 12x19 + RenderInline (generated) at (0,0) size 12x19 + RenderCounter at (122,0) size 12x19 + text run at (122,0) width 12: "ix" + RenderText {#text} at (134,0) size 4x19 + text run at (134,0) width 4: " " + RenderInline {SPAN} at (0,0) size 7x19 + RenderInline (generated) at (0,0) size 7x19 + RenderCounter at (138,0) size 7x19 + text run at (138,0) width 7: "x" + RenderText {#text} at (145,0) size 4x19 + text run at (145,0) width 4: " " + RenderInline {SPAN} at (0,0) size 12x19 + RenderInline (generated) at (0,0) size 12x19 + RenderCounter at (149,0) size 12x19 + text run at (149,0) width 12: "xi" + RenderText {#text} at (161,0) size 4x19 + text run at (161,0) width 4: " " + RenderInline {SPAN} at (0,0) size 16x19 + RenderInline (generated) at (0,0) size 16x19 + RenderCounter at (165,0) size 16x19 + text run at (165,0) width 16: "xii" + RenderText {#text} at (181,0) size 4x19 + text run at (181,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (185,0) size 24x19 + text run at (185,0) width 24: "xlix" + RenderText {#text} at (209,0) size 4x19 + text run at (209,0) width 4: " " RenderInline {SPAN} at (0,0) size 3x19 RenderInline (generated) at (0,0) size 3x19 - RenderCounter at (186,0) size 3x19 - text run at (186,0) width 3: "l" - RenderText {#text} at (189,0) size 4x19 - text run at (189,0) width 4: " " - RenderInline {SPAN} at (0,0) size 55x19 - RenderInline (generated) at (0,0) size 55x19 - RenderCounter at (193,0) size 55x19 - text run at (193,0) width 55: "ccclxxxix" - RenderText {#text} at (248,0) size 4x19 - text run at (248,0) width 4: " " - RenderInline {SPAN} at (0,0) size 35x19 - RenderInline (generated) at (0,0) size 35x19 - RenderCounter at (252,0) size 35x19 - text run at (252,0) width 35: "cccxc" - RenderText {#text} at (287,0) size 4x19 - text run at (287,0) width 4: " " - RenderInline {SPAN} at (0,0) size 82x19 - RenderInline (generated) at (0,0) size 82x19 - RenderCounter at (291,0) size 82x19 - text run at (291,0) width 82: "mmmcdlxxxix" - RenderText {#text} at (373,0) size 4x19 - text run at (373,0) width 4: " " - RenderInline {SPAN} at (0,0) size 62x19 - RenderInline (generated) at (0,0) size 62x19 - RenderCounter at (377,0) size 62x19 - text run at (377,0) width 62: "mmmcdxc" - RenderText {#text} at (439,0) size 4x19 - text run at (439,0) width 4: " " - RenderInline {SPAN} at (0,0) size 65x19 - RenderInline (generated) at (0,0) size 65x19 - RenderCounter at (443,0) size 65x19 - text run at (443,0) width 65: "mmmcdxci" + RenderCounter at (213,0) size 3x19 + text run at (213,0) width 3: "l" + RenderText {#text} at (216,0) size 4x19 + text run at (216,0) width 4: " " + RenderInline {SPAN} at (0,0) size 61x19 + RenderInline (generated) at (0,0) size 61x19 + RenderCounter at (220,0) size 61x19 + text run at (220,0) width 61: "ccclxxxix" + RenderText {#text} at (281,0) size 4x19 + text run at (281,0) width 4: " " + RenderInline {SPAN} at (0,0) size 36x19 + RenderInline (generated) at (0,0) size 36x19 + RenderCounter at (285,0) size 36x19 + text run at (285,0) width 36: "cccxc" + RenderText {#text} at (321,0) size 4x19 + text run at (321,0) width 4: " " + RenderInline {SPAN} at (0,0) size 91x19 + RenderInline (generated) at (0,0) size 91x19 + RenderCounter at (325,0) size 91x19 + text run at (325,0) width 91: "mmmcdlxxxix" + RenderText {#text} at (416,0) size 4x19 + text run at (416,0) width 4: " " + RenderInline {SPAN} at (0,0) size 66x19 + RenderInline (generated) at (0,0) size 66x19 + RenderCounter at (420,0) size 66x19 + text run at (420,0) width 66: "mmmcdxc" + RenderText {#text} at (486,0) size 4x19 + text run at (486,0) width 4: " " + RenderInline {SPAN} at (0,0) size 70x19 + RenderInline (generated) at (0,0) size 70x19 + RenderCounter at (490,0) size 70x19 + text run at (490,0) width 70: "mmmcdxci" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 508x19 + RenderText {#text} at (0,0) size 560x19 text run at (0,0) width 7: "i " - text run at (7,0) width 10: "ii " - text run at (17,0) width 13: "iii " - text run at (30,0) width 14: "iv " - text run at (44,0) width 11: "v " - text run at (55,0) width 14: "vi " - text run at (69,0) width 17: "vii " - text run at (86,0) width 20: "viii " - text run at (106,0) width 14: "ix " - text run at (120,0) width 11: "x " - text run at (131,0) width 14: "xi " - text run at (145,0) width 17: "xii " - text run at (162,0) width 24: "xlix " - text run at (186,0) width 7: "l " - text run at (193,0) width 59: "ccclxxxix " - text run at (252,0) width 39: "cccxc " - text run at (291,0) width 86: "mmmcdlxxxix " - text run at (377,0) width 66: "mmmcdxc " - text run at (443,0) width 65: "mmmcdxci" + text run at (7,0) width 12: "ii " + text run at (19,0) width 16: "iii " + text run at (35,0) width 16: "iv " + text run at (51,0) width 11: "v " + text run at (62,0) width 16: "vi " + text run at (78,0) width 20: "vii " + text run at (98,0) width 24: "viii " + text run at (122,0) width 16: "ix " + text run at (138,0) width 11: "x " + text run at (149,0) width 16: "xi " + text run at (165,0) width 20: "xii " + text run at (185,0) width 28: "xlix " + text run at (213,0) width 7: "l " + text run at (220,0) width 65: "ccclxxxix " + text run at (285,0) width 40: "cccxc " + text run at (325,0) width 95: "mmmcdlxxxix " + text run at (420,0) width 70: "mmmcdxc " + text run at (490,0) width 70: "mmmcdxci" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-08-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-08-b-expected.txt index 5f0a28d6d243..876d5d2a40ea 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-08-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-08-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 5x19 RenderInline (generated) at (0,0) size 5x19 @@ -25,119 +25,119 @@ layer at (0,0) size 800x100 text run at (23,0) width 15: "III" RenderText {#text} at (38,0) size 4x19 text run at (38,0) width 4: " " - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (42,0) size 16x19 - text run at (42,0) width 16: "IV" - RenderText {#text} at (58,0) size 4x19 - text run at (58,0) width 4: " " + RenderInline {SPAN} at (0,0) size 17x19 + RenderInline (generated) at (0,0) size 17x19 + RenderCounter at (42,0) size 17x19 + text run at (42,0) width 17: "IV" + RenderText {#text} at (59,0) size 4x19 + text run at (59,0) width 4: " " RenderInline {SPAN} at (0,0) size 11x19 RenderInline (generated) at (0,0) size 11x19 - RenderCounter at (62,0) size 11x19 - text run at (62,0) width 11: "V" - RenderText {#text} at (73,0) size 4x19 - text run at (73,0) width 4: " " - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (77,0) size 16x19 - text run at (77,0) width 16: "VI" - RenderText {#text} at (93,0) size 4x19 - text run at (93,0) width 4: " " - RenderInline {SPAN} at (0,0) size 21x19 - RenderInline (generated) at (0,0) size 21x19 - RenderCounter at (97,0) size 21x19 - text run at (97,0) width 21: "VII" - RenderText {#text} at (118,0) size 4x19 - text run at (118,0) width 4: " " - RenderInline {SPAN} at (0,0) size 26x19 - RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (122,0) size 26x19 - text run at (122,0) width 26: "VIII" - RenderText {#text} at (148,0) size 4x19 - text run at (148,0) width 4: " " - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (152,0) size 16x19 - text run at (152,0) width 16: "IX" - RenderText {#text} at (168,0) size 4x19 - text run at (168,0) width 4: " " + RenderCounter at (63,0) size 11x19 + text run at (63,0) width 11: "V" + RenderText {#text} at (74,0) size 4x19 + text run at (74,0) width 4: " " + RenderInline {SPAN} at (0,0) size 17x19 + RenderInline (generated) at (0,0) size 17x19 + RenderCounter at (78,0) size 17x19 + text run at (78,0) width 17: "VI" + RenderText {#text} at (95,0) size 4x19 + text run at (95,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (99,0) size 22x19 + text run at (99,0) width 22: "VII" + RenderText {#text} at (121,0) size 4x19 + text run at (121,0) width 4: " " + RenderInline {SPAN} at (0,0) size 27x19 + RenderInline (generated) at (0,0) size 27x19 + RenderCounter at (125,0) size 27x19 + text run at (125,0) width 27: "VIII" + RenderText {#text} at (152,0) size 4x19 + text run at (152,0) width 4: " " + RenderInline {SPAN} at (0,0) size 17x19 + RenderInline (generated) at (0,0) size 17x19 + RenderCounter at (156,0) size 17x19 + text run at (156,0) width 17: "IX" + RenderText {#text} at (173,0) size 4x19 + text run at (173,0) width 4: " " RenderInline {SPAN} at (0,0) size 11x19 RenderInline (generated) at (0,0) size 11x19 - RenderCounter at (172,0) size 11x19 - text run at (172,0) width 11: "X" - RenderText {#text} at (183,0) size 4x19 - text run at (183,0) width 4: " " - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (187,0) size 16x19 - text run at (187,0) width 16: "XI" - RenderText {#text} at (203,0) size 4x19 - text run at (203,0) width 4: " " - RenderInline {SPAN} at (0,0) size 21x19 - RenderInline (generated) at (0,0) size 21x19 - RenderCounter at (207,0) size 21x19 - text run at (207,0) width 21: "XII" - RenderText {#text} at (228,0) size 4x19 - text run at (228,0) width 4: " " - RenderInline {SPAN} at (0,0) size 36x19 - RenderInline (generated) at (0,0) size 36x19 - RenderCounter at (232,0) size 36x19 - text run at (232,0) width 36: "XLIX" - RenderText {#text} at (268,0) size 4x19 - text run at (268,0) width 4: " " + RenderCounter at (177,0) size 11x19 + text run at (177,0) width 11: "X" + RenderText {#text} at (188,0) size 4x19 + text run at (188,0) width 4: " " + RenderInline {SPAN} at (0,0) size 17x19 + RenderInline (generated) at (0,0) size 17x19 + RenderCounter at (192,0) size 17x19 + text run at (192,0) width 17: "XI" + RenderText {#text} at (209,0) size 4x19 + text run at (209,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (213,0) size 22x19 + text run at (213,0) width 22: "XII" + RenderText {#text} at (235,0) size 4x19 + text run at (235,0) width 4: " " + RenderInline {SPAN} at (0,0) size 39x19 + RenderInline (generated) at (0,0) size 39x19 + RenderCounter at (239,0) size 39x19 + text run at (239,0) width 39: "XLIX" + RenderText {#text} at (278,0) size 4x19 + text run at (278,0) width 4: " " RenderInline {SPAN} at (0,0) size 9x19 RenderInline (generated) at (0,0) size 9x19 - RenderCounter at (272,0) size 9x19 - text run at (272,0) width 9: "L" - RenderText {#text} at (281,0) size 4x19 - text run at (281,0) width 4: " " - RenderInline {SPAN} at (0,0) size 91x19 - RenderInline (generated) at (0,0) size 91x19 - RenderCounter at (285,0) size 91x19 - text run at (285,0) width 91: "CCCLXXXIX" - RenderText {#text} at (376,0) size 4x19 - text run at (376,0) width 4: " " - RenderInline {SPAN} at (0,0) size 55x19 - RenderInline (generated) at (0,0) size 55x19 - RenderCounter at (380,0) size 55x19 - text run at (380,0) width 55: "CCCXC" - RenderText {#text} at (435,0) size 4x19 - text run at (435,0) width 4: " " - RenderInline {SPAN} at (0,0) size 122x19 - RenderInline (generated) at (0,0) size 122x19 - RenderCounter at (439,0) size 122x19 - text run at (439,0) width 122: "MMMCDLXXXIX" - RenderText {#text} at (561,0) size 4x19 - text run at (561,0) width 4: " " - RenderInline {SPAN} at (0,0) size 86x19 - RenderInline (generated) at (0,0) size 86x19 - RenderCounter at (565,0) size 86x19 - text run at (565,0) width 86: "MMMCDXC" - RenderText {#text} at (651,0) size 4x19 - text run at (651,0) width 4: " " - RenderInline {SPAN} at (0,0) size 91x19 - RenderInline (generated) at (0,0) size 91x19 - RenderCounter at (655,0) size 91x19 - text run at (655,0) width 91: "MMMCDXCI" + RenderCounter at (282,0) size 9x19 + text run at (282,0) width 9: "L" + RenderText {#text} at (291,0) size 4x19 + text run at (291,0) width 4: " " + RenderInline {SPAN} at (0,0) size 96x19 + RenderInline (generated) at (0,0) size 96x19 + RenderCounter at (295,0) size 96x19 + text run at (295,0) width 96: "CCCLXXXIX" + RenderText {#text} at (391,0) size 4x19 + text run at (391,0) width 4: " " + RenderInline {SPAN} at (0,0) size 56x19 + RenderInline (generated) at (0,0) size 56x19 + RenderCounter at (395,0) size 56x19 + text run at (395,0) width 56: "CCCXC" + RenderText {#text} at (451,0) size 4x19 + text run at (451,0) width 4: " " + RenderInline {SPAN} at (0,0) size 128x19 + RenderInline (generated) at (0,0) size 128x19 + RenderCounter at (455,0) size 128x19 + text run at (455,0) width 128: "MMMCDLXXXIX" + RenderText {#text} at (583,0) size 4x19 + text run at (583,0) width 4: " " + RenderInline {SPAN} at (0,0) size 88x19 + RenderInline (generated) at (0,0) size 88x19 + RenderCounter at (587,0) size 88x19 + text run at (587,0) width 88: "MMMCDXC" + RenderText {#text} at (675,0) size 4x19 + text run at (675,0) width 4: " " + RenderInline {SPAN} at (0,0) size 93x19 + RenderInline (generated) at (0,0) size 93x19 + RenderCounter at (679,0) size 93x19 + text run at (679,0) width 93: "MMMCDXCI" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 746x19 + RenderText {#text} at (0,0) size 772x19 text run at (0,0) width 9: "I " text run at (9,0) width 14: "II " text run at (23,0) width 19: "III " - text run at (42,0) width 20: "IV " - text run at (62,0) width 15: "V " - text run at (77,0) width 20: "VI " - text run at (97,0) width 25: "VII " - text run at (122,0) width 30: "VIII " - text run at (152,0) width 20: "IX " - text run at (172,0) width 15: "X " - text run at (187,0) width 20: "XI " - text run at (207,0) width 25: "XII " - text run at (232,0) width 40: "XLIX " - text run at (272,0) width 13: "L " - text run at (285,0) width 95: "CCCLXXXIX " - text run at (380,0) width 59: "CCCXC " - text run at (439,0) width 126: "MMMCDLXXXIX " - text run at (565,0) width 90: "MMMCDXC " - text run at (655,0) width 91: "MMMCDXCI" + text run at (42,0) width 21: "IV " + text run at (63,0) width 15: "V " + text run at (78,0) width 21: "VI " + text run at (99,0) width 26: "VII " + text run at (125,0) width 31: "VIII " + text run at (156,0) width 21: "IX " + text run at (177,0) width 15: "X " + text run at (192,0) width 21: "XI " + text run at (213,0) width 26: "XII " + text run at (239,0) width 43: "XLIX " + text run at (282,0) width 13: "L " + text run at (295,0) width 100: "CCCLXXXIX " + text run at (395,0) width 60: "CCCXC " + text run at (455,0) width 132: "MMMCDLXXXIX " + text run at (587,0) width 92: "MMMCDXC " + text run at (679,0) width 93: "MMMCDXCI" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-09-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-09-b-expected.txt index 3ac07cdf643d..f2f6bb4c4212 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-09-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-09-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x102 RenderBlock {HTML} at (0,0) size 800x102 RenderBody {BODY} at (8,16) size 784x78 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x21 RenderInline {SPAN} at (0,0) size 8x19 RenderInline (generated) at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-11-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-11-b-expected.txt index 599a8e8b4fa2..f1461bc42bcd 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-11-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-11-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 7x19 RenderInline (generated) at (0,0) size 7x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-12-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-12-b-expected.txt index 599a8e8b4fa2..f1461bc42bcd 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-12-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-12-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 7x19 RenderInline (generated) at (0,0) size 7x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-13-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-13-b-expected.txt index bf4fad586498..9aa69d897f25 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-13-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-13-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 11x19 RenderInline (generated) at (0,0) size 11x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-14-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-14-b-expected.txt index bf4fad586498..9aa69d897f25 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-14-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-14-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 11x19 RenderInline (generated) at (0,0) size 11x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-15-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-15-b-expected.txt index 7bd646942df2..d5293d8e9f12 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-15-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-15-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 8x19 RenderInline (generated) at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counter-16-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counter-16-f-expected.txt index e7cb316efa30..d625a75cabf7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counter-16-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counter-16-f-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 8x19 RenderInline (generated) at (0,0) size 8x19 @@ -67,19 +67,19 @@ layer at (0,0) size 800x100 text run at (108,0) width 16: "10" RenderText {#text} at (124,0) size 4x19 text run at (124,0) width 4: " " + RenderInline {SPAN} at (0,0) size 15x19 + RenderInline (generated) at (0,0) size 15x19 + RenderCounter at (128,0) size 15x19 + text run at (128,0) width 15: "11" + RenderText {#text} at (143,0) size 4x19 + text run at (143,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (128,0) size 16x19 - text run at (128,0) width 16: "11" - RenderText {#text} at (144,0) size 4x19 - text run at (144,0) width 4: " " - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (148,0) size 16x19 - text run at (148,0) width 16: "12" + RenderCounter at (147,0) size 16x19 + text run at (147,0) width 16: "12" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 164x19 + RenderText {#text} at (0,0) size 163x19 text run at (0,0) width 12: "1 " text run at (12,0) width 12: "2 " text run at (24,0) width 12: "3 " @@ -90,5 +90,5 @@ layer at (0,0) size 800x100 text run at (84,0) width 12: "8 " text run at (96,0) width 12: "9 " text run at (108,0) width 20: "10 " - text run at (128,0) width 20: "11 " - text run at (148,0) width 16: "12" + text run at (128,0) width 19: "11 " + text run at (147,0) width 16: "12" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-00-b-expected.txt index 90344ad7d144..75999db0abc5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-00-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 20x19 RenderInline (generated) at (0,0) size 20x19 @@ -67,19 +67,19 @@ layer at (0,0) size 800x100 text run at (216,0) width 28: "1.10" RenderText {#text} at (244,0) size 4x19 text run at (244,0) width 4: " " + RenderInline {SPAN} at (0,0) size 27x19 + RenderInline (generated) at (0,0) size 27x19 + RenderCounter at (248,0) size 27x19 + text run at (248,0) width 27: "1.11" + RenderText {#text} at (275,0) size 4x19 + text run at (275,0) width 4: " " RenderInline {SPAN} at (0,0) size 28x19 RenderInline (generated) at (0,0) size 28x19 - RenderCounter at (248,0) size 28x19 - text run at (248,0) width 28: "1.11" - RenderText {#text} at (276,0) size 4x19 - text run at (276,0) width 4: " " - RenderInline {SPAN} at (0,0) size 28x19 - RenderInline (generated) at (0,0) size 28x19 - RenderCounter at (280,0) size 28x19 - text run at (280,0) width 28: "1.12" + RenderCounter at (279,0) size 28x19 + text run at (279,0) width 28: "1.12" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 308x19 + RenderText {#text} at (0,0) size 307x19 text run at (0,0) width 24: "1.1 " text run at (24,0) width 24: "1.2 " text run at (48,0) width 24: "1.3 " @@ -90,5 +90,5 @@ layer at (0,0) size 800x100 text run at (168,0) width 24: "1.8 " text run at (192,0) width 24: "1.9 " text run at (216,0) width 32: "1.10 " - text run at (248,0) width 32: "1.11 " - text run at (280,0) width 28: "1.12" + text run at (248,0) width 31: "1.11 " + text run at (279,0) width 28: "1.12" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-01-b-expected.txt index 6bfa785f2ae3..ef61e1c3159c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-01-b-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 216x19 - text run at (0,0) width 216: "The following two lines should look " - RenderInline {EM} at (0,0) size 93x19 - RenderText {#text} at (216,0) size 93x19 - text run at (216,0) width 93: "approximately" - RenderText {#text} at (309,0) size 60x19 - text run at (309,0) width 60: " the same:" + RenderText {#text} at (0,0) size 233x19 + text run at (0,0) width 233: "The following two lines should look " + RenderInline {EM} at (0,0) size 91x19 + RenderText {#text} at (233,0) size 91x19 + text run at (233,0) width 91: "approximately" + RenderText {#text} at (324,0) size 63x19 + text run at (324,0) width 63: " the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 10x19 RenderInline (generated) at (0,0) size 10x19 @@ -108,16 +108,16 @@ layer at (0,0) size 800x100 text run at (158,0) width 6: "z" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 164x19 - text run at (0,0) width 14: ".z " - text run at (14,0) width 14: ".z " - text run at (28,0) width 14: ".z " - text run at (42,0) width 14: ".z " - text run at (56,0) width 14: ".z " - text run at (70,0) width 14: ".z " - text run at (84,0) width 14: ".z " - text run at (98,0) width 14: ".z " - text run at (112,0) width 14: ".z " - text run at (126,0) width 14: ".z " - text run at (140,0) width 14: ".z " - text run at (154,0) width 10: ".z" + RenderText {#text} at (0,0) size 176x19 + text run at (0,0) width 15: ".z " + text run at (15,0) width 15: ".z " + text run at (30,0) width 15: ".z " + text run at (45,0) width 15: ".z " + text run at (60,0) width 15: ".z " + text run at (75,0) width 15: ".z " + text run at (90,0) width 15: ".z " + text run at (105,0) width 15: ".z " + text run at (120,0) width 15: ".z " + text run at (135,0) width 15: ".z " + text run at (150,0) width 15: ".z " + text run at (165,0) width 11: ".z" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-02-b-expected.txt index 4a138e96f4f6..0a2f84985f8a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-02-b-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 216x19 - text run at (0,0) width 216: "The following two lines should look " - RenderInline {EM} at (0,0) size 93x19 - RenderText {#text} at (216,0) size 93x19 - text run at (216,0) width 93: "approximately" - RenderText {#text} at (309,0) size 60x19 - text run at (309,0) width 60: " the same:" + RenderText {#text} at (0,0) size 233x19 + text run at (0,0) width 233: "The following two lines should look " + RenderInline {EM} at (0,0) size 91x19 + RenderText {#text} at (233,0) size 91x19 + text run at (233,0) width 91: "approximately" + RenderText {#text} at (324,0) size 63x19 + text run at (324,0) width 63: " the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-03-b-expected.txt index 563901891070..f565f0e73d80 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-03-b-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 216x19 - text run at (0,0) width 216: "The following two lines should look " - RenderInline {EM} at (0,0) size 93x19 - RenderText {#text} at (216,0) size 93x19 - text run at (216,0) width 93: "approximately" - RenderText {#text} at (309,0) size 60x19 - text run at (309,0) width 60: " the same:" + RenderText {#text} at (0,0) size 233x19 + text run at (0,0) width 233: "The following two lines should look " + RenderInline {EM} at (0,0) size 91x19 + RenderText {#text} at (233,0) size 91x19 + text run at (233,0) width 91: "approximately" + RenderText {#text} at (324,0) size 63x19 + text run at (324,0) width 63: " the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-04-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-04-b-expected.txt index 292778b8aa45..232338600d74 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-04-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-04-b-expected.txt @@ -4,84 +4,84 @@ layer at (0,0) size 800x102 RenderBlock {HTML} at (0,0) size 800x102 RenderBody {BODY} at (8,16) size 784x78 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 216x19 - text run at (0,0) width 216: "The following two lines should look " - RenderInline {EM} at (0,0) size 93x19 - RenderText {#text} at (216,0) size 93x19 - text run at (216,0) width 93: "approximately" - RenderText {#text} at (309,0) size 60x19 - text run at (309,0) width 60: " the same:" + RenderText {#text} at (0,0) size 233x19 + text run at (0,0) width 233: "The following two lines should look " + RenderInline {EM} at (0,0) size 91x19 + RenderText {#text} at (233,0) size 91x19 + text run at (233,0) width 91: "approximately" + RenderText {#text} at (324,0) size 63x19 + text run at (324,0) width 63: " the same:" RenderBlock {DIV} at (0,36) size 784x20 - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (0,0) size 22x19 - text run at (0,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (22,0) size 4x19 - text run at (22,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (26,0) size 22x19 - text run at (26,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (48,0) size 4x19 - text run at (48,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (52,0) size 22x19 - text run at (52,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (74,0) size 4x19 - text run at (74,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (78,0) size 22x19 - text run at (78,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (100,0) size 4x19 - text run at (100,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (104,0) size 22x19 - text run at (104,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (126,0) size 4x19 - text run at (126,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (130,0) size 22x19 - text run at (130,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (152,0) size 4x19 - text run at (152,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (156,0) size 22x19 - text run at (156,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (178,0) size 4x19 - text run at (178,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (182,0) size 22x19 - text run at (182,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (204,0) size 4x19 - text run at (204,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (208,0) size 22x19 - text run at (208,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (230,0) size 4x19 - text run at (230,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (234,0) size 22x19 - text run at (234,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (256,0) size 4x19 - text run at (256,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (260,0) size 22x19 - text run at (260,0) width 22: "\x{25A0}.\x{25A0}" - RenderText {#text} at (282,0) size 4x19 - text run at (282,0) width 4: " " - RenderInline {SPAN} at (0,0) size 22x19 - RenderInline (generated) at (0,0) size 22x19 - RenderCounter at (286,0) size 22x19 - text run at (286,0) width 22: "\x{25A0}.\x{25A0}" + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (0,0) size 24x19 + text run at (0,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (24,0) size 4x19 + text run at (24,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (28,0) size 24x19 + text run at (28,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (52,0) size 4x19 + text run at (52,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (56,0) size 24x19 + text run at (56,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (80,0) size 4x19 + text run at (80,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (84,0) size 24x19 + text run at (84,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (108,0) size 4x19 + text run at (108,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (112,0) size 24x19 + text run at (112,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (136,0) size 4x19 + text run at (136,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (140,0) size 24x19 + text run at (140,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (164,0) size 4x19 + text run at (164,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (168,0) size 24x19 + text run at (168,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (192,0) size 4x19 + text run at (192,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (196,0) size 24x19 + text run at (196,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (220,0) size 4x19 + text run at (220,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (224,0) size 24x19 + text run at (224,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (248,0) size 4x19 + text run at (248,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (252,0) size 24x19 + text run at (252,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (276,0) size 4x19 + text run at (276,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (280,0) size 24x19 + text run at (280,0) width 24: "\x{25A0}.\x{25A0}" + RenderText {#text} at (304,0) size 4x19 + text run at (304,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (308,0) size 24x19 + text run at (308,0) width 24: "\x{25A0}.\x{25A0}" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x22 RenderText {#text} at (0,2) size 428x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-05-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-05-b-expected.txt index 90344ad7d144..75999db0abc5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-05-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-05-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 20x19 RenderInline (generated) at (0,0) size 20x19 @@ -67,19 +67,19 @@ layer at (0,0) size 800x100 text run at (216,0) width 28: "1.10" RenderText {#text} at (244,0) size 4x19 text run at (244,0) width 4: " " + RenderInline {SPAN} at (0,0) size 27x19 + RenderInline (generated) at (0,0) size 27x19 + RenderCounter at (248,0) size 27x19 + text run at (248,0) width 27: "1.11" + RenderText {#text} at (275,0) size 4x19 + text run at (275,0) width 4: " " RenderInline {SPAN} at (0,0) size 28x19 RenderInline (generated) at (0,0) size 28x19 - RenderCounter at (248,0) size 28x19 - text run at (248,0) width 28: "1.11" - RenderText {#text} at (276,0) size 4x19 - text run at (276,0) width 4: " " - RenderInline {SPAN} at (0,0) size 28x19 - RenderInline (generated) at (0,0) size 28x19 - RenderCounter at (280,0) size 28x19 - text run at (280,0) width 28: "1.12" + RenderCounter at (279,0) size 28x19 + text run at (279,0) width 28: "1.12" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 308x19 + RenderText {#text} at (0,0) size 307x19 text run at (0,0) width 24: "1.1 " text run at (24,0) width 24: "1.2 " text run at (48,0) width 24: "1.3 " @@ -90,5 +90,5 @@ layer at (0,0) size 800x100 text run at (168,0) width 24: "1.8 " text run at (192,0) width 24: "1.9 " text run at (216,0) width 32: "1.10 " - text run at (248,0) width 32: "1.11 " - text run at (280,0) width 28: "1.12" + text run at (248,0) width 31: "1.11 " + text run at (279,0) width 28: "1.12" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-06-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-06-b-expected.txt index 7243ba5ec6e1..168926c75eab 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-06-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-06-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 36x19 RenderInline (generated) at (0,0) size 36x19 @@ -67,37 +67,37 @@ layer at (0,0) size 800x100 text run at (360,0) width 36: "01.10" RenderText {#text} at (396,0) size 4x19 text run at (396,0) width 4: " " + RenderInline {SPAN} at (0,0) size 35x19 + RenderInline (generated) at (0,0) size 35x19 + RenderCounter at (400,0) size 35x19 + text run at (400,0) width 35: "01.11" + RenderText {#text} at (435,0) size 4x19 + text run at (435,0) width 4: " " RenderInline {SPAN} at (0,0) size 36x19 RenderInline (generated) at (0,0) size 36x19 - RenderCounter at (400,0) size 36x19 - text run at (400,0) width 36: "01.11" - RenderText {#text} at (436,0) size 4x19 - text run at (436,0) width 4: " " + RenderCounter at (439,0) size 36x19 + text run at (439,0) width 36: "01.12" + RenderText {#text} at (475,0) size 4x19 + text run at (475,0) width 4: " " RenderInline {SPAN} at (0,0) size 36x19 RenderInline (generated) at (0,0) size 36x19 - RenderCounter at (440,0) size 36x19 - text run at (440,0) width 36: "01.12" - RenderText {#text} at (476,0) size 4x19 - text run at (476,0) width 4: " " - RenderInline {SPAN} at (0,0) size 36x19 - RenderInline (generated) at (0,0) size 36x19 - RenderCounter at (480,0) size 36x19 - text run at (480,0) width 36: "01.99" - RenderText {#text} at (516,0) size 4x19 - text run at (516,0) width 4: " " + RenderCounter at (479,0) size 36x19 + text run at (479,0) width 36: "01.99" + RenderText {#text} at (515,0) size 4x19 + text run at (515,0) width 4: " " RenderInline {SPAN} at (0,0) size 44x19 RenderInline (generated) at (0,0) size 44x19 - RenderCounter at (520,0) size 44x19 - text run at (520,0) width 44: "01.100" - RenderText {#text} at (564,0) size 4x19 - text run at (564,0) width 4: " " + RenderCounter at (519,0) size 44x19 + text run at (519,0) width 44: "01.100" + RenderText {#text} at (563,0) size 4x19 + text run at (563,0) width 4: " " RenderInline {SPAN} at (0,0) size 44x19 RenderInline (generated) at (0,0) size 44x19 - RenderCounter at (568,0) size 44x19 - text run at (568,0) width 44: "01.101" + RenderCounter at (567,0) size 44x19 + text run at (567,0) width 44: "01.101" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 612x19 + RenderText {#text} at (0,0) size 611x19 text run at (0,0) width 40: "01.01 " text run at (40,0) width 40: "01.02 " text run at (80,0) width 40: "01.03 " @@ -108,8 +108,8 @@ layer at (0,0) size 800x100 text run at (280,0) width 40: "01.08 " text run at (320,0) width 40: "01.09 " text run at (360,0) width 40: "01.10 " - text run at (400,0) width 40: "01.11 " - text run at (440,0) width 40: "01.12 " - text run at (480,0) width 40: "01.99 " - text run at (520,0) width 48: "01.100 " - text run at (568,0) width 44: "01.101" + text run at (400,0) width 39: "01.11 " + text run at (439,0) width 40: "01.12 " + text run at (479,0) width 40: "01.99 " + text run at (519,0) width 48: "01.100 " + text run at (567,0) width 44: "01.101" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-07-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-07-b-expected.txt index 1c1e2503cc24..8cb24e1de3a7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-07-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-07-b-expected.txt @@ -4,140 +4,140 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 - RenderInline {SPAN} at (0,0) size 10x19 - RenderInline (generated) at (0,0) size 10x19 - RenderCounter at (0,0) size 10x19 - text run at (0,0) width 10: "i.i" - RenderText {#text} at (10,0) size 4x19 - text run at (10,0) width 4: " " - RenderInline {SPAN} at (0,0) size 13x19 - RenderInline (generated) at (0,0) size 13x19 - RenderCounter at (14,0) size 13x19 - text run at (14,0) width 13: "i.ii" - RenderText {#text} at (27,0) size 4x19 - text run at (27,0) width 4: " " + RenderInline {SPAN} at (0,0) size 12x19 + RenderInline (generated) at (0,0) size 12x19 + RenderCounter at (0,0) size 12x19 + text run at (0,0) width 12: "i.i" + RenderText {#text} at (12,0) size 4x19 + text run at (12,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (31,0) size 16x19 - text run at (31,0) width 16: "i.iii" - RenderText {#text} at (47,0) size 4x19 - text run at (47,0) width 4: " " - RenderInline {SPAN} at (0,0) size 17x19 - RenderInline (generated) at (0,0) size 17x19 - RenderCounter at (51,0) size 17x19 - text run at (51,0) width 17: "i.iv" - RenderText {#text} at (68,0) size 4x19 - text run at (68,0) width 4: " " - RenderInline {SPAN} at (0,0) size 14x19 - RenderInline (generated) at (0,0) size 14x19 - RenderCounter at (72,0) size 14x19 - text run at (72,0) width 14: "i.v" - RenderText {#text} at (86,0) size 4x19 - text run at (86,0) width 4: " " - RenderInline {SPAN} at (0,0) size 17x19 - RenderInline (generated) at (0,0) size 17x19 - RenderCounter at (90,0) size 17x19 - text run at (90,0) width 17: "i.vi" - RenderText {#text} at (107,0) size 4x19 - text run at (107,0) width 4: " " + RenderCounter at (16,0) size 16x19 + text run at (16,0) width 16: "i.ii" + RenderText {#text} at (32,0) size 4x19 + text run at (32,0) width 4: " " RenderInline {SPAN} at (0,0) size 20x19 RenderInline (generated) at (0,0) size 20x19 - RenderCounter at (111,0) size 20x19 - text run at (111,0) width 20: "i.vii" - RenderText {#text} at (131,0) size 4x19 - text run at (131,0) width 4: " " - RenderInline {SPAN} at (0,0) size 23x19 - RenderInline (generated) at (0,0) size 23x19 - RenderCounter at (135,0) size 23x19 - text run at (135,0) width 23: "i.viii" - RenderText {#text} at (158,0) size 4x19 - text run at (158,0) width 4: " " - RenderInline {SPAN} at (0,0) size 17x19 - RenderInline (generated) at (0,0) size 17x19 - RenderCounter at (162,0) size 17x19 - text run at (162,0) width 17: "i.ix" - RenderText {#text} at (179,0) size 4x19 - text run at (179,0) width 4: " " - RenderInline {SPAN} at (0,0) size 14x19 - RenderInline (generated) at (0,0) size 14x19 - RenderCounter at (183,0) size 14x19 - text run at (183,0) width 14: "i.x" - RenderText {#text} at (197,0) size 4x19 - text run at (197,0) width 4: " " - RenderInline {SPAN} at (0,0) size 17x19 - RenderInline (generated) at (0,0) size 17x19 - RenderCounter at (201,0) size 17x19 - text run at (201,0) width 17: "i.xi" - RenderText {#text} at (218,0) size 4x19 - text run at (218,0) width 4: " " + RenderCounter at (36,0) size 20x19 + text run at (36,0) width 20: "i.iii" + RenderText {#text} at (56,0) size 4x19 + text run at (56,0) width 4: " " RenderInline {SPAN} at (0,0) size 20x19 RenderInline (generated) at (0,0) size 20x19 - RenderCounter at (222,0) size 20x19 - text run at (222,0) width 20: "i.xii" - RenderText {#text} at (242,0) size 4x19 - text run at (242,0) width 4: " " - RenderInline {SPAN} at (0,0) size 27x19 - RenderInline (generated) at (0,0) size 27x19 - RenderCounter at (246,0) size 27x19 - text run at (246,0) width 27: "i.xlix" - RenderText {#text} at (273,0) size 4x19 - text run at (273,0) width 4: " " - RenderInline {SPAN} at (0,0) size 10x19 - RenderInline (generated) at (0,0) size 10x19 - RenderCounter at (277,0) size 10x19 - text run at (277,0) width 10: "i.l" - RenderText {#text} at (287,0) size 4x19 - text run at (287,0) width 4: " " - RenderInline {SPAN} at (0,0) size 62x19 - RenderInline (generated) at (0,0) size 62x19 - RenderCounter at (291,0) size 62x19 - text run at (291,0) width 62: "i.ccclxxxix" - RenderText {#text} at (353,0) size 4x19 - text run at (353,0) width 4: " " - RenderInline {SPAN} at (0,0) size 42x19 - RenderInline (generated) at (0,0) size 42x19 - RenderCounter at (357,0) size 42x19 - text run at (357,0) width 42: "i.cccxc" - RenderText {#text} at (399,0) size 4x19 - text run at (399,0) width 4: " " - RenderInline {SPAN} at (0,0) size 89x19 - RenderInline (generated) at (0,0) size 89x19 - RenderCounter at (403,0) size 89x19 - text run at (403,0) width 89: "i.mmmcdlxxxix" - RenderText {#text} at (492,0) size 4x19 - text run at (492,0) width 4: " " + RenderCounter at (60,0) size 20x19 + text run at (60,0) width 20: "i.iv" + RenderText {#text} at (80,0) size 4x19 + text run at (80,0) width 4: " " + RenderInline {SPAN} at (0,0) size 16x19 + RenderInline (generated) at (0,0) size 16x19 + RenderCounter at (84,0) size 16x19 + text run at (84,0) width 16: "i.v" + RenderText {#text} at (100,0) size 4x19 + text run at (100,0) width 4: " " + RenderInline {SPAN} at (0,0) size 20x19 + RenderInline (generated) at (0,0) size 20x19 + RenderCounter at (104,0) size 20x19 + text run at (104,0) width 20: "i.vi" + RenderText {#text} at (124,0) size 4x19 + text run at (124,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (128,0) size 24x19 + text run at (128,0) width 24: "i.vii" + RenderText {#text} at (152,0) size 4x19 + text run at (152,0) width 4: " " + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (156,0) size 28x19 + text run at (156,0) width 28: "i.viii" + RenderText {#text} at (184,0) size 4x19 + text run at (184,0) width 4: " " + RenderInline {SPAN} at (0,0) size 20x19 + RenderInline (generated) at (0,0) size 20x19 + RenderCounter at (188,0) size 20x19 + text run at (188,0) width 20: "i.ix" + RenderText {#text} at (208,0) size 4x19 + text run at (208,0) width 4: " " + RenderInline {SPAN} at (0,0) size 16x19 + RenderInline (generated) at (0,0) size 16x19 + RenderCounter at (212,0) size 16x19 + text run at (212,0) width 16: "i.x" + RenderText {#text} at (228,0) size 4x19 + text run at (228,0) width 4: " " + RenderInline {SPAN} at (0,0) size 20x19 + RenderInline (generated) at (0,0) size 20x19 + RenderCounter at (232,0) size 20x19 + text run at (232,0) width 20: "i.xi" + RenderText {#text} at (252,0) size 4x19 + text run at (252,0) width 4: " " + RenderInline {SPAN} at (0,0) size 24x19 + RenderInline (generated) at (0,0) size 24x19 + RenderCounter at (256,0) size 24x19 + text run at (256,0) width 24: "i.xii" + RenderText {#text} at (280,0) size 4x19 + text run at (280,0) width 4: " " + RenderInline {SPAN} at (0,0) size 32x19 + RenderInline (generated) at (0,0) size 32x19 + RenderCounter at (284,0) size 32x19 + text run at (284,0) width 32: "i.xlix" + RenderText {#text} at (316,0) size 4x19 + text run at (316,0) width 4: " " + RenderInline {SPAN} at (0,0) size 12x19 + RenderInline (generated) at (0,0) size 12x19 + RenderCounter at (320,0) size 12x19 + text run at (320,0) width 12: "i.l" + RenderText {#text} at (332,0) size 4x19 + text run at (332,0) width 4: " " RenderInline {SPAN} at (0,0) size 69x19 RenderInline (generated) at (0,0) size 69x19 - RenderCounter at (496,0) size 69x19 - text run at (496,0) width 69: "i.mmmcdxc" - RenderText {#text} at (565,0) size 4x19 - text run at (565,0) width 4: " " - RenderInline {SPAN} at (0,0) size 72x19 - RenderInline (generated) at (0,0) size 72x19 - RenderCounter at (569,0) size 72x19 - text run at (569,0) width 72: "i.mmmcdxci" + RenderCounter at (336,0) size 69x19 + text run at (336,0) width 69: "i.ccclxxxix" + RenderText {#text} at (405,0) size 4x19 + text run at (405,0) width 4: " " + RenderInline {SPAN} at (0,0) size 44x19 + RenderInline (generated) at (0,0) size 44x19 + RenderCounter at (409,0) size 44x19 + text run at (409,0) width 44: "i.cccxc" + RenderText {#text} at (453,0) size 4x19 + text run at (453,0) width 4: " " + RenderInline {SPAN} at (0,0) size 99x19 + RenderInline (generated) at (0,0) size 99x19 + RenderCounter at (457,0) size 99x19 + text run at (457,0) width 99: "i.mmmcdlxxxix" + RenderText {#text} at (556,0) size 4x19 + text run at (556,0) width 4: " " + RenderInline {SPAN} at (0,0) size 74x19 + RenderInline (generated) at (0,0) size 74x19 + RenderCounter at (560,0) size 74x19 + text run at (560,0) width 74: "i.mmmcdxc" + RenderText {#text} at (634,0) size 4x19 + text run at (634,0) width 4: " " + RenderInline {SPAN} at (0,0) size 78x19 + RenderInline (generated) at (0,0) size 78x19 + RenderCounter at (638,0) size 78x19 + text run at (638,0) width 78: "i.mmmcdxci" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 641x19 - text run at (0,0) width 14: "i.i " - text run at (14,0) width 17: "i.ii " - text run at (31,0) width 20: "i.iii " - text run at (51,0) width 21: "i.iv " - text run at (72,0) width 18: "i.v " - text run at (90,0) width 21: "i.vi " - text run at (111,0) width 24: "i.vii " - text run at (135,0) width 27: "i.viii " - text run at (162,0) width 21: "i.ix " - text run at (183,0) width 18: "i.x " - text run at (201,0) width 21: "i.xi " - text run at (222,0) width 24: "i.xii " - text run at (246,0) width 31: "i.xlix " - text run at (277,0) width 14: "i.l " - text run at (291,0) width 66: "i.ccclxxxix " - text run at (357,0) width 46: "i.cccxc " - text run at (403,0) width 93: "i.mmmcdlxxxix " - text run at (496,0) width 73: "i.mmmcdxc " - text run at (569,0) width 72: "i.mmmcdxci" + RenderText {#text} at (0,0) size 716x19 + text run at (0,0) width 16: "i.i " + text run at (16,0) width 20: "i.ii " + text run at (36,0) width 24: "i.iii " + text run at (60,0) width 24: "i.iv " + text run at (84,0) width 20: "i.v " + text run at (104,0) width 24: "i.vi " + text run at (128,0) width 28: "i.vii " + text run at (156,0) width 32: "i.viii " + text run at (188,0) width 24: "i.ix " + text run at (212,0) width 20: "i.x " + text run at (232,0) width 24: "i.xi " + text run at (256,0) width 28: "i.xii " + text run at (284,0) width 36: "i.xlix " + text run at (320,0) width 16: "i.l " + text run at (336,0) width 73: "i.ccclxxxix " + text run at (409,0) width 48: "i.cccxc " + text run at (457,0) width 103: "i.mmmcdlxxxix " + text run at (560,0) width 78: "i.mmmcdxc " + text run at (638,0) width 78: "i.mmmcdxci" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-08-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-08-b-expected.txt index 52a509a28fbe..18d830470d68 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-08-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-08-b-expected.txt @@ -1,11 +1,11 @@ -layer at (0,0) size 925x585 +layer at (0,0) size 954x585 RenderView at (0,0) size 800x585 layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 14x19 RenderInline (generated) at (0,0) size 14x19 @@ -25,119 +25,119 @@ layer at (0,0) size 800x100 text run at (41,0) width 24: "I.III" RenderText {#text} at (65,0) size 4x19 text run at (65,0) width 4: " " - RenderInline {SPAN} at (0,0) size 25x19 - RenderInline (generated) at (0,0) size 25x19 - RenderCounter at (69,0) size 25x19 - text run at (69,0) width 25: "I.IV" - RenderText {#text} at (94,0) size 4x19 - text run at (94,0) width 4: " " - RenderInline {SPAN} at (0,0) size 20x19 - RenderInline (generated) at (0,0) size 20x19 - RenderCounter at (98,0) size 20x19 - text run at (98,0) width 20: "I.V" - RenderText {#text} at (118,0) size 4x19 - text run at (118,0) width 4: " " - RenderInline {SPAN} at (0,0) size 25x19 - RenderInline (generated) at (0,0) size 25x19 - RenderCounter at (122,0) size 25x19 - text run at (122,0) width 25: "I.VI" - RenderText {#text} at (147,0) size 4x19 - text run at (147,0) width 4: " " - RenderInline {SPAN} at (0,0) size 30x19 - RenderInline (generated) at (0,0) size 30x19 - RenderCounter at (151,0) size 30x19 - text run at (151,0) width 30: "I.VII" - RenderText {#text} at (181,0) size 4x19 - text run at (181,0) width 4: " " - RenderInline {SPAN} at (0,0) size 35x19 - RenderInline (generated) at (0,0) size 35x19 - RenderCounter at (185,0) size 35x19 - text run at (185,0) width 35: "I.VIII" - RenderText {#text} at (220,0) size 4x19 - text run at (220,0) width 4: " " - RenderInline {SPAN} at (0,0) size 25x19 - RenderInline (generated) at (0,0) size 25x19 - RenderCounter at (224,0) size 25x19 - text run at (224,0) width 25: "I.IX" - RenderText {#text} at (249,0) size 4x19 - text run at (249,0) width 4: " " - RenderInline {SPAN} at (0,0) size 20x19 - RenderInline (generated) at (0,0) size 20x19 - RenderCounter at (253,0) size 20x19 - text run at (253,0) width 20: "I.X" - RenderText {#text} at (273,0) size 4x19 - text run at (273,0) width 4: " " - RenderInline {SPAN} at (0,0) size 25x19 - RenderInline (generated) at (0,0) size 25x19 - RenderCounter at (277,0) size 25x19 - text run at (277,0) width 25: "I.XI" - RenderText {#text} at (302,0) size 4x19 - text run at (302,0) width 4: " " - RenderInline {SPAN} at (0,0) size 30x19 - RenderInline (generated) at (0,0) size 30x19 - RenderCounter at (306,0) size 30x19 - text run at (306,0) width 30: "I.XII" - RenderText {#text} at (336,0) size 4x19 - text run at (336,0) width 4: " " - RenderInline {SPAN} at (0,0) size 45x19 - RenderInline (generated) at (0,0) size 45x19 - RenderCounter at (340,0) size 45x19 - text run at (340,0) width 45: "I.XLIX" - RenderText {#text} at (385,0) size 4x19 - text run at (385,0) width 4: " " - RenderInline {SPAN} at (0,0) size 18x19 - RenderInline (generated) at (0,0) size 18x19 - RenderCounter at (389,0) size 18x19 - text run at (389,0) width 18: "I.L" - RenderText {#text} at (407,0) size 4x19 - text run at (407,0) width 4: " " - RenderInline {SPAN} at (0,0) size 100x19 - RenderInline (generated) at (0,0) size 100x19 - RenderCounter at (411,0) size 100x19 - text run at (411,0) width 100: "I.CCCLXXXIX" - RenderText {#text} at (511,0) size 4x19 - text run at (511,0) width 4: " " - RenderInline {SPAN} at (0,0) size 64x19 - RenderInline (generated) at (0,0) size 64x19 - RenderCounter at (515,0) size 64x19 - text run at (515,0) width 64: "I.CCCXC" - RenderText {#text} at (579,0) size 4x19 - text run at (579,0) width 4: " " - RenderInline {SPAN} at (0,0) size 131x19 - RenderInline (generated) at (0,0) size 131x19 - RenderCounter at (583,0) size 131x19 - text run at (583,0) width 131: "I.MMMCDLXXXIX" - RenderText {#text} at (714,0) size 4x19 - text run at (714,0) width 4: " " - RenderInline {SPAN} at (0,0) size 95x19 - RenderInline (generated) at (0,0) size 95x19 - RenderCounter at (718,0) size 95x19 - text run at (718,0) width 95: "I.MMMCDXC" - RenderText {#text} at (813,0) size 4x19 - text run at (813,0) width 4: " " - RenderInline {SPAN} at (0,0) size 100x19 - RenderInline (generated) at (0,0) size 100x19 - RenderCounter at (817,0) size 100x19 - text run at (817,0) width 100: "I.MMMCDXCI" + RenderInline {SPAN} at (0,0) size 26x19 + RenderInline (generated) at (0,0) size 26x19 + RenderCounter at (69,0) size 26x19 + text run at (69,0) width 26: "I.IV" + RenderText {#text} at (95,0) size 4x19 + text run at (95,0) width 4: " " + RenderInline {SPAN} at (0,0) size 21x19 + RenderInline (generated) at (0,0) size 21x19 + RenderCounter at (99,0) size 21x19 + text run at (99,0) width 21: "I.V" + RenderText {#text} at (120,0) size 4x19 + text run at (120,0) width 4: " " + RenderInline {SPAN} at (0,0) size 26x19 + RenderInline (generated) at (0,0) size 26x19 + RenderCounter at (124,0) size 26x19 + text run at (124,0) width 26: "I.VI" + RenderText {#text} at (150,0) size 4x19 + text run at (150,0) width 4: " " + RenderInline {SPAN} at (0,0) size 31x19 + RenderInline (generated) at (0,0) size 31x19 + RenderCounter at (154,0) size 31x19 + text run at (154,0) width 31: "I.VII" + RenderText {#text} at (185,0) size 4x19 + text run at (185,0) width 4: " " + RenderInline {SPAN} at (0,0) size 36x19 + RenderInline (generated) at (0,0) size 36x19 + RenderCounter at (189,0) size 36x19 + text run at (189,0) width 36: "I.VIII" + RenderText {#text} at (225,0) size 4x19 + text run at (225,0) width 4: " " + RenderInline {SPAN} at (0,0) size 26x19 + RenderInline (generated) at (0,0) size 26x19 + RenderCounter at (229,0) size 26x19 + text run at (229,0) width 26: "I.IX" + RenderText {#text} at (255,0) size 4x19 + text run at (255,0) width 4: " " + RenderInline {SPAN} at (0,0) size 21x19 + RenderInline (generated) at (0,0) size 21x19 + RenderCounter at (259,0) size 21x19 + text run at (259,0) width 21: "I.X" + RenderText {#text} at (280,0) size 4x19 + text run at (280,0) width 4: " " + RenderInline {SPAN} at (0,0) size 26x19 + RenderInline (generated) at (0,0) size 26x19 + RenderCounter at (284,0) size 26x19 + text run at (284,0) width 26: "I.XI" + RenderText {#text} at (310,0) size 4x19 + text run at (310,0) width 4: " " + RenderInline {SPAN} at (0,0) size 31x19 + RenderInline (generated) at (0,0) size 31x19 + RenderCounter at (314,0) size 31x19 + text run at (314,0) width 31: "I.XII" + RenderText {#text} at (345,0) size 4x19 + text run at (345,0) width 4: " " + RenderInline {SPAN} at (0,0) size 48x19 + RenderInline (generated) at (0,0) size 48x19 + RenderCounter at (349,0) size 48x19 + text run at (349,0) width 48: "I.XLIX" + RenderText {#text} at (397,0) size 4x19 + text run at (397,0) width 4: " " + RenderInline {SPAN} at (0,0) size 19x19 + RenderInline (generated) at (0,0) size 19x19 + RenderCounter at (401,0) size 19x19 + text run at (401,0) width 19: "I.L" + RenderText {#text} at (420,0) size 4x19 + text run at (420,0) width 4: " " + RenderInline {SPAN} at (0,0) size 105x19 + RenderInline (generated) at (0,0) size 105x19 + RenderCounter at (424,0) size 105x19 + text run at (424,0) width 105: "I.CCCLXXXIX" + RenderText {#text} at (529,0) size 4x19 + text run at (529,0) width 4: " " + RenderInline {SPAN} at (0,0) size 65x19 + RenderInline (generated) at (0,0) size 65x19 + RenderCounter at (533,0) size 65x19 + text run at (533,0) width 65: "I.CCCXC" + RenderText {#text} at (598,0) size 4x19 + text run at (598,0) width 4: " " + RenderInline {SPAN} at (0,0) size 137x19 + RenderInline (generated) at (0,0) size 137x19 + RenderCounter at (602,0) size 137x19 + text run at (602,0) width 137: "I.MMMCDLXXXIX" + RenderText {#text} at (739,0) size 4x19 + text run at (739,0) width 4: " " + RenderInline {SPAN} at (0,0) size 97x19 + RenderInline (generated) at (0,0) size 97x19 + RenderCounter at (743,0) size 97x19 + text run at (743,0) width 97: "I.MMMCDXC" + RenderText {#text} at (840,0) size 4x19 + text run at (840,0) width 4: " " + RenderInline {SPAN} at (0,0) size 102x19 + RenderInline (generated) at (0,0) size 102x19 + RenderCounter at (844,0) size 102x19 + text run at (844,0) width 102: "I.MMMCDXCI" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 917x19 + RenderText {#text} at (0,0) size 946x19 text run at (0,0) width 18: "I.I " text run at (18,0) width 23: "I.II " text run at (41,0) width 28: "I.III " - text run at (69,0) width 29: "I.IV " - text run at (98,0) width 24: "I.V " - text run at (122,0) width 29: "I.VI " - text run at (151,0) width 34: "I.VII " - text run at (185,0) width 39: "I.VIII " - text run at (224,0) width 29: "I.IX " - text run at (253,0) width 24: "I.X " - text run at (277,0) width 29: "I.XI " - text run at (306,0) width 34: "I.XII " - text run at (340,0) width 49: "I.XLIX " - text run at (389,0) width 22: "I.L " - text run at (411,0) width 104: "I.CCCLXXXIX " - text run at (515,0) width 68: "I.CCCXC " - text run at (583,0) width 135: "I.MMMCDLXXXIX " - text run at (718,0) width 99: "I.MMMCDXC " - text run at (817,0) width 100: "I.MMMCDXCI" + text run at (69,0) width 30: "I.IV " + text run at (99,0) width 25: "I.V " + text run at (124,0) width 30: "I.VI " + text run at (154,0) width 35: "I.VII " + text run at (189,0) width 40: "I.VIII " + text run at (229,0) width 30: "I.IX " + text run at (259,0) width 25: "I.X " + text run at (284,0) width 30: "I.XI " + text run at (314,0) width 35: "I.XII " + text run at (349,0) width 52: "I.XLIX " + text run at (401,0) width 23: "I.L " + text run at (424,0) width 109: "I.CCCLXXXIX " + text run at (533,0) width 69: "I.CCCXC " + text run at (602,0) width 141: "I.MMMCDLXXXIX " + text run at (743,0) width 101: "I.MMMCDXC " + text run at (844,0) width 102: "I.MMMCDXCI" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-09-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-09-b-expected.txt index 026f2c518089..4f0cddba9a6f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-09-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-09-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x102 RenderBlock {HTML} at (0,0) size 800x102 RenderBody {BODY} at (8,16) size 784x78 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x21 RenderInline {SPAN} at (0,0) size 20x19 RenderInline (generated) at (0,0) size 20x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-11-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-11-b-expected.txt index f6fab98edddc..b5917773b1ac 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-11-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-11-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 18x19 RenderInline (generated) at (0,0) size 18x19 @@ -37,58 +37,58 @@ layer at (0,0) size 800x100 text run at (90,0) width 18: "a.e" RenderText {#text} at (108,0) size 4x19 text run at (108,0) width 4: " " + RenderInline {SPAN} at (0,0) size 16x19 + RenderInline (generated) at (0,0) size 16x19 + RenderCounter at (112,0) size 16x19 + text run at (112,0) width 16: "a.f" + RenderText {#text} at (128,0) size 4x19 + text run at (128,0) width 4: " " + RenderInline {SPAN} at (0,0) size 19x19 + RenderInline (generated) at (0,0) size 19x19 + RenderCounter at (132,0) size 19x19 + text run at (132,0) width 19: "a.g" + RenderText {#text} at (151,0) size 4x19 + text run at (151,0) width 4: " " + RenderInline {SPAN} at (0,0) size 19x19 + RenderInline (generated) at (0,0) size 19x19 + RenderCounter at (155,0) size 19x19 + text run at (155,0) width 19: "a.h" + RenderText {#text} at (174,0) size 4x19 + text run at (174,0) width 4: " " RenderInline {SPAN} at (0,0) size 15x19 RenderInline (generated) at (0,0) size 15x19 - RenderCounter at (112,0) size 15x19 - text run at (112,0) width 15: "a.f" - RenderText {#text} at (127,0) size 4x19 - text run at (127,0) width 4: " " - RenderInline {SPAN} at (0,0) size 18x19 - RenderInline (generated) at (0,0) size 18x19 - RenderCounter at (131,0) size 18x19 - text run at (131,0) width 18: "a.g" - RenderText {#text} at (149,0) size 4x19 - text run at (149,0) width 4: " " - RenderInline {SPAN} at (0,0) size 18x19 - RenderInline (generated) at (0,0) size 18x19 - RenderCounter at (153,0) size 18x19 - text run at (153,0) width 18: "a.h" - RenderText {#text} at (171,0) size 4x19 - text run at (171,0) width 4: " " - RenderInline {SPAN} at (0,0) size 14x19 - RenderInline (generated) at (0,0) size 14x19 - RenderCounter at (175,0) size 14x19 - text run at (175,0) width 14: "a.i" - RenderText {#text} at (189,0) size 4x19 - text run at (189,0) width 4: " " + RenderCounter at (178,0) size 15x19 + text run at (178,0) width 15: "a.i" + RenderText {#text} at (193,0) size 4x19 + text run at (193,0) width 4: " " RenderInline {SPAN} at (0,0) size 15x19 RenderInline (generated) at (0,0) size 15x19 - RenderCounter at (193,0) size 15x19 - text run at (193,0) width 15: "a.j" - RenderText {#text} at (208,0) size 4x19 - text run at (208,0) width 4: " " + RenderCounter at (197,0) size 15x19 + text run at (197,0) width 15: "a.j" + RenderText {#text} at (212,0) size 4x19 + text run at (212,0) width 4: " " RenderInline {SPAN} at (0,0) size 19x19 RenderInline (generated) at (0,0) size 19x19 - RenderCounter at (212,0) size 19x19 - text run at (212,0) width 19: "a.k" - RenderText {#text} at (231,0) size 4x19 - text run at (231,0) width 4: " " - RenderInline {SPAN} at (0,0) size 14x19 - RenderInline (generated) at (0,0) size 14x19 - RenderCounter at (235,0) size 14x19 - text run at (235,0) width 14: "a.l" + RenderCounter at (216,0) size 19x19 + text run at (216,0) width 19: "a.k" + RenderText {#text} at (235,0) size 4x19 + text run at (235,0) width 4: " " + RenderInline {SPAN} at (0,0) size 15x19 + RenderInline (generated) at (0,0) size 15x19 + RenderCounter at (239,0) size 15x19 + text run at (239,0) width 15: "a.l" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 249x19 + RenderText {#text} at (0,0) size 254x19 text run at (0,0) width 22: "a.a " text run at (22,0) width 23: "a.b " text run at (45,0) width 22: "a.c " text run at (67,0) width 23: "a.d " text run at (90,0) width 22: "a.e " - text run at (112,0) width 19: "a.f " - text run at (131,0) width 22: "a.g " - text run at (153,0) width 22: "a.h " - text run at (175,0) width 18: "a.i " - text run at (193,0) width 19: "a.j " - text run at (212,0) width 23: "a.k " - text run at (235,0) width 14: "a.l" + text run at (112,0) width 20: "a.f " + text run at (132,0) width 23: "a.g " + text run at (155,0) width 23: "a.h " + text run at (178,0) width 19: "a.i " + text run at (197,0) width 19: "a.j " + text run at (216,0) width 23: "a.k " + text run at (239,0) width 15: "a.l" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-12-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-12-b-expected.txt index f6fab98edddc..b5917773b1ac 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-12-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-12-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 18x19 RenderInline (generated) at (0,0) size 18x19 @@ -37,58 +37,58 @@ layer at (0,0) size 800x100 text run at (90,0) width 18: "a.e" RenderText {#text} at (108,0) size 4x19 text run at (108,0) width 4: " " + RenderInline {SPAN} at (0,0) size 16x19 + RenderInline (generated) at (0,0) size 16x19 + RenderCounter at (112,0) size 16x19 + text run at (112,0) width 16: "a.f" + RenderText {#text} at (128,0) size 4x19 + text run at (128,0) width 4: " " + RenderInline {SPAN} at (0,0) size 19x19 + RenderInline (generated) at (0,0) size 19x19 + RenderCounter at (132,0) size 19x19 + text run at (132,0) width 19: "a.g" + RenderText {#text} at (151,0) size 4x19 + text run at (151,0) width 4: " " + RenderInline {SPAN} at (0,0) size 19x19 + RenderInline (generated) at (0,0) size 19x19 + RenderCounter at (155,0) size 19x19 + text run at (155,0) width 19: "a.h" + RenderText {#text} at (174,0) size 4x19 + text run at (174,0) width 4: " " RenderInline {SPAN} at (0,0) size 15x19 RenderInline (generated) at (0,0) size 15x19 - RenderCounter at (112,0) size 15x19 - text run at (112,0) width 15: "a.f" - RenderText {#text} at (127,0) size 4x19 - text run at (127,0) width 4: " " - RenderInline {SPAN} at (0,0) size 18x19 - RenderInline (generated) at (0,0) size 18x19 - RenderCounter at (131,0) size 18x19 - text run at (131,0) width 18: "a.g" - RenderText {#text} at (149,0) size 4x19 - text run at (149,0) width 4: " " - RenderInline {SPAN} at (0,0) size 18x19 - RenderInline (generated) at (0,0) size 18x19 - RenderCounter at (153,0) size 18x19 - text run at (153,0) width 18: "a.h" - RenderText {#text} at (171,0) size 4x19 - text run at (171,0) width 4: " " - RenderInline {SPAN} at (0,0) size 14x19 - RenderInline (generated) at (0,0) size 14x19 - RenderCounter at (175,0) size 14x19 - text run at (175,0) width 14: "a.i" - RenderText {#text} at (189,0) size 4x19 - text run at (189,0) width 4: " " + RenderCounter at (178,0) size 15x19 + text run at (178,0) width 15: "a.i" + RenderText {#text} at (193,0) size 4x19 + text run at (193,0) width 4: " " RenderInline {SPAN} at (0,0) size 15x19 RenderInline (generated) at (0,0) size 15x19 - RenderCounter at (193,0) size 15x19 - text run at (193,0) width 15: "a.j" - RenderText {#text} at (208,0) size 4x19 - text run at (208,0) width 4: " " + RenderCounter at (197,0) size 15x19 + text run at (197,0) width 15: "a.j" + RenderText {#text} at (212,0) size 4x19 + text run at (212,0) width 4: " " RenderInline {SPAN} at (0,0) size 19x19 RenderInline (generated) at (0,0) size 19x19 - RenderCounter at (212,0) size 19x19 - text run at (212,0) width 19: "a.k" - RenderText {#text} at (231,0) size 4x19 - text run at (231,0) width 4: " " - RenderInline {SPAN} at (0,0) size 14x19 - RenderInline (generated) at (0,0) size 14x19 - RenderCounter at (235,0) size 14x19 - text run at (235,0) width 14: "a.l" + RenderCounter at (216,0) size 19x19 + text run at (216,0) width 19: "a.k" + RenderText {#text} at (235,0) size 4x19 + text run at (235,0) width 4: " " + RenderInline {SPAN} at (0,0) size 15x19 + RenderInline (generated) at (0,0) size 15x19 + RenderCounter at (239,0) size 15x19 + text run at (239,0) width 15: "a.l" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 249x19 + RenderText {#text} at (0,0) size 254x19 text run at (0,0) width 22: "a.a " text run at (22,0) width 23: "a.b " text run at (45,0) width 22: "a.c " text run at (67,0) width 23: "a.d " text run at (90,0) width 22: "a.e " - text run at (112,0) width 19: "a.f " - text run at (131,0) width 22: "a.g " - text run at (153,0) width 22: "a.h " - text run at (175,0) width 18: "a.i " - text run at (193,0) width 19: "a.j " - text run at (212,0) width 23: "a.k " - text run at (235,0) width 14: "a.l" + text run at (112,0) width 20: "a.f " + text run at (132,0) width 23: "a.g " + text run at (155,0) width 23: "a.h " + text run at (178,0) width 19: "a.i " + text run at (197,0) width 19: "a.j " + text run at (216,0) width 23: "a.k " + text run at (239,0) width 15: "a.l" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-13-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-13-b-expected.txt index dce012856639..57c0d2c40b11 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-13-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-13-b-expected.txt @@ -4,91 +4,91 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (0,0) size 28x19 + text run at (0,0) width 28: "A.A" + RenderText {#text} at (28,0) size 4x19 + text run at (28,0) width 4: " " + RenderInline {SPAN} at (0,0) size 27x19 + RenderInline (generated) at (0,0) size 27x19 + RenderCounter at (32,0) size 27x19 + text run at (32,0) width 27: "A.B" + RenderText {#text} at (59,0) size 4x19 + text run at (59,0) width 4: " " + RenderInline {SPAN} at (0,0) size 27x19 + RenderInline (generated) at (0,0) size 27x19 + RenderCounter at (63,0) size 27x19 + text run at (63,0) width 27: "A.C" + RenderText {#text} at (90,0) size 4x19 + text run at (90,0) width 4: " " + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (94,0) size 28x19 + text run at (94,0) width 28: "A.D" + RenderText {#text} at (122,0) size 4x19 + text run at (122,0) width 4: " " RenderInline {SPAN} at (0,0) size 26x19 RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (0,0) size 26x19 - text run at (0,0) width 26: "A.A" - RenderText {#text} at (26,0) size 4x19 - text run at (26,0) width 4: " " + RenderCounter at (126,0) size 26x19 + text run at (126,0) width 26: "A.E" + RenderText {#text} at (152,0) size 4x19 + text run at (152,0) width 4: " " RenderInline {SPAN} at (0,0) size 25x19 RenderInline (generated) at (0,0) size 25x19 - RenderCounter at (30,0) size 25x19 - text run at (30,0) width 25: "A.B" - RenderText {#text} at (55,0) size 4x19 - text run at (55,0) width 4: " " - RenderInline {SPAN} at (0,0) size 26x19 - RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (59,0) size 26x19 - text run at (59,0) width 26: "A.C" - RenderText {#text} at (85,0) size 4x19 - text run at (85,0) width 4: " " - RenderInline {SPAN} at (0,0) size 26x19 - RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (89,0) size 26x19 - text run at (89,0) width 26: "A.D" - RenderText {#text} at (115,0) size 4x19 - text run at (115,0) width 4: " " - RenderInline {SPAN} at (0,0) size 24x19 - RenderInline (generated) at (0,0) size 24x19 - RenderCounter at (119,0) size 24x19 - text run at (119,0) width 24: "A.E" - RenderText {#text} at (143,0) size 4x19 - text run at (143,0) width 4: " " - RenderInline {SPAN} at (0,0) size 24x19 - RenderInline (generated) at (0,0) size 24x19 - RenderCounter at (147,0) size 24x19 - text run at (147,0) width 24: "A.F" - RenderText {#text} at (171,0) size 4x19 - text run at (171,0) width 4: " " - RenderInline {SPAN} at (0,0) size 26x19 - RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (175,0) size 26x19 - text run at (175,0) width 26: "A.G" - RenderText {#text} at (201,0) size 4x19 - text run at (201,0) width 4: " " - RenderInline {SPAN} at (0,0) size 26x19 - RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (205,0) size 26x19 - text run at (205,0) width 26: "A.H" - RenderText {#text} at (231,0) size 4x19 - text run at (231,0) width 4: " " - RenderInline {SPAN} at (0,0) size 20x19 - RenderInline (generated) at (0,0) size 20x19 - RenderCounter at (235,0) size 20x19 - text run at (235,0) width 20: "A.I" - RenderText {#text} at (255,0) size 4x19 - text run at (255,0) width 4: " " + RenderCounter at (156,0) size 25x19 + text run at (156,0) width 25: "A.F" + RenderText {#text} at (181,0) size 4x19 + text run at (181,0) width 4: " " + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (185,0) size 28x19 + text run at (185,0) width 28: "A.G" + RenderText {#text} at (213,0) size 4x19 + text run at (213,0) width 4: " " + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (217,0) size 28x19 + text run at (217,0) width 28: "A.H" + RenderText {#text} at (245,0) size 4x19 + text run at (245,0) width 4: " " RenderInline {SPAN} at (0,0) size 21x19 RenderInline (generated) at (0,0) size 21x19 - RenderCounter at (259,0) size 21x19 - text run at (259,0) width 21: "A.J" - RenderText {#text} at (280,0) size 4x19 - text run at (280,0) width 4: " " - RenderInline {SPAN} at (0,0) size 27x19 - RenderInline (generated) at (0,0) size 27x19 - RenderCounter at (284,0) size 27x19 - text run at (284,0) width 27: "A.K" - RenderText {#text} at (311,0) size 4x19 - text run at (311,0) width 4: " " - RenderInline {SPAN} at (0,0) size 24x19 - RenderInline (generated) at (0,0) size 24x19 - RenderCounter at (315,0) size 24x19 - text run at (315,0) width 24: "A.L" + RenderCounter at (249,0) size 21x19 + text run at (249,0) width 21: "A.I" + RenderText {#text} at (270,0) size 4x19 + text run at (270,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (274,0) size 22x19 + text run at (274,0) width 22: "A.J" + RenderText {#text} at (296,0) size 4x19 + text run at (296,0) width 4: " " + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (300,0) size 28x19 + text run at (300,0) width 28: "A.K" + RenderText {#text} at (328,0) size 4x19 + text run at (328,0) width 4: " " + RenderInline {SPAN} at (0,0) size 26x19 + RenderInline (generated) at (0,0) size 26x19 + RenderCounter at (332,0) size 26x19 + text run at (332,0) width 26: "A.L" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 339x19 - text run at (0,0) width 30: "A.A " - text run at (30,0) width 29: "A.B " - text run at (59,0) width 30: "A.C " - text run at (89,0) width 30: "A.D " - text run at (119,0) width 28: "A.E " - text run at (147,0) width 28: "A.F " - text run at (175,0) width 30: "A.G " - text run at (205,0) width 30: "A.H " - text run at (235,0) width 24: "A.I " - text run at (259,0) width 25: "A.J " - text run at (284,0) width 31: "A.K " - text run at (315,0) width 24: "A.L" + RenderText {#text} at (0,0) size 358x19 + text run at (0,0) width 32: "A.A " + text run at (32,0) width 31: "A.B " + text run at (63,0) width 31: "A.C " + text run at (94,0) width 32: "A.D " + text run at (126,0) width 30: "A.E " + text run at (156,0) width 29: "A.F " + text run at (185,0) width 32: "A.G " + text run at (217,0) width 32: "A.H " + text run at (249,0) width 25: "A.I " + text run at (274,0) width 26: "A.J " + text run at (300,0) width 32: "A.K " + text run at (332,0) width 26: "A.L" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-14-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-14-b-expected.txt index dce012856639..57c0d2c40b11 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-14-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-14-b-expected.txt @@ -4,91 +4,91 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (0,0) size 28x19 + text run at (0,0) width 28: "A.A" + RenderText {#text} at (28,0) size 4x19 + text run at (28,0) width 4: " " + RenderInline {SPAN} at (0,0) size 27x19 + RenderInline (generated) at (0,0) size 27x19 + RenderCounter at (32,0) size 27x19 + text run at (32,0) width 27: "A.B" + RenderText {#text} at (59,0) size 4x19 + text run at (59,0) width 4: " " + RenderInline {SPAN} at (0,0) size 27x19 + RenderInline (generated) at (0,0) size 27x19 + RenderCounter at (63,0) size 27x19 + text run at (63,0) width 27: "A.C" + RenderText {#text} at (90,0) size 4x19 + text run at (90,0) width 4: " " + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (94,0) size 28x19 + text run at (94,0) width 28: "A.D" + RenderText {#text} at (122,0) size 4x19 + text run at (122,0) width 4: " " RenderInline {SPAN} at (0,0) size 26x19 RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (0,0) size 26x19 - text run at (0,0) width 26: "A.A" - RenderText {#text} at (26,0) size 4x19 - text run at (26,0) width 4: " " + RenderCounter at (126,0) size 26x19 + text run at (126,0) width 26: "A.E" + RenderText {#text} at (152,0) size 4x19 + text run at (152,0) width 4: " " RenderInline {SPAN} at (0,0) size 25x19 RenderInline (generated) at (0,0) size 25x19 - RenderCounter at (30,0) size 25x19 - text run at (30,0) width 25: "A.B" - RenderText {#text} at (55,0) size 4x19 - text run at (55,0) width 4: " " - RenderInline {SPAN} at (0,0) size 26x19 - RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (59,0) size 26x19 - text run at (59,0) width 26: "A.C" - RenderText {#text} at (85,0) size 4x19 - text run at (85,0) width 4: " " - RenderInline {SPAN} at (0,0) size 26x19 - RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (89,0) size 26x19 - text run at (89,0) width 26: "A.D" - RenderText {#text} at (115,0) size 4x19 - text run at (115,0) width 4: " " - RenderInline {SPAN} at (0,0) size 24x19 - RenderInline (generated) at (0,0) size 24x19 - RenderCounter at (119,0) size 24x19 - text run at (119,0) width 24: "A.E" - RenderText {#text} at (143,0) size 4x19 - text run at (143,0) width 4: " " - RenderInline {SPAN} at (0,0) size 24x19 - RenderInline (generated) at (0,0) size 24x19 - RenderCounter at (147,0) size 24x19 - text run at (147,0) width 24: "A.F" - RenderText {#text} at (171,0) size 4x19 - text run at (171,0) width 4: " " - RenderInline {SPAN} at (0,0) size 26x19 - RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (175,0) size 26x19 - text run at (175,0) width 26: "A.G" - RenderText {#text} at (201,0) size 4x19 - text run at (201,0) width 4: " " - RenderInline {SPAN} at (0,0) size 26x19 - RenderInline (generated) at (0,0) size 26x19 - RenderCounter at (205,0) size 26x19 - text run at (205,0) width 26: "A.H" - RenderText {#text} at (231,0) size 4x19 - text run at (231,0) width 4: " " - RenderInline {SPAN} at (0,0) size 20x19 - RenderInline (generated) at (0,0) size 20x19 - RenderCounter at (235,0) size 20x19 - text run at (235,0) width 20: "A.I" - RenderText {#text} at (255,0) size 4x19 - text run at (255,0) width 4: " " + RenderCounter at (156,0) size 25x19 + text run at (156,0) width 25: "A.F" + RenderText {#text} at (181,0) size 4x19 + text run at (181,0) width 4: " " + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (185,0) size 28x19 + text run at (185,0) width 28: "A.G" + RenderText {#text} at (213,0) size 4x19 + text run at (213,0) width 4: " " + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (217,0) size 28x19 + text run at (217,0) width 28: "A.H" + RenderText {#text} at (245,0) size 4x19 + text run at (245,0) width 4: " " RenderInline {SPAN} at (0,0) size 21x19 RenderInline (generated) at (0,0) size 21x19 - RenderCounter at (259,0) size 21x19 - text run at (259,0) width 21: "A.J" - RenderText {#text} at (280,0) size 4x19 - text run at (280,0) width 4: " " - RenderInline {SPAN} at (0,0) size 27x19 - RenderInline (generated) at (0,0) size 27x19 - RenderCounter at (284,0) size 27x19 - text run at (284,0) width 27: "A.K" - RenderText {#text} at (311,0) size 4x19 - text run at (311,0) width 4: " " - RenderInline {SPAN} at (0,0) size 24x19 - RenderInline (generated) at (0,0) size 24x19 - RenderCounter at (315,0) size 24x19 - text run at (315,0) width 24: "A.L" + RenderCounter at (249,0) size 21x19 + text run at (249,0) width 21: "A.I" + RenderText {#text} at (270,0) size 4x19 + text run at (270,0) width 4: " " + RenderInline {SPAN} at (0,0) size 22x19 + RenderInline (generated) at (0,0) size 22x19 + RenderCounter at (274,0) size 22x19 + text run at (274,0) width 22: "A.J" + RenderText {#text} at (296,0) size 4x19 + text run at (296,0) width 4: " " + RenderInline {SPAN} at (0,0) size 28x19 + RenderInline (generated) at (0,0) size 28x19 + RenderCounter at (300,0) size 28x19 + text run at (300,0) width 28: "A.K" + RenderText {#text} at (328,0) size 4x19 + text run at (328,0) width 4: " " + RenderInline {SPAN} at (0,0) size 26x19 + RenderInline (generated) at (0,0) size 26x19 + RenderCounter at (332,0) size 26x19 + text run at (332,0) width 26: "A.L" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 339x19 - text run at (0,0) width 30: "A.A " - text run at (30,0) width 29: "A.B " - text run at (59,0) width 30: "A.C " - text run at (89,0) width 30: "A.D " - text run at (119,0) width 28: "A.E " - text run at (147,0) width 28: "A.F " - text run at (175,0) width 30: "A.G " - text run at (205,0) width 30: "A.H " - text run at (235,0) width 24: "A.I " - text run at (259,0) width 25: "A.J " - text run at (284,0) width 31: "A.K " - text run at (315,0) width 24: "A.L" + RenderText {#text} at (0,0) size 358x19 + text run at (0,0) width 32: "A.A " + text run at (32,0) width 31: "A.B " + text run at (63,0) width 31: "A.C " + text run at (94,0) width 32: "A.D " + text run at (126,0) width 30: "A.E " + text run at (156,0) width 29: "A.F " + text run at (185,0) width 32: "A.G " + text run at (217,0) width 32: "A.H " + text run at (249,0) width 25: "A.I " + text run at (274,0) width 26: "A.J " + text run at (300,0) width 32: "A.K " + text run at (332,0) width 26: "A.L" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-15-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-15-b-expected.txt index ed1712f0c263..67c9017f9326 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-15-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-15-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 20x19 RenderInline (generated) at (0,0) size 20x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-16-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-16-c-expected.txt index 21b80656ca70..865c0f710c04 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-16-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-16-c-expected.txt @@ -4,31 +4,31 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 - RenderInline {SPAN} at (0,0) size 34x19 - RenderInline (generated) at (0,0) size 34x19 + RenderInline {SPAN} at (0,0) size 33x19 + RenderInline (generated) at (0,0) size 33x19 RenderCounter at (0,0) size 20x19 text run at (0,0) width 20: "1.1" - RenderText at (20,0) size 14x19 - text run at (20,0) width 14: " - " - RenderInline {SPAN} at (0,0) size 30x19 - RenderInline (generated) at (0,0) size 30x19 - RenderCounter at (34,0) size 16x19 - text run at (34,0) width 16: "12" - RenderText at (50,0) size 14x19 - text run at (50,0) width 14: " - " - RenderInline {SPAN} at (0,0) size 106x19 - RenderInline (generated) at (0,0) size 106x19 - RenderCounter at (64,0) size 20x19 - text run at (64,0) width 20: "1.3" - RenderText at (84,0) size 28x19 - text run at (84,0) width 16: "-- " - text run at (100,0) width 12: "--" - RenderCounter at (112,0) size 58x19 - text run at (112,0) width 58: "1-------3" + RenderText at (20,0) size 13x19 + text run at (20,0) width 13: " - " + RenderInline {SPAN} at (0,0) size 29x19 + RenderInline (generated) at (0,0) size 29x19 + RenderCounter at (33,0) size 16x19 + text run at (33,0) width 16: "12" + RenderText at (49,0) size 13x19 + text run at (49,0) width 13: " - " + RenderInline {SPAN} at (0,0) size 103x19 + RenderInline (generated) at (0,0) size 103x19 + RenderCounter at (62,0) size 20x19 + text run at (62,0) width 20: "1.3" + RenderText at (82,0) size 27x19 + text run at (82,0) width 15: "-- " + text run at (97,0) width 12: "--" + RenderCounter at (109,0) size 56x19 + text run at (109,0) width 56: "1-------3" RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 170x19 - text run at (0,0) width 100: "1.1 - 12 - 1.3-- " - text run at (100,0) width 70: "--1-------3" + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 96: "1.1 - 12 - 1.3-- " + text run at (96,0) width 67: "--1-------3" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-17-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-17-d-expected.txt index 620e11f5caac..95fb4ab55b0f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-17-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-17-d-expected.txt @@ -4,29 +4,29 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 - RenderInline {SPAN} at (0,0) size 34x19 - RenderInline (generated) at (0,0) size 34x19 + RenderInline {SPAN} at (0,0) size 33x19 + RenderInline (generated) at (0,0) size 33x19 RenderCounter at (0,0) size 20x19 text run at (0,0) width 20: "1.1" - RenderText at (20,0) size 14x19 - text run at (20,0) width 14: " - " - RenderInline {SPAN} at (0,0) size 30x19 - RenderInline (generated) at (0,0) size 30x19 - RenderCounter at (34,0) size 16x19 - text run at (34,0) width 16: "12" - RenderText at (50,0) size 14x19 - text run at (50,0) width 14: " - " - RenderInline {SPAN} at (0,0) size 130x19 - RenderInline (generated) at (0,0) size 130x19 - RenderCounter at (64,0) size 20x19 - text run at (64,0) width 20: "1.3" - RenderText at (84,0) size 52x19 - text run at (84,0) width 52: "-- --" - RenderCounter at (136,0) size 58x19 - text run at (136,0) width 58: "1-------3" + RenderText at (20,0) size 13x19 + text run at (20,0) width 13: " - " + RenderInline {SPAN} at (0,0) size 29x19 + RenderInline (generated) at (0,0) size 29x19 + RenderCounter at (33,0) size 16x19 + text run at (33,0) width 16: "12" + RenderText at (49,0) size 13x19 + text run at (49,0) width 13: " - " + RenderInline {SPAN} at (0,0) size 127x19 + RenderInline (generated) at (0,0) size 127x19 + RenderCounter at (62,0) size 20x19 + text run at (62,0) width 20: "1.3" + RenderText at (82,0) size 51x19 + text run at (82,0) width 51: "-- --" + RenderCounter at (133,0) size 56x19 + text run at (133,0) width 56: "1-------3" RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "1.1 - 12 - 1.3-- --1-------3" + RenderText {#text} at (0,0) size 187x19 + text run at (0,0) width 187: "1.1 - 12 - 1.3-- --1-------3" diff --git a/LayoutTests/platform/wincairo/css2.1/t1202-counters-18-f-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1202-counters-18-f-expected.txt index 90344ad7d144..75999db0abc5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1202-counters-18-f-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1202-counters-18-f-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 272x19 - text run at (0,0) width 272: "The following two lines should look the same:" + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "The following two lines should look the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 20x19 RenderInline (generated) at (0,0) size 20x19 @@ -67,19 +67,19 @@ layer at (0,0) size 800x100 text run at (216,0) width 28: "1.10" RenderText {#text} at (244,0) size 4x19 text run at (244,0) width 4: " " + RenderInline {SPAN} at (0,0) size 27x19 + RenderInline (generated) at (0,0) size 27x19 + RenderCounter at (248,0) size 27x19 + text run at (248,0) width 27: "1.11" + RenderText {#text} at (275,0) size 4x19 + text run at (275,0) width 4: " " RenderInline {SPAN} at (0,0) size 28x19 RenderInline (generated) at (0,0) size 28x19 - RenderCounter at (248,0) size 28x19 - text run at (248,0) width 28: "1.11" - RenderText {#text} at (276,0) size 4x19 - text run at (276,0) width 4: " " - RenderInline {SPAN} at (0,0) size 28x19 - RenderInline (generated) at (0,0) size 28x19 - RenderCounter at (280,0) size 28x19 - text run at (280,0) width 28: "1.12" + RenderCounter at (279,0) size 28x19 + text run at (279,0) width 28: "1.12" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 308x19 + RenderText {#text} at (0,0) size 307x19 text run at (0,0) width 24: "1.1 " text run at (24,0) width 24: "1.2 " text run at (48,0) width 24: "1.3 " @@ -90,5 +90,5 @@ layer at (0,0) size 800x100 text run at (168,0) width 24: "1.8 " text run at (192,0) width 24: "1.9 " text run at (216,0) width 32: "1.10 " - text run at (248,0) width 32: "1.11 " - text run at (280,0) width 28: "1.12" + text run at (248,0) width 31: "1.11 " + text run at (279,0) width 28: "1.12" diff --git a/LayoutTests/platform/wincairo/css2.1/t1204-implied-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1204-implied-00-b-expected.txt index f21bf4f36c34..2f1aa5215526 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1204-implied-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1204-implied-00-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "The following should be identical:" + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 8x19 RenderInline (generated) at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1204-implied-01-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1204-implied-01-c-expected.txt index 608539797a98..e91f87d0a7a3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1204-implied-01-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1204-implied-01-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 256x19 - text run at (0,0) width 256: "The following two lines should be identical:" + RenderText {#text} at (0,0) size 277x19 + text run at (0,0) width 277: "The following two lines should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 12x19 RenderInline (generated) at (0,0) size 12x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1204-implied-02-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1204-implied-02-d-expected.txt index b9d1b3d42430..a5b13bdac940 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1204-implied-02-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1204-implied-02-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 256x19 - text run at (0,0) width 256: "The following two lines should be identical:" + RenderText {#text} at (0,0) size 277x19 + text run at (0,0) width 277: "The following two lines should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 34x19 RenderInline (generated) at (0,0) size 10x19 @@ -38,5 +38,5 @@ layer at (0,0) size 800x100 text run at (46,0) width 20: "1.0" RenderText at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 66x19 - text run at (0,0) width 66: "B1 0 1 1.0" + RenderText {#text} at (0,0) size 67x19 + text run at (0,0) width 67: "B1 0 1 1.0" diff --git a/LayoutTests/platform/wincairo/css2.1/t1204-multiple-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1204-multiple-00-c-expected.txt index 8e076dcfbfc1..167728f8e43e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1204-multiple-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1204-multiple-00-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "The following should be identical:" + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 8x19 RenderInline (generated) at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1204-multiple-01-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1204-multiple-01-c-expected.txt index 8e076dcfbfc1..167728f8e43e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1204-multiple-01-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1204-multiple-01-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "The following should be identical:" + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 8x19 RenderInline (generated) at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1204-order-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1204-order-00-c-expected.txt index 2bc8812725f1..b4b466343f45 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1204-order-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1204-order-00-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "The following should be identical:" + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 8x19 RenderInline {SPAN} at (0,0) size 8x19 @@ -84,42 +84,42 @@ layer at (0,0) size 800x100 text run at (120,0) width 16: "10" RenderText {#text} at (136,0) size 4x19 text run at (136,0) width 4: " " + RenderInline {SPAN} at (0,0) size 15x19 + RenderInline {SPAN} at (0,0) size 15x19 + RenderInline (generated) at (0,0) size 15x19 + RenderCounter at (140,0) size 15x19 + text run at (140,0) width 15: "11" + RenderText {#text} at (155,0) size 4x19 + text run at (155,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (140,0) size 16x19 - text run at (140,0) width 16: "11" - RenderText {#text} at (156,0) size 4x19 - text run at (156,0) width 4: " " + RenderCounter at (159,0) size 16x19 + text run at (159,0) width 16: "12" + RenderText {#text} at (175,0) size 4x19 + text run at (175,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (160,0) size 16x19 - text run at (160,0) width 16: "12" - RenderText {#text} at (176,0) size 4x19 - text run at (176,0) width 4: " " + RenderCounter at (179,0) size 16x19 + text run at (179,0) width 16: "12" + RenderText {#text} at (195,0) size 4x19 + text run at (195,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (180,0) size 16x19 - text run at (180,0) width 16: "12" - RenderText {#text} at (196,0) size 4x19 - text run at (196,0) width 4: " " + RenderCounter at (199,0) size 16x19 + text run at (199,0) width 16: "12" + RenderText {#text} at (215,0) size 4x19 + text run at (215,0) width 4: " " RenderInline {SPAN} at (0,0) size 16x19 RenderInline {SPAN} at (0,0) size 16x19 RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (200,0) size 16x19 - text run at (200,0) width 16: "12" - RenderText {#text} at (216,0) size 4x19 - text run at (216,0) width 4: " " - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline {SPAN} at (0,0) size 16x19 - RenderInline (generated) at (0,0) size 16x19 - RenderCounter at (220,0) size 16x19 - text run at (220,0) width 16: "12" + RenderCounter at (219,0) size 16x19 + text run at (219,0) width 16: "12" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 236x19 + RenderText {#text} at (0,0) size 235x19 text run at (0,0) width 12: "0 " text run at (12,0) width 12: "1 " text run at (24,0) width 12: "2 " @@ -131,8 +131,8 @@ layer at (0,0) size 800x100 text run at (96,0) width 12: "8 " text run at (108,0) width 12: "9 " text run at (120,0) width 20: "10 " - text run at (140,0) width 20: "11 " - text run at (160,0) width 20: "12 " - text run at (180,0) width 20: "12 " - text run at (200,0) width 20: "12 " - text run at (220,0) width 16: "12" + text run at (140,0) width 19: "11 " + text run at (159,0) width 20: "12 " + text run at (179,0) width 20: "12 " + text run at (199,0) width 20: "12 " + text run at (219,0) width 16: "12" diff --git a/LayoutTests/platform/wincairo/css2.1/t1204-order-01-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1204-order-01-d-expected.txt index 2c2eaf845318..4f938a355917 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1204-order-01-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1204-order-01-d-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x191 RenderBlock {HTML} at (0,0) size 800x191 RenderBody {BODY} at (8,16) size 784x167 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 689x19 - text run at (0,0) width 385: "You should see nine boxes below, each just containing a unique " - text run at (385,0) width 304: "multiple of eleven, from 11 to 99, and nothing else." + RenderText {#text} at (0,0) size 726x19 + text run at (0,0) width 405: "You should see nine boxes below, each just containing a unique " + text run at (405,0) width 321: "multiple of eleven, from 11 to 99, and nothing else." RenderBlock {UL} at (0,36) size 784x131 RenderBlock {LI} at (0,0) size 50x22 [border: (1px solid #000000)] RenderInline (generated) at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1204-root-e-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1204-root-e-expected.txt index dd2f518a8491..da48f21378fe 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1204-root-e-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1204-root-e-expected.txt @@ -8,8 +8,8 @@ layer at (0,0) size 800x100 RenderText {#text} at (0,0) size 0x0 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "The following should be identical:" + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 20x19 RenderInline (generated) at (0,0) size 20x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t120401-scope-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t120401-scope-00-b-expected.txt index 649e21e934a7..2999a6310026 100644 --- a/LayoutTests/platform/wincairo/css2.1/t120401-scope-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t120401-scope-00-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 212x19 - text run at (0,0) width 212: "The next 2 lines should be identical:" + RenderText {#text} at (0,0) size 227x19 + text run at (0,0) width 227: "The next 2 lines should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 40x19 RenderInline (generated) at (0,0) size 8x19 @@ -57,6 +57,6 @@ layer at (0,0) size 800x100 text run at (92,0) width 8: "1" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 100x19 - text run at (0,0) width 52: "122111 " - text run at (52,0) width 48: "133331" + RenderText {#text} at (0,0) size 98x19 + text run at (0,0) width 50: "122111 " + text run at (50,0) width 48: "133331" diff --git a/LayoutTests/platform/wincairo/css2.1/t120401-scope-01-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t120401-scope-01-c-expected.txt index 837c1a0ec271..f91d5ba10237 100644 --- a/LayoutTests/platform/wincairo/css2.1/t120401-scope-01-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t120401-scope-01-c-expected.txt @@ -4,10 +4,10 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 260x19 - text run at (0,0) width 260: "The following two lines should be the same:" + RenderText {#text} at (0,0) size 279x19 + text run at (0,0) width 279: "The following two lines should be the same:" RenderBlock {DIV} at (0,36) size 784x20 - RenderInline {SPAN} at (0,0) size 491x19 + RenderInline {SPAN} at (0,0) size 490x19 RenderInline (generated) at (0,0) size 24x19 RenderText at (0,0) size 10x19 text run at (0,0) width 10: "B" @@ -15,7 +15,7 @@ layer at (0,0) size 800x100 text run at (10,0) width 8: "1" RenderText at (18,0) size 6x19 text run at (18,0) width 6: "-" - RenderInline {SPAN} at (0,0) size 442x19 + RenderInline {SPAN} at (0,0) size 441x19 RenderInline (generated) at (0,0) size 24x19 RenderText at (24,0) size 10x19 text run at (24,0) width 10: "B" @@ -98,20 +98,20 @@ layer at (0,0) size 800x100 text run at (387,0) width 28: "2.10" RenderText at (415,0) size 6x19 text run at (415,0) width 6: "-" - RenderInline (generated) at (0,0) size 45x19 + RenderInline (generated) at (0,0) size 44x19 RenderText at (421,0) size 11x19 text run at (421,0) width 11: "A" - RenderCounter at (432,0) size 28x19 - text run at (432,0) width 28: "2.11" - RenderText at (460,0) size 6x19 - text run at (460,0) width 6: "-" + RenderCounter at (432,0) size 27x19 + text run at (432,0) width 27: "2.11" + RenderText at (459,0) size 6x19 + text run at (459,0) width 6: "-" RenderInline (generated) at (0,0) size 25x19 - RenderText at (466,0) size 11x19 - text run at (466,0) width 11: "A" - RenderCounter at (477,0) size 8x19 - text run at (477,0) width 8: "3" - RenderText at (485,0) size 6x19 - text run at (485,0) width 6: "-" + RenderText at (465,0) size 11x19 + text run at (465,0) width 11: "A" + RenderCounter at (476,0) size 8x19 + text run at (476,0) width 8: "3" + RenderText at (484,0) size 6x19 + text run at (484,0) width 6: "-" RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 491x19 - text run at (0,0) width 491: "B1-B2-B2.1-B2.2-A2.3-B2.4-A2.5-A2.6-B2.7-B2.8-A2.9-A2.10-A2.11-A3-" + RenderText {#text} at (0,0) size 490x19 + text run at (0,0) width 490: "B1-B2-B2.1-B2.2-A2.3-B2.4-A2.5-A2.6-B2.7-B2.8-A2.9-A2.10-A2.11-A3-" diff --git a/LayoutTests/platform/wincairo/css2.1/t120401-scope-02-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t120401-scope-02-c-expected.txt index 11342e2f7b05..7f16ca03d1c8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t120401-scope-02-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t120401-scope-02-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 260x19 - text run at (0,0) width 260: "The following two lines should be the same:" + RenderText {#text} at (0,0) size 279x19 + text run at (0,0) width 279: "The following two lines should be the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 195x19 RenderInline (generated) at (0,0) size 24x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t120401-scope-03-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t120401-scope-03-c-expected.txt index cc5f88068f54..6fe04922b0d1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t120401-scope-03-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t120401-scope-03-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 260x19 - text run at (0,0) width 260: "The following two lines should be the same:" + RenderText {#text} at (0,0) size 279x19 + text run at (0,0) width 279: "The following two lines should be the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 159x19 RenderInline (generated) at (0,0) size 24x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t120401-scope-04-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t120401-scope-04-d-expected.txt index ba9810f31477..146a284ae305 100644 --- a/LayoutTests/platform/wincairo/css2.1/t120401-scope-04-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t120401-scope-04-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 231x19 - text run at (0,0) width 231: "The next two lines should be the same:" + RenderText {#text} at (0,0) size 245x19 + text run at (0,0) width 245: "The next two lines should be the same:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 0x19 RenderInline {SPAN} at (0,0) size 12x19 @@ -38,5 +38,5 @@ layer at (0,0) size 800x100 text run at (58,0) width 20: "1.1" RenderText at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 78x19 - text run at (0,0) width 78: "1 1 R1.1 1.1" + RenderText {#text} at (0,0) size 79x19 + text run at (0,0) width 79: "1 1 R1.1 1.1" diff --git a/LayoutTests/platform/wincairo/css2.1/t120403-content-none-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t120403-content-none-00-c-expected.txt index 375a54418088..59a5970380ae 100644 --- a/LayoutTests/platform/wincairo/css2.1/t120403-content-none-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t120403-content-none-00-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "The following should be identical:" + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 0x19 RenderInline {SPAN} at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t120403-display-none-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t120403-display-none-00-c-expected.txt index e54212be50ee..d3d60f307d8a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t120403-display-none-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t120403-display-none-00-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "The following should be identical:" + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 8x19 RenderInline (generated) at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t120403-visibility-00-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t120403-visibility-00-c-expected.txt index 6ab8f32baae5..6ccb289e23a9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t120403-visibility-00-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t120403-visibility-00-c-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "The following should be identical:" + RenderText {#text} at (0,0) size 216x19 + text run at (0,0) width 216: "The following should be identical:" RenderBlock {DIV} at (0,36) size 784x20 RenderInline {SPAN} at (0,0) size 0x19 RenderInline {SPAN} at (0,0) size 8x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1205-c561-list-displ-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1205-c561-list-displ-00-b-expected.txt index 7dfc8e0f8986..f0d11792b9f7 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1205-c561-list-displ-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1205-c561-list-displ-00-b-expected.txt @@ -4,38 +4,38 @@ layer at (0,0) size 800x220 RenderBlock {HTML} at (0,0) size 800x220 RenderBody {BODY} at (8,16) size 784x196 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 713x19 - text run at (0,0) width 713: "There should be eight numbered lines below, all identical except for the numbering, which should match the description." + RenderText {#text} at (0,0) size 756x19 + text run at (0,0) width 756: "There should be eight numbered lines below, all identical except for the numbering, which should match the description." RenderListItem {DIV} at (0,36) size 784x20 [color=#000080] RenderListMarker at (0,0) size 16x19: "1" - RenderText {#text} at (16,0) size 141x19 - text run at (16,0) width 141: "This should be line one." + RenderText {#text} at (16,0) size 151x19 + text run at (16,0) width 151: "This should be line one." RenderBlock {DIV} at (0,56) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 158x19 - text run at (0,0) width 158: "2. This should be line two." + RenderText {#text} at (0,0) size 168x19 + text run at (0,0) width 168: "2. This should be line two." RenderBlock (anonymous) at (0,76) size 784x20 - RenderInline {DIV} at (0,0) size 88x19 [color=#000080] - RenderText {#text} at (0,0) size 88x19 - text run at (0,0) width 88: "3. This should " + RenderInline {DIV} at (0,0) size 94x19 [color=#000080] + RenderText {#text} at (0,0) size 94x19 + text run at (0,0) width 94: "3. This should " RenderText {#text} at (0,0) size 0x0 - RenderInline {DIV} at (0,0) size 77x19 [color=#000080] - RenderText {#text} at (88,0) size 77x19 - text run at (88,0) width 77: "be line three." + RenderInline {DIV} at (0,0) size 81x19 [color=#000080] + RenderText {#text} at (94,0) size 81x19 + text run at (94,0) width 81: "be line three." RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,96) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 159x19 - text run at (0,0) width 159: "4. This should be line four." + RenderText {#text} at (0,0) size 169x19 + text run at (0,0) width 169: "4. This should be line four." RenderBlock {DIV} at (0,116) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "5. This should be line five." + RenderText {#text} at (0,0) size 168x19 + text run at (0,0) width 168: "5. This should be line five." RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,136) size 784x60 [color=#000080] RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 151x19 - text run at (0,0) width 151: "6. This should be line six." + RenderText {#text} at (0,0) size 162x19 + text run at (0,0) width 162: "6. This should be line six." RenderBlock {A} at (0,20) size 784x20 - RenderText {#text} at (0,0) size 169x19 - text run at (0,0) width 169: "7. This should be line seven." + RenderText {#text} at (0,0) size 180x19 + text run at (0,0) width 180: "7. This should be line seven." RenderBlock (anonymous) at (0,40) size 784x20 - RenderText {#text} at (0,0) size 163x19 - text run at (0,0) width 163: "8. This should be line eight." + RenderText {#text} at (0,0) size 175x19 + text run at (0,0) width 175: "8. This should be line eight." diff --git a/LayoutTests/platform/wincairo/css2.1/t1205-c563-list-type-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1205-c563-list-type-00-b-expected.txt index 192557265e81..c70b7a524046 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1205-c563-list-type-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1205-c563-list-type-00-b-expected.txt @@ -4,47 +4,47 @@ layer at (0,0) size 800x356 RenderBlock {HTML} at (0,0) size 800x356 RenderBody {BODY} at (8,16) size 784x324 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 441x19 - text run at (0,0) width 441: "Each bullet should look as described, and there should be no red present." + RenderText {#text} at (0,0) size 458x19 + text run at (0,0) width 458: "Each bullet should look as described, and there should be no red present." RenderBlock {UL} at (0,36) size 784x60 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 24x19 - text run at (0,0) width 24: "disc" + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "disc" RenderListItem {LI} at (40,20) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 24x19 - text run at (0,0) width 24: "disc" + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "disc" RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 24x19 - text run at (0,0) width 24: "disc" + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "disc" RenderBlock {UL} at (0,112) size 784x60 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "circle" + RenderText {#text} at (0,0) size 34x19 + text run at (0,0) width 34: "circle" RenderListItem {LI} at (40,20) size 744x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "circle" + RenderText {#text} at (0,0) size 34x19 + text run at (0,0) width 34: "circle" RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "circle" + RenderText {#text} at (0,0) size 34x19 + text run at (0,0) width 34: "circle" RenderBlock {UL} at (0,188) size 784x60 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 40x19 - text run at (0,0) width 40: "square" + RenderText {#text} at (0,0) size 41x19 + text run at (0,0) width 41: "square" RenderListItem {LI} at (40,20) size 744x20 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 40x19 - text run at (0,0) width 40: "square" + RenderText {#text} at (0,0) size 41x19 + text run at (0,0) width 41: "square" RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-18,0) size 7x19: black square - RenderText {#text} at (0,0) size 40x19 - text run at (0,0) width 40: "square" + RenderText {#text} at (0,0) size 41x19 + text run at (0,0) width 41: "square" RenderBlock {UL} at (0,264) size 784x60 [color=#FF0000] RenderListItem {LI} at (40,0) size 744x20 RenderText {#text} at (0,0) size 4x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1205-c563-list-type-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1205-c563-list-type-01-b-expected.txt index da7276eb1389..a5213b69c62c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1205-c563-list-type-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1205-c563-list-type-01-b-expected.txt @@ -4,21 +4,21 @@ layer at (0,0) size 800x432 RenderBlock {HTML} at (0,0) size 800x432 RenderBody {BODY} at (8,16) size 784x400 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 367x19 - text run at (0,0) width 367: "The two columns should look the same, except for alignment." + RenderText {#text} at (0,0) size 388x19 + text run at (0,0) width 388: "The two columns should look the same, except for alignment." RenderBlock {OL} at (0,36) size 784x60 RenderListItem {LI} at (40,0) size 744x20 - RenderListMarker at (-16,0) size 11x19: "i" - RenderText {#text} at (0,0) size 7x19 - text run at (0,0) width 7: "i." + RenderListMarker at (-17,0) size 12x19: "i" + RenderText {#text} at (0,0) size 8x19 + text run at (0,0) width 8: "i." RenderListItem {LI} at (40,20) size 744x20 - RenderListMarker at (-19,0) size 14x19: "ii" - RenderText {#text} at (0,0) size 10x19 - text run at (0,0) width 10: "ii." + RenderListMarker at (-21,0) size 16x19: "ii" + RenderText {#text} at (0,0) size 12x19 + text run at (0,0) width 12: "ii." RenderListItem {LI} at (40,40) size 744x20 - RenderListMarker at (-22,0) size 17x19: "iii" - RenderText {#text} at (0,0) size 13x19 - text run at (0,0) width 13: "iii." + RenderListMarker at (-25,0) size 20x19: "iii" + RenderText {#text} at (0,0) size 16x19 + text run at (0,0) width 16: "iii." RenderBlock {OL} at (0,112) size 784x60 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 13x19: "I" @@ -47,26 +47,26 @@ layer at (0,0) size 800x432 text run at (0,0) width 11: "c." RenderBlock {OL} at (0,264) size 784x60 RenderListItem {LI} at (40,0) size 744x20 - RenderListMarker at (-24,0) size 19x19: "A" - RenderText {#text} at (0,0) size 15x19 - text run at (0,0) width 15: "A." + RenderListMarker at (-25,0) size 20x19: "A" + RenderText {#text} at (0,0) size 16x19 + text run at (0,0) width 16: "A." RenderListItem {LI} at (40,20) size 744x20 - RenderListMarker at (-23,0) size 18x19: "B" - RenderText {#text} at (0,0) size 14x19 - text run at (0,0) width 14: "B." + RenderListMarker at (-24,0) size 19x19: "B" + RenderText {#text} at (0,0) size 15x19 + text run at (0,0) width 15: "B." RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-24,0) size 19x19: "C" RenderText {#text} at (0,0) size 15x19 text run at (0,0) width 15: "C." RenderBlock {OL} at (0,340) size 784x60 RenderListItem {LI} at (40,0) size 744x20 - RenderListMarker at (-24,0) size 19x19: "A" - RenderText {#text} at (0,0) size 15x19 - text run at (0,0) width 15: "A." + RenderListMarker at (-25,0) size 20x19: "A" + RenderText {#text} at (0,0) size 16x19 + text run at (0,0) width 16: "A." RenderListItem {LI} at (40,20) size 744x20 - RenderListMarker at (-23,0) size 18x19: "B" - RenderText {#text} at (0,0) size 14x19 - text run at (0,0) width 14: "B." + RenderListMarker at (-24,0) size 19x19: "B" + RenderText {#text} at (0,0) size 15x19 + text run at (0,0) width 15: "B." RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-21,0) size 16x19: "3" RenderText {#text} at (0,0) size 12x19 diff --git a/LayoutTests/platform/wincairo/css2.1/t1205-c564-list-img-00-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1205-c564-list-img-00-b-g-expected.txt index b72d024f77b8..2ead6177b65b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1205-c564-list-img-00-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1205-c564-list-img-00-b-g-expected.txt @@ -4,31 +4,31 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x178 [color=#000080] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 224x19 - text run at (0,0) width 224: "Each bullet should look as described." + RenderText {#text} at (0,0) size 234x19 + text run at (0,0) width 234: "Each bullet should look as described." RenderBlock {UL} at (0,36) size 784x66 RenderListItem {LI} at (40,0) size 744x22 RenderListMarker at (-24,0) size 17x17 - RenderText {#text} at (0,2) size 82x19 - text run at (0,2) width 82: "purple square" + RenderText {#text} at (0,2) size 85x19 + text run at (0,2) width 85: "purple square" RenderListItem {LI} at (40,22) size 744x22 RenderListMarker at (-24,0) size 17x17 - RenderText {#text} at (0,2) size 82x19 - text run at (0,2) width 82: "purple square" + RenderText {#text} at (0,2) size 85x19 + text run at (0,2) width 85: "purple square" RenderListItem {LI} at (40,44) size 744x22 RenderListMarker at (-24,0) size 17x17 - RenderText {#text} at (0,2) size 82x19 - text run at (0,2) width 82: "purple square" + RenderText {#text} at (0,2) size 85x19 + text run at (0,2) width 85: "purple square" RenderBlock {UL} at (0,118) size 784x60 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 24x19 - text run at (0,0) width 24: "disc" + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "disc" RenderListItem {LI} at (40,20) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 24x19 - text run at (0,0) width 24: "disc" + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "disc" RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 24x19 - text run at (0,0) width 24: "disc" + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "disc" diff --git a/LayoutTests/platform/wincairo/css2.1/t1205-c565-list-pos-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1205-c565-list-pos-00-b-expected.txt index 799cc458c057..dbddb889118d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1205-c565-list-pos-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1205-c565-list-pos-00-b-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x102 RenderBlock {HTML} at (0,0) size 800x102 RenderBody {BODY} at (8,16) size 784x78 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 341x19 - text run at (0,0) width 341: "The following two boxes should be identical, to the pixel." + RenderText {#text} at (0,0) size 363x19 + text run at (0,0) width 363: "The following two boxes should be identical, to the pixel." RenderBlock {OL} at (80,36) size 160x20 [color=#FFFFFF] [bgcolor=#000080] RenderListItem {LI} at (0,0) size 160x20 RenderListMarker at (-21,0) size 16x19: "1" diff --git a/LayoutTests/platform/wincairo/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt index 394a471e0c84..af285d073d22 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1205-c566-list-stl-00-e-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x118 RenderBlock {HTML} at (0,0) size 800x118 RenderBody {BODY} at (8,16) size 784x87 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 185x19 - text run at (0,0) width 185: "There should be no red below." + RenderText {#text} at (0,0) size 192x19 + text run at (0,0) width 192: "There should be no red below." RenderBlock {UL} at (75,36) size 96x51 [color=#00FF00] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderListItem {LI} at (3,3) size 90x45 RenderListMarker at (0,0) size 45x15: "A" diff --git a/LayoutTests/platform/wincairo/css2.1/t1205-c566-list-stl-01-c-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1205-c566-list-stl-01-c-g-expected.txt index 0c1db50d8c4b..42d8f2c8a8e9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1205-c566-list-stl-01-c-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1205-c566-list-stl-01-c-g-expected.txt @@ -9,6 +9,6 @@ layer at (0,0) size 800x127 RenderImage {IMG} at (15,0) size 15x15 RenderText {#text} at (30,0) size 4x19 text run at (30,0) width 4: " " - RenderInline {SPAN} at (0,0) size 345x19 [color=#000000] - RenderText {#text} at (34,0) size 345x19 - text run at (34,0) width 345: "\x{21E6} There should be a green square to the left, and no red." + RenderInline {SPAN} at (0,0) size 358x19 [color=#000000] + RenderText {#text} at (34,0) size 358x19 + text run at (34,0) width 358: "\x{21E6} There should be a green square to the left, and no red." diff --git a/LayoutTests/platform/wincairo/css2.1/t1401-c531-color-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1401-c531-color-00-a-expected.txt index 784bfce39d12..bf4072adb2f1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1401-c531-color-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1401-c531-color-00-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 [color=#008000] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t1402-c45-bg-canvas-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1402-c45-bg-canvas-00-b-expected.txt index 35b8431c5b8e..f75d0509a119 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1402-c45-bg-canvas-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1402-c45-bg-canvas-00-b-expected.txt @@ -4,6 +4,6 @@ layer at (0,0) size 800x70 RenderBlock {HTML} at (0,0) size 800x70 [bgcolor=#800080] RenderBody {BODY} at (25,25) size 750x20 [color=#FFFFFF] [bgcolor=#000080] RenderBlock {P} at (0,0) size 750x20 - RenderText {#text} at (0,0) size 634x19 - text run at (0,0) width 362: "This paragraph should be in a blue block near the top of the " - text run at (362,0) width 272: "page. Around it on all sides should be purple." + RenderText {#text} at (0,0) size 665x19 + text run at (0,0) width 379: "This paragraph should be in a blue block near the top of the " + text run at (379,0) width 286: "page. Around it on all sides should be purple." diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c532-bgcolor-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c532-bgcolor-00-a-expected.txt index d7178ee898f3..9c617da3a196 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c532-bgcolor-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c532-bgcolor-00-a-expected.txt @@ -4,16 +4,16 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 [bgcolor=#00FF00] - RenderText {#text} at (0,0) size 53x19 - text run at (0,0) width 53: "This line " - RenderInline {SPAN} at (0,0) size 95x19 - RenderText {#text} at (53,0) size 95x19 - text run at (53,0) width 95: "should be green" - RenderText {#text} at (148,0) size 28x19 - text run at (148,0) width 28: " too." + RenderText {#text} at (0,0) size 59x19 + text run at (0,0) width 59: "This line " + RenderInline {SPAN} at (0,0) size 100x19 + RenderText {#text} at (59,0) size 100x19 + text run at (59,0) width 100: "should be green" + RenderText {#text} at (159,0) size 28x19 + text run at (159,0) width 28: " too." RenderBlock {P} at (0,72) size 784x20 [bgcolor=#AAFFAA] - RenderText {#text} at (0,0) size 181x19 - text run at (0,0) width 181: "This line should be pale green." + RenderText {#text} at (0,0) size 193x19 + text run at (0,0) width 193: "This line should be pale green." diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c532-bgcolor-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c532-bgcolor-01-b-expected.txt index 3918787d4c31..83dd4ccfb79f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c532-bgcolor-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c532-bgcolor-01-b-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 [color=#008000] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c533-bgimage-00-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c533-bgimage-00-a-expected.txt index 7207e57d6848..54635e972264 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c533-bgimage-00-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c533-bgimage-00-a-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 53x19 - text run at (0,0) width 53: "This line " - RenderInline {SPAN} at (0,0) size 95x19 - RenderText {#text} at (53,0) size 95x19 - text run at (53,0) width 95: "should be green" - RenderText {#text} at (148,0) size 28x19 - text run at (148,0) width 28: " too." + RenderText {#text} at (0,0) size 59x19 + text run at (0,0) width 59: "This line " + RenderInline {SPAN} at (0,0) size 100x19 + RenderText {#text} at (59,0) size 100x19 + text run at (59,0) width 100: "should be green" + RenderText {#text} at (159,0) size 28x19 + text run at (159,0) width 28: " too." diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c533-bgimage-01-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c533-bgimage-01-b-g-expected.txt index 3918787d4c31..83dd4ccfb79f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c533-bgimage-01-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c533-bgimage-01-b-g-expected.txt @@ -4,5 +4,5 @@ layer at (0,0) size 800x52 RenderBlock {HTML} at (0,0) size 800x52 RenderBody {BODY} at (8,16) size 784x20 [color=#008000] RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 152x19 - text run at (0,0) width 152: "This line should be green." + RenderText {#text} at (0,0) size 163x19 + text run at (0,0) width 163: "This line should be green." diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgre-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgre-00-b-ag-expected.txt index 47bfc81dcce7..348bda725225 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgre-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgre-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x291 RenderBlock {HTML} at (0,0) size 800x291 RenderBody {BODY} at (8,16) size 784x267 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "There should be a green block below." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "There should be a green block below." RenderBlock {DIV} at (0,36) size 156x231 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 150x75 RenderText {#text} at (0,0) size 150x75 diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgre-01-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgre-01-b-ag-expected.txt index b02c279f8723..9e6ad44f969e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgre-01-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgre-01-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x291 RenderBlock {HTML} at (0,0) size 800x291 RenderBody {BODY} at (8,16) size 784x267 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "There should be a green block below." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "There should be a green block below." RenderBlock {DIV} at (0,36) size 156x231 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 150x75 RenderText {#text} at (0,0) size 150x75 diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt index 75bc02b142b7..938324bedb20 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x136 RenderBlock {HTML} at (0,0) size 800x136 RenderBody {BODY} at (8,16) size 784x112 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "There should be a green block below." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "There should be a green block below." RenderBlock {DIV} at (0,36) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt index 78a323e1f9c3..b994363aef6e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x136 RenderBlock {HTML} at (0,0) size 800x136 RenderBody {BODY} at (8,16) size 784x112 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "There should be a green block below." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "There should be a green block below." RenderBlock {DIV} at (0,36) size 160x76 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt index 582e60d80c3b..e616220a0c9a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x136 RenderBlock {HTML} at (0,0) size 800x136 RenderBody {BODY} at (8,16) size 784x112 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "There should be a green block below." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "There should be a green block below." RenderBlock {DIV} at (0,36) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt index ae56e32d1cbf..48cae0122997 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x136 RenderBlock {HTML} at (0,0) size 800x136 RenderBody {BODY} at (8,16) size 784x112 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "There should be a green block below." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "There should be a green block below." RenderBlock {DIV} at (0,36) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt index 1871bc27b81c..35888244d261 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x136 RenderBlock {HTML} at (0,0) size 800x136 RenderBody {BODY} at (8,16) size 784x112 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "There should be a green block below." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "There should be a green block below." RenderBlock {DIV} at (0,36) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt index 7ef744ddfe7c..02544d067c8e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x136 RenderBlock {HTML} at (0,0) size 800x136 RenderBody {BODY} at (8,16) size 784x112 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "There should be a green block below." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "There should be a green block below." RenderBlock {DIV} at (0,36) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {DIV} at (3,3) size 154x70 RenderText {#text} at (0,0) size 154x70 diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt index 4b19cc94215d..dc0730ef00dc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c535-bg-fixd-00-b-g-expected.txt @@ -4,483 +4,483 @@ layer at (0,0) size 785x3248 RenderBlock {HTML} at (0,0) size 785x3248 RenderBody {BODY} at (8,8) size 769x3232 RenderBlock {DIV} at (0,0) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,20) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,40) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,76) size 769x20 - RenderText {#text} at (0,0) size 584x19 - text run at (0,0) width 374: "Scroll this document. A line of blue should remain stuck at the " - text run at (374,0) width 210: "top of the viewport the whole time." + RenderText {#text} at (0,0) size 616x19 + text run at (0,0) width 395: "Scroll this document. A line of blue should remain stuck at the " + text run at (395,0) width 221: "top of the viewport the whole time." RenderBlock {DIV} at (0,112) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,132) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,152) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,172) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,192) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,212) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,232) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,252) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,272) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,292) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,312) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,332) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,352) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,372) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,392) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,412) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,432) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,452) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,472) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,492) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,512) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,532) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,552) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,572) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,592) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,612) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,632) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,652) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,672) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,692) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,712) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,732) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,752) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,772) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,792) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,812) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,832) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,852) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,872) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,892) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,912) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,932) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,952) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,972) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,992) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1012) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1032) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1052) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1072) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1092) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1112) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1132) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1152) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1172) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1192) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1212) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1232) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1252) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1272) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1292) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1312) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1332) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1352) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1372) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1392) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1412) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1432) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1452) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1472) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1492) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1512) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1532) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1552) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1572) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1592) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1612) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1632) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1652) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1672) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1692) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1712) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1732) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1752) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1772) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1792) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1812) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1832) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1852) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1872) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1892) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1912) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1932) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1952) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1972) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,1992) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2012) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2032) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2052) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2072) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2092) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2112) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2132) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2152) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2172) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2192) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2212) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2232) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2252) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2272) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2292) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2312) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2332) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2352) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2372) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2392) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2412) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2432) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2452) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2472) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2492) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2512) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2532) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2552) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2572) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2592) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2612) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2632) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2652) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2672) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2692) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2712) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2732) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2752) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2772) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2792) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2812) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2832) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2852) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2872) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2892) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2912) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2932) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2952) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2972) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,2992) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3012) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3032) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3052) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3072) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3092) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3112) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3132) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3152) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3172) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3192) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {DIV} at (0,3212) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt index 8ab8a22a3bac..5335ee39820d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt @@ -7,8 +7,8 @@ layer at (0,0) size 800x292 RenderText {#text} at (785,0) size 15x15 text run at (785,0) width 15: "X" RenderBlock {P} at (0,31) size 800x20 - RenderText {#text} at (0,0) size 466x19 - text run at (0,0) width 466: "There should be no red on this page (look in the upper right hand corner too)." + RenderText {#text} at (0,0) size 487x19 + text run at (0,0) width 487: "There should be no red on this page (look in the upper right hand corner too)." RenderBlock {DIV} at (0,67) size 165x75 [color=#FFFFFF] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " " diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt index 92ea24ac7677..02823a2dd446 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x352 RenderBlock {HTML} at (0,0) size 800x352 RenderBody {BODY} at (0,16) size 800x336 RenderBlock {P} at (0,0) size 800x20 - RenderText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "There should be no red on this page." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "There should be no red on this page." RenderBlock {DIV} at (0,36) size 165x75 [color=#FFFFFF] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " " diff --git a/LayoutTests/platform/wincairo/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt index ab152e855d25..a2e27ad22a27 100644 --- a/LayoutTests/platform/wincairo/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt @@ -4,19 +4,20 @@ layer at (0,0) size 785x2041 RenderBlock {HTML} at (0,0) size 785x2041 RenderBody {BODY} at (8,16) size 769x2009 RenderBlock {P} at (0,0) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,36) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,72) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,108) size 769x40 - RenderText {#text} at (0,0) size 749x39 - text run at (0,0) width 374: "Scroll this document. A line of blue should remain stuck at the " - text run at (374,0) width 375: "top of the viewport the whole time, and there should be no red" - text run at (0,20) width 172: "below, just a block of green." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 395: "Scroll this document. A line of blue should remain stuck at the " + text run at (395,0) width 368: "top of the viewport the whole time, and there should be no" + text run at (0,20) width 24: "red " + text run at (24,20) width 178: "below, just a block of green." RenderBlock {DIV} at (30,164) size 165x75 [color=#008000] [bgcolor=#008000] RenderText {#text} at (0,0) size 165x75 text run at (0,0) width 165: " X" @@ -39,137 +40,137 @@ layer at (0,0) size 785x2041 text run at (0,45) width 165: " " text run at (0,60) width 165: " " RenderBlock {P} at (0,405) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,441) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,477) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,513) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,549) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,585) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,621) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,657) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,693) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,729) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,765) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,801) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,837) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,873) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,909) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,945) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,981) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1017) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1053) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1089) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1125) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1161) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1197) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1233) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1269) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1305) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1341) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1377) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1413) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1449) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1485) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1521) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1557) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1593) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1629) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1665) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1701) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1737) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1773) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1809) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1845) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1881) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1917) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1953) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." RenderBlock {P} at (0,1989) size 769x20 [color=#C0C0C0] - RenderText {#text} at (0,0) size 77x19 - text run at (0,0) width 77: "Dummy text." + RenderText {#text} at (0,0) size 83x19 + text run at (0,0) width 83: "Dummy text." diff --git a/LayoutTests/platform/wincairo/css2.1/t1504-c523-font-style-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1504-c523-font-style-00-b-expected.txt index fa8dc38a42b3..d9b76a072d38 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1504-c523-font-style-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1504-c523-font-style-00-b-expected.txt @@ -4,17 +4,17 @@ layer at (0,0) size 800x124 RenderBlock {HTML} at (0,0) size 800x124 RenderBody {BODY} at (8,16) size 784x92 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 217x19 - text run at (0,0) width 217: "This sentence should be in italics. " - RenderInline {SPAN} at (0,0) size 192x19 - RenderText {#text} at (217,0) size 192x19 - text run at (217,0) width 192: "This sentence should be normal." + RenderText {#text} at (0,0) size 215x19 + text run at (0,0) width 215: "This sentence should be in italics. " + RenderInline {SPAN} at (0,0) size 203x19 + RenderText {#text} at (215,0) size 203x19 + text run at (215,0) width 203: "This sentence should be normal." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,36) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "This sentence should be oblique." + RenderText {#text} at (0,0) size 205x19 + text run at (0,0) width 205: "This sentence should be oblique." RenderBlock {P} at (0,72) size 784x20 [color=#000080] - RenderInline {I} at (0,0) size 192x19 - RenderText {#text} at (0,0) size 192x19 - text run at (0,0) width 192: "This sentence should be normal." + RenderInline {I} at (0,0) size 203x19 + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This sentence should be normal." RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1505-c524-font-var-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1505-c524-font-var-00-b-expected.txt index 5b8dfea6e371..0a35a95d2fae 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1505-c524-font-var-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1505-c524-font-var-00-b-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x88 RenderBlock {HTML} at (0,0) size 800x88 RenderBody {BODY} at (8,16) size 784x56 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This Paragraph should be in Small Caps." + RenderText {#text} at (0,0) size 268x19 + text run at (0,0) width 268: "This Paragraph should be in Small Caps." RenderBlock {P} at (0,36) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 261x19 - text run at (0,0) width 261: "This Sentence should be in Small Caps. " - RenderInline {SPAN} at (0,0) size 200x19 - RenderText {#text} at (261,0) size 200x19 - text run at (261,0) width 200: "This Sentence should be Normal." + RenderText {#text} at (0,0) size 263x19 + text run at (0,0) width 263: "This Sentence should be in Small Caps. " + RenderInline {SPAN} at (0,0) size 210x19 + RenderText {#text} at (263,0) size 210x19 + text run at (263,0) width 210: "This Sentence should be Normal." RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1506-c525-font-wt-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1506-c525-font-wt-00-b-expected.txt index b1ed8a2e0845..23e28b5a0835 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1506-c525-font-wt-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1506-c525-font-wt-00-b-expected.txt @@ -4,44 +4,44 @@ layer at (0,0) size 800x464 RenderBlock {HTML} at (0,0) size 800x464 RenderBody {BODY} at (8,16) size 784x432 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 192x19 - text run at (0,0) width 192: "This sentence should be normal." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This sentence should be normal." RenderBlock {P} at (0,36) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 292x19 - text run at (0,0) width 292: "This sentence should be bolder than normal." + RenderText {#text} at (0,0) size 300x19 + text run at (0,0) width 300: "This sentence should be bolder than normal." RenderBlock {P} at (0,72) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 195x19 - text run at (0,0) width 195: "This sentence should be bold." + RenderText {#text} at (0,0) size 198x19 + text run at (0,0) width 198: "This sentence should be bold." RenderBlock {H4} at (0,113) size 784x21 [color=#000080] - RenderText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "Whatever this line looks like..." + RenderText {#text} at (0,0) size 202x19 + text run at (0,0) width 202: "Whatever this line looks like..." RenderBlock {H4} at (0,154) size 784x21 [color=#000080] - RenderText {#text} at (0,0) size 286x19 - text run at (0,0) width 286: "...this line should look bolder (or the same)." + RenderText {#text} at (0,0) size 290x19 + text run at (0,0) width 290: "...this line should look bolder (or the same)." RenderBlock {P} at (0,195) size 784x21 [color=#000080] - RenderInline {B} at (0,0) size 192x19 - RenderText {#text} at (0,0) size 192x19 - text run at (0,0) width 192: "This sentence should be normal." + RenderInline {B} at (0,0) size 203x19 + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This sentence should be normal." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (0,231) size 784x21 [color=#000080] - RenderText {#text} at (0,0) size 205x19 - text run at (0,0) width 205: "This sentence should be very light." + RenderText {#text} at (0,0) size 219x19 + text run at (0,0) width 219: "This sentence should be very light." RenderBlock {P} at (0,267) size 784x21 [color=#000080] - RenderText {#text} at (0,0) size 318x19 - text run at (0,0) width 318: "This sentence should be slightly bolder (or the same)." + RenderText {#text} at (0,0) size 335x19 + text run at (0,0) width 335: "This sentence should be slightly bolder (or the same)." RenderBlock {P} at (0,303) size 784x21 [color=#000080] - RenderText {#text} at (0,0) size 353x19 - text run at (0,0) width 353: "This sentence should be slightly bolder again (or the same)." + RenderText {#text} at (0,0) size 373x19 + text run at (0,0) width 373: "This sentence should be slightly bolder again (or the same)." RenderBlock {P} at (0,339) size 784x21 [color=#000080] - RenderText {#text} at (0,0) size 413x19 - text run at (0,0) width 413: "This sentence should be slightly bolder still (but not the same)." + RenderText {#text} at (0,0) size 417x19 + text run at (0,0) width 417: "This sentence should be slightly bolder still (but not the same)." RenderBlock {P} at (0,375) size 784x21 [color=#000080] - RenderText {#text} at (0,0) size 506x19 - text run at (0,0) width 506: "This sentence should be the most bold (and maybe the same as the last one)." + RenderText {#text} at (0,0) size 509x19 + text run at (0,0) width 509: "This sentence should be the most bold (and maybe the same as the last one)." RenderBlock {P} at (0,411) size 784x21 [color=#000080] - RenderText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "This sentence should be bold. " - RenderInline {SPAN} at (0,0) size 192x19 - RenderText {#text} at (199,0) size 192x19 - text run at (199,0) width 192: "This sentence should be normal." + RenderText {#text} at (0,0) size 202x19 + text run at (0,0) width 202: "This sentence should be bold. " + RenderInline {SPAN} at (0,0) size 203x19 + RenderText {#text} at (202,0) size 203x19 + text run at (202,0) width 203: "This sentence should be normal." RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-00-b-expected.txt index eb7d3be7cb8c..e40b15a79cbd 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-00-b-expected.txt @@ -4,56 +4,56 @@ layer at (0,0) size 800x334 RenderBlock {HTML} at (0,0) size 800x334 RenderBody {BODY} at (8,10) size 784x314 RenderBlock {P} at (10,0) size 764x20 [color=#000080] - RenderText {#text} at (0,0) size 192x19 - text run at (0,0) width 192: "This sentence should be normal." + RenderText {#text} at (0,0) size 203x19 + text run at (0,0) width 203: "This sentence should be normal." RenderBlock {P} at (10,30) size 764x20 [color=#000080] - RenderText {#text} at (0,0) size 204x19 - text run at (0,0) width 204: "This sentence should be the same." + RenderText {#text} at (0,0) size 214x19 + text run at (0,0) width 214: "This sentence should be the same." RenderBlock {P} at (10,60) size 764x22 [color=#000080] - RenderText {#text} at (0,0) size 323x21 - text run at (0,0) width 323: "This sentence should be larger than normal." + RenderText {#text} at (0,0) size 333x21 + text run at (0,0) width 333: "This sentence should be larger than normal." RenderBlock {P} at (10,92) size 764x16 [color=#000080] - RenderText {#text} at (0,0) size 240x15 - text run at (0,0) width 240: "This sentence should be smaller than normal." + RenderText {#text} at (0,0) size 243x15 + text run at (0,0) width 243: "This sentence should be smaller than normal." RenderBlock {P} at (10,118) size 764x20 [color=#000080] - RenderText {#text} at (0,5) size 137x12 - text run at (0,5) width 137: "This sentence should be very small. " - RenderInline {SPAN} at (0,0) size 242x19 - RenderText {#text} at (137,0) size 242x19 - text run at (137,0) width 242: "This sentence should be back to normal." + RenderText {#text} at (0,5) size 139x12 + text run at (0,5) width 139: "This sentence should be very small. " + RenderInline {SPAN} at (0,0) size 253x19 + RenderText {#text} at (139,0) size 253x19 + text run at (139,0) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (10,148) size 764x20 [color=#000080] - RenderText {#text} at (0,5) size 153x12 - text run at (0,5) width 153: "This sentence should be rather small. " - RenderInline {SPAN} at (0,0) size 242x19 - RenderText {#text} at (153,0) size 242x19 - text run at (153,0) width 242: "This sentence should be back to normal." + RenderText {#text} at (0,5) size 152x12 + text run at (0,5) width 152: "This sentence should be rather small. " + RenderInline {SPAN} at (0,0) size 253x19 + RenderText {#text} at (152,0) size 253x19 + text run at (152,0) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (10,178) size 764x20 [color=#000080] - RenderText {#text} at (0,3) size 167x15 - text run at (0,3) width 167: "This sentence should be small. " - RenderInline {SPAN} at (0,0) size 242x19 - RenderText {#text} at (167,0) size 242x19 - text run at (167,0) width 242: "This sentence should be back to normal." + RenderText {#text} at (0,3) size 168x15 + text run at (0,3) width 168: "This sentence should be small. " + RenderInline {SPAN} at (0,0) size 253x19 + RenderText {#text} at (168,0) size 253x19 + text run at (168,0) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (10,208) size 764x21 [color=#000080] - RenderText {#text} at (0,0) size 222x20 - text run at (0,0) width 222: "This sentence should be large. " - RenderInline {SPAN} at (0,0) size 242x19 - RenderText {#text} at (222,1) size 242x19 - text run at (222,1) width 242: "This sentence should be back to normal." + RenderText {#text} at (0,0) size 225x20 + text run at (0,0) width 225: "This sentence should be large. " + RenderInline {SPAN} at (0,0) size 253x19 + RenderText {#text} at (225,1) size 253x19 + text run at (225,1) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (10,239) size 764x28 [color=#000080] - RenderText {#text} at (0,0) size 357x27 - text run at (0,0) width 357: "This sentence should be rather large. " - RenderInline {SPAN} at (0,0) size 242x19 - RenderText {#text} at (357,6) size 242x19 - text run at (357,6) width 242: "This sentence should be back to normal." + RenderText {#text} at (0,0) size 362x27 + text run at (0,0) width 362: "This sentence should be rather large. " + RenderInline {SPAN} at (0,0) size 253x19 + RenderText {#text} at (362,6) size 253x19 + text run at (362,6) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 RenderBlock {P} at (10,277) size 764x37 [color=#000080] - RenderText {#text} at (0,0) size 446x36 - text run at (0,0) width 446: "This sentence should be very large. " - RenderInline {SPAN} at (0,0) size 242x19 - RenderText {#text} at (446,13) size 242x19 - text run at (446,13) width 242: "This sentence should be back to normal." + RenderText {#text} at (0,0) size 457x36 + text run at (0,0) width 457: "This sentence should be very large. " + RenderInline {SPAN} at (0,0) size 253x19 + RenderText {#text} at (457,13) size 253x19 + text run at (457,13) width 253: "This sentence should be back to normal." RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-01-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-01-b-a-expected.txt index 731813fe961d..c83621c67ad3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-01-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-01-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x348 RenderBlock {HTML} at (0,0) size 800x348 RenderBody {BODY} at (8,16) size 784x324 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 445x19 - text run at (0,0) width 445: "There should be a solid single uninterrupted smooth column of blue below." + RenderText {#text} at (0,0) size 471x19 + text run at (0,0) width 471: "There should be a solid single uninterrupted smooth column of blue below." RenderBlock {DIV} at (96,36) size 592x48 [color=#000080] RenderText {#text} at (0,0) size 48x48 text run at (0,0) width 48: "x" diff --git a/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-02-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-02-b-a-expected.txt index 3f69b44e1b33..25a22d28d861 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-02-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-02-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x157 RenderBlock {HTML} at (0,0) size 800x157 RenderBody {BODY} at (8,16) size 784x133 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 445x19 - text run at (0,0) width 445: "There should be a solid single uninterrupted smooth column of blue below." + RenderText {#text} at (0,0) size 471x19 + text run at (0,0) width 471: "There should be a solid single uninterrupted smooth column of blue below." RenderBlock {DIV} at (0,36) size 784x97 [color=#000080] RenderBlock {DIV} at (0,0) size 784x32 RenderText {#text} at (0,0) size 32x32 diff --git a/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-03-f-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-03-f-a-expected.txt index be1740fa7eed..d15bb5612f52 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-03-f-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1507-c526-font-sz-03-f-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x168 RenderBlock {HTML} at (0,0) size 800x168 RenderBody {BODY} at (8,16) size 784x142 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 280x19 - text run at (0,0) width 280: "The two boxes below should be the same size." + RenderText {#text} at (0,0) size 293x19 + text run at (0,0) width 293: "The two boxes below should be the same size." RenderBlock {DIV} at (0,36) size 784x106 [color=#000080] RenderBlock {P} at (30,0) size 724x48 RenderText {#text} at (0,0) size 48x48 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-00-b-expected.txt index 7e98941ee903..eff03fe99e87 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-00-b-expected.txt @@ -4,20 +4,20 @@ layer at (0,0) size 800x106 RenderBlock {HTML} at (0,0) size 800x106 RenderBody {BODY} at (8,13) size 784x80 [color=#000080] RenderBlock {P} at (0,0) size 784x80 - RenderText {#text} at (0,0) size 612x16 - text run at (0,0) width 612: "This text should be 13px Helvetica in small-caps and italicized. There should be a small gap between each line. " - RenderInline {SPAN} at (0,0) size 777x80 [color=#C0C0C0] - RenderText {#text} at (612,0) size 777x80 - text run at (612,0) width 165: "dummy text dummy text dummy" - text run at (0,16) width 195: "text dummy text dummy text dummy " - text run at (195,16) width 390: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (585,16) width 191: "text dummy text dummy text dummy" - text run at (0,32) width 195: "text dummy text dummy text dummy " - text run at (195,32) width 390: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (585,32) width 191: "text dummy text dummy text dummy" - text run at (0,48) width 195: "text dummy text dummy text dummy " - text run at (195,48) width 390: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (585,48) width 191: "text dummy text dummy text dummy" - text run at (0,64) width 195: "text dummy text dummy text dummy " - text run at (195,64) width 347: "text dummy text dummy text dummy text dummy text dummy text" + RenderText {#text} at (0,0) size 636x16 + text run at (0,0) width 636: "This text should be 13px Helvetica in small-caps and italicized. There should be a small gap between each line. " + RenderInline {SPAN} at (0,0) size 784x80 [color=#C0C0C0] + RenderText {#text} at (636,0) size 784x80 + text run at (636,0) width 132: "dummy text dummy text" + text run at (0,16) width 244: "dummy text dummy text dummy text dummy " + text run at (244,16) width 408: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (652,16) width 132: "text dummy text dummy" + text run at (0,32) width 272: "text dummy text dummy text dummy text dummy " + text run at (272,32) width 408: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (680,32) width 92: "text dummy text" + text run at (0,48) width 312: "dummy text dummy text dummy text dummy text dummy " + text run at (312,48) width 408: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (720,48) width 64: "text dummy" + text run at (0,64) width 340: "text dummy text dummy text dummy text dummy text dummy " + text run at (340,64) width 364: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-01-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-01-b-expected.txt index ea796dbd3c10..007ff58dd00f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-01-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-01-b-expected.txt @@ -4,22 +4,22 @@ layer at (0,0) size 800x225 RenderBlock {HTML} at (0,0) size 800x225 RenderBody {BODY} at (8,18) size 784x189 [color=#000080] RenderBlock {P} at (0,0) size 784x189 - RenderText {#text} at (0,3) size 557x20 - text run at (0,3) width 557: "This text should be 18px serif. There should be a 9px gap between each line. " - RenderInline {SPAN} at (0,0) size 783x182 [color=#C0C0C0] - RenderText {#text} at (557,3) size 783x182 - text run at (557,3) width 177: "dummy text dummy text" - text run at (0,30) width 333: "dummy text dummy text dummy text dummy " - text run at (333,30) width 450: "text dummy text dummy text dummy text dummy text dummy" - text run at (0,57) width 91: "text dummy " - text run at (91,57) width 546: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (637,57) width 117: "text dummy text" - text run at (0,84) width 424: "dummy text dummy text dummy text dummy text dummy " - text run at (424,84) width 359: "text dummy text dummy text dummy text dummy" - text run at (0,111) width 182: "text dummy text dummy " - text run at (182,111) width 546: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (728,111) width 26: "text" - text run at (0,138) width 515: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (515,138) width 268: "text dummy text dummy text dummy" - text run at (0,165) width 208: "text dummy text dummy text" + RenderText {#text} at (0,3) size 565x20 + text run at (0,3) width 565: "This text should be 18px serif. There should be a 9px gap between each line. " + RenderInline {SPAN} at (0,0) size 744x182 [color=#C0C0C0] + RenderText {#text} at (565,3) size 744x182 + text run at (565,3) width 179: "dummy text dummy text" + text run at (0,30) width 336: "dummy text dummy text dummy text dummy " + text run at (336,30) width 395: "text dummy text dummy text dummy text dummy text" + text run at (0,57) width 152: "dummy text dummy " + text run at (152,57) width 552: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (704,57) width 27: "text" + text run at (0,84) width 520: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (520,84) width 211: "text dummy text dummy text" + text run at (0,111) width 336: "dummy text dummy text dummy text dummy " + text run at (336,111) width 395: "text dummy text dummy text dummy text dummy text" + text run at (0,138) width 152: "dummy text dummy " + text run at (152,138) width 552: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (704,138) width 27: "text" + text run at (0,165) width 455: "dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-02-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-02-b-expected.txt index 785051bac3f6..30fb4e25c274 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-02-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-02-b-expected.txt @@ -4,22 +4,22 @@ layer at (0,0) size 800x225 RenderBlock {HTML} at (0,0) size 800x225 RenderBody {BODY} at (8,18) size 784x189 [color=#000080] RenderBlock {P} at (0,0) size 784x189 - RenderText {#text} at (0,3) size 661x21 - text run at (0,3) width 661: "This text should be 18px sans-serif. There should be a 9px gap between each line. " - RenderInline {SPAN} at (0,0) size 755x183 [color=#C0C0C0] - RenderText {#text} at (661,3) size 755x183 - text run at (661,3) width 90: "dummy text" - text run at (0,30) width 442: "dummy text dummy text dummy text dummy text dummy " - text run at (442,30) width 313: "text dummy text dummy text dummy text" - text run at (0,57) width 252: "dummy text dummy text dummy " - text run at (252,57) width 503: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,84) width 62: "dummy " - text run at (62,84) width 570: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (632,84) width 123: "text dummy text" - text run at (0,111) width 442: "dummy text dummy text dummy text dummy text dummy " - text run at (442,111) width 313: "text dummy text dummy text dummy text" - text run at (0,138) width 252: "dummy text dummy text dummy " - text run at (252,138) width 503: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,165) width 62: "dummy " - text run at (62,165) width 503: "text dummy text dummy text dummy text dummy text dummy text" + RenderText {#text} at (0,3) size 662x21 + text run at (0,3) width 662: "This text should be 18px sans-serif. There should be a 9px gap between each line. " + RenderInline {SPAN} at (0,0) size 779x183 [color=#C0C0C0] + RenderText {#text} at (662,3) size 779x183 + text run at (662,3) width 93: "dummy text" + text run at (0,30) width 456: "dummy text dummy text dummy text dummy text dummy " + text run at (456,30) width 323: "text dummy text dummy text dummy text" + text run at (0,57) width 260: "dummy text dummy text dummy " + text run at (260,57) width 519: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,84) width 64: "dummy " + text run at (64,84) width 588: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (652,84) width 127: "text dummy text" + text run at (0,111) width 456: "dummy text dummy text dummy text dummy text dummy " + text run at (456,111) width 323: "text dummy text dummy text dummy text" + text run at (0,138) width 260: "dummy text dummy text dummy " + text run at (260,138) width 519: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,165) width 64: "dummy " + text run at (64,165) width 519: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-03-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-03-b-expected.txt index b7cf6ac09f3c..b458d7614691 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-03-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-03-b-expected.txt @@ -4,20 +4,20 @@ layer at (0,0) size 800x156 RenderBlock {HTML} at (0,0) size 800x156 RenderBody {BODY} at (8,13) size 784x130 [color=#000080] RenderBlock {P} at (0,0) size 784x130 - RenderText {#text} at (0,5) size 339x15 - text run at (0,5) width 339: "This text should be small and cursive, with double line spacing. " - RenderInline {SPAN} at (0,0) size 784x119 [color=#C0C0C0] - RenderText {#text} at (339,5) size 784x119 - text run at (339,5) width 362: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (701,5) width 83: "text dummy text" - text run at (0,31) width 298: "dummy text dummy text dummy text dummy text dummy " - text run at (298,31) width 384: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (682,31) width 83: "text dummy text" - text run at (0,57) width 298: "dummy text dummy text dummy text dummy text dummy " - text run at (298,57) width 384: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (682,57) width 83: "text dummy text" - text run at (0,83) width 298: "dummy text dummy text dummy text dummy text dummy " - text run at (298,83) width 384: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (682,83) width 83: "text dummy text" - text run at (0,109) width 253: "dummy text dummy text dummy text dummy text" + RenderText {#text} at (0,5) size 347x15 + text run at (0,5) width 347: "This text should be small and cursive, with double line spacing. " + RenderInline {SPAN} at (0,0) size 752x119 [color=#C0C0C0] + RenderText {#text} at (347,5) size 752x119 + text run at (347,5) width 384: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (731,5) width 21: "text" + text run at (0,31) width 384: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (384,31) width 361: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,57) width 44: "dummy " + text run at (44,57) width 408: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (452,57) width 293: "text dummy text dummy text dummy text dummy text" + text run at (0,83) width 112: "dummy text dummy " + text run at (112,83) width 408: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (520,83) width 225: "text dummy text dummy text dummy text" + text run at (0,109) width 180: "dummy text dummy text dummy " + text run at (180,109) width 361: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-04-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-04-b-expected.txt index e890066abfab..c1012ebb3b50 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-04-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-04-b-expected.txt @@ -1,26 +1,24 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x252 - RenderBlock {HTML} at (0,0) size 800x252 - RenderBody {BODY} at (8,18) size 784x216 [color=#000080] - RenderBlock {P} at (0,0) size 784x216 - RenderText {#text} at (0,3) size 784x48 - text run at (0,3) width 784: "This text should be 18px sans-serif, in small-caps, italicized, and very bold. There should be a 9px" - text run at (0,30) width 185: "gap between each line. " - RenderInline {SPAN} at (0,0) size 755x183 [color=#C0C0C0] - RenderText {#text} at (185,30) size 755x183 - text run at (185,30) width 531: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (716,30) width 34: "text" - text run at (0,57) width 531: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (531,57) width 224: "text dummy text dummy text" - text run at (0,84) width 341: "dummy text dummy text dummy text dummy " - text run at (341,84) width 414: "text dummy text dummy text dummy text dummy text" - text run at (0,111) width 151: "dummy text dummy " - text run at (151,111) width 570: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (721,111) width 34: "text" - text run at (0,138) width 531: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (531,138) width 224: "text dummy text dummy text" - text run at (0,165) width 341: "dummy text dummy text dummy text dummy " - text run at (341,165) width 414: "text dummy text dummy text dummy text dummy text" - text run at (0,192) width 90: "dummy text" +layer at (0,0) size 800x225 + RenderBlock {HTML} at (0,0) size 800x225 + RenderBody {BODY} at (8,18) size 784x189 [color=#000080] + RenderBlock {P} at (0,0) size 784x189 + RenderText {#text} at (0,3) size 760x48 + text run at (0,3) width 760: "This text should be 18px sans-serif, in small-caps, italicized, and very bold. There should be a 9px" + text run at (0,30) width 178: "gap between each line. " + RenderInline {SPAN} at (0,0) size 768x156 [color=#C0C0C0] + RenderText {#text} at (178,30) size 768x156 + text run at (178,30) width 503: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (681,30) width 85: "text dummy" + text run at (0,57) width 450: "text dummy text dummy text dummy text dummy text dummy " + text run at (450,57) width 302: "text dummy text dummy text dummy text" + text run at (0,84) width 233: "dummy text dummy text dummy " + text run at (233,84) width 535: "text dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,111) width 540: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (540,111) width 212: "text dummy text dummy text" + text run at (0,138) width 323: "dummy text dummy text dummy text dummy " + text run at (323,138) width 445: "text dummy text dummy text dummy text dummy text dummy" + text run at (0,165) width 90: "text dummy " + text run at (90,165) width 482: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-05-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-05-b-expected.txt index d1ac05014d1b..a108dedddf85 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-05-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-05-b-expected.txt @@ -4,22 +4,21 @@ layer at (0,0) size 800x414 RenderBlock {HTML} at (0,0) size 800x414 RenderBody {BODY} at (8,18) size 784x378 [color=#000080] RenderBlock {P} at (0,0) size 784x378 - RenderText {#text} at (0,16) size 748x76 - text run at (0,16) width 748: "This text should be 18px sans-serif, in small-caps, italicized, and very light. There should be a" - text run at (0,70) width 227: "36px gap between each line. " - RenderInline {SPAN} at (0,0) size 775x292 [color=#C0C0C0] - RenderText {#text} at (227,70) size 775x292 - text run at (227,70) width 507: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (734,70) width 34: "text" - text run at (0,124) width 507: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (507,124) width 268: "text dummy text dummy text dummy" - text run at (0,178) width 273: "text dummy text dummy text dummy " - text run at (273,178) width 489: "text dummy text dummy text dummy text dummy text dummy text" - text run at (0,232) width 52: "dummy " - text run at (52,232) width 546: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (598,232) width 177: "text dummy text dummy" - text run at (0,286) width 364: "text dummy text dummy text dummy text dummy " - text run at (364,286) width 398: "text dummy text dummy text dummy text dummy text" - text run at (0,340) width 143: "dummy text dummy " - text run at (143,340) width 489: "text dummy text dummy text dummy text dummy text dummy text" + RenderText {#text} at (0,16) size 759x76 + text run at (0,16) width 759: "This text should be 18px sans-serif, in small-caps, italicized, and very light. There should be a 36px" + text run at (0,70) width 174: "gap between each line. " + RenderInline {SPAN} at (0,0) size 768x292 [color=#C0C0C0] + RenderText {#text} at (174,70) size 768x292 + text run at (174,70) width 503: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (677,70) width 85: "text dummy" + text run at (0,124) width 450: "text dummy text dummy text dummy text dummy text dummy " + text run at (450,124) width 302: "text dummy text dummy text dummy text" + text run at (0,178) width 233: "dummy text dummy text dummy " + text run at (233,178) width 535: "text dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,232) width 540: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (540,232) width 212: "text dummy text dummy text" + text run at (0,286) width 323: "dummy text dummy text dummy text dummy " + text run at (323,286) width 445: "text dummy text dummy text dummy text dummy text dummy" + text run at (0,340) width 90: "text dummy " + text run at (90,340) width 482: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-07-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-07-b-expected.txt index bf08204bba73..82b472a28212 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-07-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-07-b-expected.txt @@ -4,22 +4,21 @@ layer at (0,0) size 785x708 RenderBlock {HTML} at (0,0) size 785x708 RenderBody {BODY} at (8,18) size 769x672 [color=#000080] RenderBlock {P} at (0,0) size 769x672 - RenderText {#text} at (0,37) size 734x118 - text run at (0,37) width 734: "This text should be 18px sans-serif, in small-caps and italicized. The lines should be one inch" - text run at (0,133) width 54: "apart. " - RenderInline {SPAN} at (0,0) size 762x502 [color=#C0C0C0] - RenderText {#text} at (54,133) size 762x502 - text run at (54,133) width 507: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (561,133) width 177: "text dummy text dummy" - text run at (0,229) width 364: "text dummy text dummy text dummy text dummy " - text run at (364,229) width 398: "text dummy text dummy text dummy text dummy text" - text run at (0,325) width 143: "dummy text dummy " - text run at (143,325) width 546: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (689,325) width 34: "text" - text run at (0,421) width 507: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (507,421) width 216: "text dummy text dummy text" - text run at (0,517) width 325: "dummy text dummy text dummy text dummy " - text run at (325,517) width 398: "text dummy text dummy text dummy text dummy text" - text run at (0,613) width 143: "dummy text dummy " - text run at (143,613) width 489: "text dummy text dummy text dummy text dummy text dummy text" + RenderText {#text} at (0,37) size 756x22 + text run at (0,37) width 756: "This text should be 18px sans-serif, in small-caps and italicized. The lines should be one inch apart." + RenderInline {SPAN} at (0,0) size 768x502 [color=#C0C0C0] + RenderText {#text} at (0,133) size 768x502 + text run at (0,133) width 503: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (503,133) width 265: "text dummy text dummy text dummy" + text run at (0,229) width 270: "text dummy text dummy text dummy " + text run at (270,229) width 482: "text dummy text dummy text dummy text dummy text dummy text" + text run at (0,325) width 53: "dummy " + text run at (53,325) width 540: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (593,325) width 175: "text dummy text dummy" + text run at (0,421) width 360: "text dummy text dummy text dummy text dummy " + text run at (360,421) width 392: "text dummy text dummy text dummy text dummy text" + text run at (0,517) width 143: "dummy text dummy " + text run at (143,517) width 540: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (683,517) width 85: "text dummy" + text run at (0,613) width 392: "text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-08-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-08-b-expected.txt index 5785a4d6935d..61d51eccaf94 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-08-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-08-b-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x324 RenderBlock {HTML} at (0,0) size 800x324 RenderBody {BODY} at (8,18) size 784x288 [color=#000080] RenderBlock {P} at (0,0) size 784x288 - RenderText {#text} at (0,7) size 780x57 - text run at (0,7) width 780: "This text should be 18px sans-serif, in small-caps, oblique, and bold. There should be a 9px" + RenderText {#text} at (0,7) size 783x57 + text run at (0,7) width 783: "This text should be 18px sans-serif, in small-caps, oblique, and bold. There should be a 9px" text run at (0,43) width 201: "gap between each line. " - RenderInline {SPAN} at (0,0) size 730x237 [color=#C0C0C0] - RenderText {#text} at (201,43) size 730x237 - text run at (201,43) width 520: "dummy text dummy text dummy text dummy text dummy text" + RenderInline {SPAN} at (0,0) size 737x237 [color=#C0C0C0] + RenderText {#text} at (201,43) size 737x237 + text run at (201,43) width 525: "dummy text dummy text dummy text dummy text dummy text" text run at (0,79) width 69: "dummy " - text run at (69,79) width 630: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (699,79) width 31: "text" - text run at (0,115) width 594: "dummy text dummy text dummy text dummy text dummy text dummy " - text run at (594,115) width 136: "text dummy text" - text run at (0,151) width 489: "dummy text dummy text dummy text dummy text dummy " - text run at (489,151) width 241: "text dummy text dummy text" - text run at (0,187) width 384: "dummy text dummy text dummy text dummy " - text run at (384,187) width 346: "text dummy text dummy text dummy text" - text run at (0,223) width 279: "dummy text dummy text dummy " - text run at (279,223) width 451: "text dummy text dummy text dummy text dummy text" - text run at (0,259) width 174: "dummy text dummy " - text run at (174,259) width 556: "text dummy text dummy text dummy text dummy text dummy text" + text run at (69,79) width 636: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (705,79) width 32: "text" + text run at (0,115) width 599: "dummy text dummy text dummy text dummy text dummy text dummy " + text run at (599,115) width 138: "text dummy text" + text run at (0,151) width 493: "dummy text dummy text dummy text dummy text dummy " + text run at (493,151) width 244: "text dummy text dummy text" + text run at (0,187) width 387: "dummy text dummy text dummy text dummy " + text run at (387,187) width 350: "text dummy text dummy text dummy text" + text run at (0,223) width 281: "dummy text dummy text dummy " + text run at (281,223) width 456: "text dummy text dummy text dummy text dummy text" + text run at (0,259) width 175: "dummy text dummy " + text run at (175,259) width 562: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-09-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-09-b-expected.txt index 388b671da770..1ed22e44a309 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-09-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-09-b-expected.txt @@ -1,23 +1,22 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x144 - RenderBlock {HTML} at (0,0) size 800x145 - RenderBody {BODY} at (8,9) size 784x126 [color=#000080] - RenderBlock {P} at (0,0) size 784x125 - RenderText {#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. " - RenderInline {SPAN} at (0,0) size 762x113 [color=#C0C0C0] - RenderText {#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 800x119 + RenderBlock {HTML} at (0,0) size 800x120 + RenderBody {BODY} at (8,9) size 784x101 [color=#000080] + RenderBlock {P} at (0,0) size 784x100 + RenderText {#text} at (0,6) size 472x13 + text run at (0,6) width 472: "This test should be about 10px, sans-serif, and light. There should be about 15px between each line. " + RenderInline {SPAN} at (0,0) size 781x88 [color=#C0C0C0] + RenderText {#text} at (472,6) size 781x88 + text run at (472,6) width 277: "dummy text dummy text dummy text dummy text dummy text" + text run at (0,31) width 36: "dummy " + text run at (36,31) width 336: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (372,31) width 336: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (708,31) width 73: "text dummy text" + text run at (0,56) width 260: "dummy text dummy text dummy text dummy text dummy " + text run at (260,56) width 336: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (596,56) width 185: "text dummy text dummy text dummy text" + text run at (0,81) width 148: "dummy text dummy text dummy " + text run at (148,81) width 336: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (484,81) width 297: "text dummy text dummy text dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-10-c-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-10-c-expected.txt index c1709a8d375d..629cfafbdb51 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-10-c-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1508-c527-font-10-c-expected.txt @@ -4,26 +4,26 @@ layer at (0,0) size 800x468 RenderBlock {HTML} at (0,0) size 800x468 RenderBody {BODY} at (8,18) size 784x432 RenderBlock {P} at (0,0) size 784x432 - RenderInline {SPAN} at (0,0) size 775x400 [color=#FFFFFF] [bgcolor=#000080] - RenderText {#text} at (0,16) size 748x76 - text run at (0,16) width 485: "This text should be 18px sans-serif, in small-caps, italicized, " - text run at (485,16) width 263: "and very light. There should be a" - text run at (0,70) width 252: "36px gap betwen each line. The " - text run at (252,70) width 452: "text should have a blue background, the gap should not. " - RenderInline {SPAN} at (0,0) size 775x346 [color=#0000FF] - RenderText {#text} at (704,70) size 775x346 - text run at (704,70) width 47: "dummy" - text run at (0,124) width 455: "text dummy text dummy text dummy text dummy text dummy " - text run at (455,124) width 307: "text dummy text dummy text dummy text" - text run at (0,178) width 234: "dummy text dummy text dummy " - text run at (234,178) width 541: "text dummy text dummy text dummy text dummy text dummy text dummy" - text run at (0,232) width 546: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (546,232) width 216: "text dummy text dummy text" - text run at (0,286) width 325: "dummy text dummy text dummy text dummy " - text run at (325,286) width 450: "text dummy text dummy text dummy text dummy text dummy" - text run at (0,340) width 91: "text dummy " - text run at (91,340) width 546: "text dummy text dummy text dummy text dummy text dummy text dummy " - text run at (637,340) width 125: "text dummy text" - text run at (0,394) width 359: "dummy text dummy text dummy text dummy text" + RenderInline {SPAN} at (0,0) size 773x400 [color=#FFFFFF] [bgcolor=#000080] + RenderText {#text} at (0,16) size 759x76 + text run at (0,16) width 465: "This text should be 18px sans-serif, in small-caps, italicized, " + text run at (465,16) width 294: "and very light. There should be a 36px" + text run at (0,70) width 199: "gap betwen each line. The " + text run at (199,70) width 436: "text should have a blue background, the gap should not. " + RenderInline {SPAN} at (0,0) size 773x346 [color=#0000FF] + RenderText {#text} at (635,70) size 773x346 + text run at (635,70) width 138: "dummy text dummy" + text run at (0,124) width 360: "text dummy text dummy text dummy text dummy " + text run at (360,124) width 392: "text dummy text dummy text dummy text dummy text" + text run at (0,178) width 143: "dummy text dummy " + text run at (143,178) width 540: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (683,178) width 85: "text dummy" + text run at (0,232) width 450: "text dummy text dummy text dummy text dummy text dummy " + text run at (450,232) width 302: "text dummy text dummy text dummy text" + text run at (0,286) width 233: "dummy text dummy text dummy " + text run at (233,286) width 535: "text dummy text dummy text dummy text dummy text dummy text dummy" + text run at (0,340) width 540: "text dummy text dummy text dummy text dummy text dummy text dummy " + text run at (540,340) width 212: "text dummy text dummy text" + text run at (0,394) width 265: "dummy text dummy text dummy text" RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/css2.1/t1601-c547-indent-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1601-c547-indent-00-b-a-expected.txt index 35c67b0e975a..445b7b239be1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1601-c547-indent-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1601-c547-indent-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x300 RenderBlock {HTML} at (0,0) size 800x300 RenderBody {BODY} at (8,16) size 784x276 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 359x19 - text run at (0,0) width 359: "There should be a tall solid unbroken column of blue below." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be a tall solid unbroken column of blue below." RenderBlock {DIV} at (0,36) size 432x24 [color=#0000FF] RenderText {#text} at (0,0) size 48x24 text run at (0,0) width 48: " x" diff --git a/LayoutTests/platform/wincairo/css2.1/t1601-c547-indent-01-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1601-c547-indent-01-d-expected.txt index 92468ac70631..123691b83a64 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1601-c547-indent-01-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1601-c547-indent-01-d-expected.txt @@ -4,28 +4,28 @@ layer at (0,0) size 800x236 RenderBlock {HTML} at (0,0) size 800x236 RenderBody {BODY} at (8,16) size 784x212 RenderBlock {P} at (0,0) size 784x40 [bgcolor=#00FFFF] - RenderText {#text} at (392,0) size 771x39 - text run at (392,0) width 379: "The first line of this sentence should be indented halfway across" - text run at (0,20) width 22: "the " - text run at (22,20) width 390: "page, but the rest of it should be flush with the normal left margin " - text run at (412,20) width 71: "of the page." + RenderText {#text} at (392,0) size 751x39 + text run at (392,0) width 359: "The first line of this sentence should be indented halfway" + text run at (0,20) width 66: "across the " + text run at (66,20) width 415: "page, but the rest of it should be flush with the normal left margin " + text run at (481,20) width 74: "of the page." RenderBlock {P} at (0,56) size 784x80 [bgcolor=#00FFFF] - RenderText {#text} at (80,0) size 197x19 - text run at (80,0) width 197: "Only the first line of this sentence" - RenderBR {BR} at (277,0) size 0x19 - RenderText {#text} at (0,20) size 117x19 - text run at (0,20) width 117: "should be indented," - RenderBR {BR} at (117,20) size 0x19 - RenderText {#text} at (0,40) size 138x19 - text run at (0,40) width 138: "the others should all be" - RenderBR {BR} at (138,40) size 0x19 - RenderInline {EM} at (0,0) size 116x19 - RenderText {#text} at (0,60) size 116x19 - text run at (0,60) width 116: "aligned on the left" - RenderText {#text} at (116,60) size 94x19 - text run at (116,60) width 94: " of the window." + RenderText {#text} at (80,0) size 211x19 + text run at (80,0) width 211: "Only the first line of this sentence" + RenderBR {BR} at (291,0) size 0x19 + RenderText {#text} at (0,20) size 123x19 + text run at (0,20) width 123: "should be indented," + RenderBR {BR} at (123,20) size 0x19 + RenderText {#text} at (0,40) size 145x19 + text run at (0,40) width 145: "the others should all be" + RenderBR {BR} at (145,40) size 0x19 + RenderInline {EM} at (0,0) size 113x19 + RenderText {#text} at (0,60) size 113x19 + text run at (0,60) width 113: "aligned on the left" + RenderText {#text} at (113,60) size 99x19 + text run at (113,60) width 99: " of the window." RenderBlock {DIV} at (0,152) size 196x60 [bgcolor=#00FFFF] - RenderText {#text} at (98,0) size 193x59 - text run at (98,0) width 94: "X The X on the" - text run at (0,20) width 193: "previous line should be centered" - text run at (0,40) width 117: "across the window." + RenderText {#text} at (98,0) size 178x59 + text run at (98,0) width 77: "X The X on" + text run at (0,20) width 169: "the previous line should be" + text run at (0,40) width 178: "centered across the window." diff --git a/LayoutTests/platform/wincairo/css2.1/t1602-c43-center-00-d-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1602-c43-center-00-d-ag-expected.txt index 7e985369dbad..11a791f94ffe 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1602-c43-center-00-d-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1602-c43-center-00-d-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x105 RenderBlock {HTML} at (0,0) size 800x105 RenderBody {BODY} at (8,16) size 784x81 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 387x19 - text run at (0,0) width 387: "There should be a single small column of blue below with no red:" + RenderText {#text} at (0,0) size 413x19 + text run at (0,0) width 413: "There should be a single small column of blue below with no red:" RenderBlock {DIV} at (0,36) size 784x15 RenderImage {IMG} at (384,0) size 16x15 RenderBlock {DIV} at (0,51) size 784x15 diff --git a/LayoutTests/platform/wincairo/css2.1/t1602-c546-txt-align-00-b-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1602-c546-txt-align-00-b-expected.txt index 368091d81f51..ee1a5ff3589a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1602-c546-txt-align-00-b-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1602-c546-txt-align-00-b-expected.txt @@ -4,52 +4,52 @@ layer at (0,0) size 800x420 RenderBlock {HTML} at (0,0) size 800x420 RenderBody {BODY} at (8,16) size 784x388 RenderBlock {P} at (0,0) size 784x20 [color=#000080] - RenderText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This sentence should be left-justified." + RenderText {#text} at (0,0) size 234x19 + text run at (0,0) width 234: "This sentence should be left-justified." RenderBlock {P} at (0,36) size 784x20 [color=#000080] - RenderText {#text} at (555,0) size 229x19 - text run at (555,0) width 229: "This sentence should be right-justified." + RenderText {#text} at (541,0) size 243x19 + text run at (541,0) width 243: "This sentence should be right-justified." RenderBlock {P} at (0,72) size 784x20 [color=#000080] - RenderText {#text} at (290,0) size 204x19 - text run at (290,0) width 204: "This sentence should be centered." + RenderText {#text} at (286,0) size 212x19 + text run at (286,0) width 212: "This sentence should be centered." RenderBlock {P} at (0,108) size 784x280 [color=#000080] - RenderText {#text} at (0,0) size 466x19 - text run at (0,0) width 369: "This paragraph should be justified (the right and left margins " - text run at (368,0) width 98: "should line up). " - RenderInline {SPAN} at (0,0) size 784x259 [color=#C0C0C0] - RenderText {#text} at (465,0) size 784x259 - text run at (465,0) width 319: "This is just lovely dummy text. Dummy text. Dummy" - text run at (0,20) width 491: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (490,20) width 294: "This is just lovely dummy text. This is just lovely" - text run at (0,40) width 218: "dummy text. Dummy text. Dummy " - text run at (217,40) width 502: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (718,40) width 66: "This is just" - text run at (0,60) width 453: "lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " - text run at (452,60) width 332: "text. This is just lovely dummy text. This is just lovely" - text run at (0,80) width 165: "dummy text. Dummy text. " - text run at (164,80) width 523: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " - text run at (686,80) width 98: "text. This is just" - text run at (0,100) width 401: "lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (401,100) width 383: "This is just lovely dummy text. This is just lovely dummy text." - text run at (0,120) width 136: "Dummy text. Dummy " - text run at (135,120) width 495: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (629,120) width 155: "This is just lovely dummy" - text run at (0,140) width 366: "text. This is just lovely dummy text. Dummy text. Dummy " - text run at (366,140) width 418: "text. This is just lovely dummy text. This is just lovely dummy text." - text run at (0,160) width 84: "Dummy text. " - text run at (83,160) width 516: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " - text run at (598,160) width 186: "text. This is just lovely dummy" - text run at (0,180) width 313: "text. This is just lovely dummy text. Dummy text. " - text run at (313,180) width 471: "This is just lovely dummy text. This is just lovely dummy text. Dummy text." - text run at (0,200) width 52: "Dummy " - text run at (51,200) width 484: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (534,200) width 250: "This is just lovely dummy text. This is just" - text run at (0,220) width 254: "lovely dummy text. Dummy text. Dummy " - text run at (253,220) width 493: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " - text run at (745,220) width 39: "This is" - text run at (0,240) width 464: "just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " - text run at (463,240) width 113: "text. Dummy text. " - RenderText {#text} at (575,240) size 784x39 - text run at (575,240) width 209: "This sentence should be at the end" - text run at (0,260) width 38: "of the " - text run at (38,260) width 115: "block, not justified." + RenderText {#text} at (0,0) size 498x19 + text run at (0,0) width 393: "This paragraph should be justified (the right and left margins " + text run at (392,0) width 106: "should line up). " + RenderInline {SPAN} at (0,0) size 784x279 [color=#C0C0C0] + RenderText {#text} at (497,0) size 784x279 + text run at (497,0) width 287: "This is just lovely dummy text. Dummy text." + text run at (0,20) width 57: "Dummy " + text run at (56,20) width 530: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (585,20) width 199: "This is just lovely dummy text." + text run at (0,40) width 350: "This is just lovely dummy text. Dummy text. Dummy " + text run at (349,40) width 435: "text. This is just lovely dummy text. This is just lovely dummy text." + text run at (0,60) width 89: "Dummy text. " + text run at (88,60) width 551: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " + text run at (638,60) width 146: "text. This is just lovely" + text run at (0,80) width 380: "dummy text. This is just lovely dummy text. Dummy text. " + text run at (379,80) width 405: "This is just lovely dummy text. This is just lovely dummy text." + text run at (0,100) width 146: "Dummy text. Dummy " + text run at (145,100) width 526: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (670,100) width 114: "This is just lovely" + text run at (0,120) width 435: "dummy text. This is just lovely dummy text. Dummy text. Dummy " + text run at (434,120) width 350: "text. This is just lovely dummy text. This is just lovely" + text run at (0,140) width 171: "dummy text. Dummy text. " + text run at (170,140) width 541: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " + text run at (710,140) width 74: "text. This is" + text run at (0,160) width 459: "just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (458,160) width 326: "This is just lovely dummy text. This is just lovely" + text run at (0,180) width 227: "dummy text. Dummy text. Dummy " + text run at (226,180) width 516: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (741,180) width 43: "This is" + text run at (0,200) width 506: "just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy " + text run at (505,200) width 279: "text. This is just lovely dummy text. This is" + text run at (0,220) width 242: "just lovely dummy text. Dummy text. " + text run at (242,220) width 542: "This is just lovely dummy text. This is just lovely dummy text. Dummy text. Dummy" + text run at (0,240) width 517: "text. This is just lovely dummy text. This is just lovely dummy text. Dummy text. " + text run at (516,240) width 268: "This is just lovely dummy text. This is just" + text run at (0,260) width 269: "lovely dummy text. Dummy text. Dummy " + text run at (269,260) width 118: "text. Dummy text. " + RenderText {#text} at (387,260) size 381x19 + text run at (387,260) width 260: "This sentence should be at the end of the " + text run at (647,260) width 121: "block, not justified." diff --git a/LayoutTests/platform/wincairo/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt index d591771dc720..85ed7b853d3a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x324 RenderBlock {HTML} at (0,0) size 800x324 RenderBody {BODY} at (8,16) size 784x300 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 676x19 - text run at (0,0) width 676: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)." + RenderText {#text} at (0,0) size 708x19 + text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)." RenderBlock {DIV} at (0,36) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 360x24 text run at (0,0) width 360: "x x x x x x" diff --git a/LayoutTests/platform/wincairo/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt index b86e6a7032c7..ddc686c6daf9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x204 RenderBlock {HTML} at (0,0) size 800x204 RenderBody {BODY} at (8,16) size 784x180 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 676x19 - text run at (0,0) width 676: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)." + RenderText {#text} at (0,0) size 708x19 + text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)." RenderBlock {DIV} at (48,36) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00] RenderText {#text} at (0,0) size 312x24 text run at (0,0) width 312: "x x xx xx" diff --git a/LayoutTests/platform/wincairo/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt index c8bdf1ce0d62..a08e4ef6d4f6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x192 RenderBlock {HTML} at (0,0) size 800x192 RenderBody {BODY} at (8,8) size 784x176 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 217x19 - text run at (0,0) width 217: "There should be a green box below." + RenderText {#text} at (0,0) size 226x19 + text run at (0,0) width 226: "There should be a green box below." RenderBlock {DIV} at (0,20) size 326x156 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (3,3) size 320x30 RenderText {#text} at (0,0) size 230x10 diff --git a/LayoutTests/platform/wincairo/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt b/LayoutTests/platform/wincairo/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt index 9b0b6b3c4751..f1edcf2e6b2a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t1606-c562-white-sp-00-b-ag-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x156 RenderBlock {HTML} at (0,0) size 800x156 RenderBody {BODY} at (8,16) size 784x132 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "There should be a single green block below." + RenderText {#text} at (0,0) size 278x19 + text run at (0,0) width 278: "There should be a single green block below." RenderBlock {DIV} at (0,36) size 231x96 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)] RenderBlock {P} at (3,3) size 225x45 RenderText {#text} at (0,0) size 165x45 diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-00-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-00-d-expected.txt index a79edb5ff399..bee06218771a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-00-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-00-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x150 - RenderTableSection {TBODY} at (0,0) size 126x150 - RenderTableRow {TR} at (0,0) size 126x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 42x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 126x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 42x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 126x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 42x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 135x150 + RenderTableSection {TBODY} at (0,0) size 135x150 + RenderTableRow {TR} at (0,0) size 135x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 45x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 135x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 45x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 135x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 45x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-01-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-01-d-expected.txt index 911e1614e9d3..afaf2d5e21a5 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-01-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-01-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 149x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 144x165 - RenderTableRow {TR} at (0,0) size 144x55 - RenderTableCell {TD} at (0,14) size 48x27 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (48,15) size 48x25 [border: (3px double #00FF00) none (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (96,14) size 48x27 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,55) size 144x55 - RenderTableCell {TD} at (0,69) size 48x27 [border: (3px double #00FF00) none (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (48,71) size 48x23 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,0) size 40x21 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (96,69) size 48x27 [border: (3px double #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 41x19 - text run at (1,4) width 41: "double" - RenderTableRow {TR} at (0,110) size 144x55 - RenderTableCell {TD} at (0,124) size 48x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (48,125) size 48x25 [border: none (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,0) size 41x21 - text run at (4,1) width 41: "double" - RenderTableCell {TD} at (96,124) size 48x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 155x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 150x165 + RenderTableRow {TR} at (0,0) size 150x55 + RenderTableCell {TD} at (0,14) size 50x27 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (50,15) size 50x25 [border: (3px double #00FF00) none (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (100,14) size 50x27 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,55) size 150x55 + RenderTableCell {TD} at (0,69) size 50x27 [border: (3px double #00FF00) none (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (50,71) size 50x23 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,0) size 43x21 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (100,69) size 50x27 [border: (3px double #00FF00) none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,4) size 43x19 + text run at (1,4) width 43: "double" + RenderTableRow {TR} at (0,110) size 150x55 + RenderTableCell {TD} at (0,124) size 50x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (50,125) size 50x25 [border: none (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,0) size 43x21 + text run at (4,1) width 43: "double" + RenderTableCell {TD} at (100,124) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-02-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-02-d-expected.txt index f74cb4e18e4d..f69f8650ea24 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-02-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-02-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 117x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 112x165 - RenderTableRow {TR} at (0,0) size 112x55 - RenderTableCell {TD} at (0,14) size 35x27 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (35,15) size 42x25 [border: (3px solid #00FF00) none (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (77,14) size 35x27 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,55) size 112x55 - RenderTableCell {TD} at (0,69) size 35x27 [border: (3px solid #00FF00) none (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (35,71) size 42x23 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,0) size 40x21 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (77,69) size 35x27 [border: (3px solid #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 28x19 - text run at (1,4) width 28: "solid" - RenderTableRow {TR} at (0,110) size 112x55 - RenderTableCell {TD} at (0,124) size 35x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (35,125) size 42x25 [border: none (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,0) size 28x21 - text run at (4,1) width 28: "solid" - RenderTableCell {TD} at (77,124) size 35x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 124x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 119x165 + RenderTableRow {TR} at (0,0) size 119x55 + RenderTableCell {TD} at (0,14) size 37x27 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (37,15) size 45x25 [border: (3px solid #00FF00) none (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (82,14) size 37x27 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,55) size 119x55 + RenderTableCell {TD} at (0,69) size 37x27 [border: (3px solid #00FF00) none (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (37,71) size 45x23 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,0) size 43x21 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (82,69) size 37x27 [border: (3px solid #00FF00) none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,4) size 30x19 + text run at (1,4) width 30: "solid" + RenderTableRow {TR} at (0,110) size 119x55 + RenderTableCell {TD} at (0,124) size 37x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (37,125) size 45x25 [border: none (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,0) size 30x21 + text run at (4,1) width 30: "solid" + RenderTableCell {TD} at (82,124) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-03-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-03-d-expected.txt index 227b7047fe63..fc30ea195589 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-03-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-03-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 155x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 150x165 - RenderTableRow {TR} at (0,0) size 150x55 - RenderTableCell {TD} at (0,14) size 50x27 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (50,15) size 50x25 [border: (3px dashed #00FF00) none (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (100,14) size 50x27 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,55) size 150x55 - RenderTableCell {TD} at (0,69) size 50x27 [border: (3px dashed #00FF00) none (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (50,71) size 50x23 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,0) size 40x21 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (100,69) size 50x27 [border: (3px dashed #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 43x19 - text run at (1,4) width 43: "dashed" - RenderTableRow {TR} at (0,110) size 150x55 - RenderTableCell {TD} at (0,124) size 50x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (50,125) size 50x25 [border: none (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,0) size 43x21 - text run at (4,1) width 43: "dashed" - RenderTableCell {TD} at (100,124) size 50x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 158x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 153x165 + RenderTableRow {TR} at (0,0) size 153x55 + RenderTableCell {TD} at (0,14) size 51x27 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (51,15) size 51x25 [border: (3px dashed #00FF00) none (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (102,14) size 51x27 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,55) size 153x55 + RenderTableCell {TD} at (0,69) size 51x27 [border: (3px dashed #00FF00) none (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (51,71) size 51x23 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,0) size 43x21 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (102,69) size 51x27 [border: (3px dashed #00FF00) none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,4) size 44x19 + text run at (1,4) width 44: "dashed" + RenderTableRow {TR} at (0,110) size 153x55 + RenderTableCell {TD} at (0,124) size 51x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (51,125) size 51x25 [border: none (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,0) size 44x21 + text run at (4,1) width 44: "dashed" + RenderTableCell {TD} at (102,124) size 51x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-04-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-04-d-expected.txt index 905306fe0a5d..72b08a36a63a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-04-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-04-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" RenderTable {TABLE} at (0,36) size 143x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 138x165 RenderTableRow {TR} at (0,0) size 138x55 @@ -23,8 +23,8 @@ layer at (0,0) size 800x230 RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (46,71) size 46x23 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,0) size 40x21 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (1,0) size 43x21 + text run at (1,1) width 43: "hidden" RenderTableCell {TD} at (92,69) size 46x27 [border: (3px dotted #00FF00) none] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (1,4) size 39x19 text run at (1,4) width 39: "dotted" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-05-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-05-d-expected.txt index d18bdf6aa9ed..07fe45e21b68 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-05-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-05-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 121x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 116x165 - RenderTableRow {TR} at (0,0) size 116x55 - RenderTableCell {TD} at (0,14) size 37x27 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (37,15) size 42x25 [border: (3px ridge #00FF00) none (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (79,14) size 37x27 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,55) size 116x55 - RenderTableCell {TD} at (0,69) size 37x27 [border: (3px ridge #00FF00) none (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (37,71) size 42x23 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,0) size 40x21 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (79,69) size 37x27 [border: (3px ridge #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 30x19 - text run at (1,4) width 30: "ridge" - RenderTableRow {TR} at (0,110) size 116x55 - RenderTableCell {TD} at (0,124) size 37x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (37,125) size 42x25 [border: none (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,0) size 30x21 - text run at (4,1) width 30: "ridge" - RenderTableCell {TD} at (79,124) size 37x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 128x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 123x165 + RenderTableRow {TR} at (0,0) size 123x55 + RenderTableCell {TD} at (0,14) size 39x27 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (39,15) size 45x25 [border: (3px ridge #00FF00) none (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (84,14) size 39x27 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,55) size 123x55 + RenderTableCell {TD} at (0,69) size 39x27 [border: (3px ridge #00FF00) none (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (39,71) size 45x23 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,0) size 43x21 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (84,69) size 39x27 [border: (3px ridge #00FF00) none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,4) size 32x19 + text run at (1,4) width 32: "ridge" + RenderTableRow {TR} at (0,110) size 123x55 + RenderTableCell {TD} at (0,124) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (39,125) size 45x25 [border: none (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,0) size 32x21 + text run at (4,1) width 32: "ridge" + RenderTableCell {TD} at (84,124) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-06-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-06-d-expected.txt index a1b373da4021..c54f58af4e35 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-06-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-06-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 134x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 129x165 - RenderTableRow {TR} at (0,0) size 129x55 - RenderTableCell {TD} at (0,14) size 43x27 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (43,15) size 43x25 [border: (3px outset #00FF00) none (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (86,14) size 43x27 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,55) size 129x55 - RenderTableCell {TD} at (0,69) size 43x27 [border: (3px outset #00FF00) none (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (43,71) size 43x23 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,0) size 40x21 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (86,69) size 43x27 [border: (3px outset #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 36x19 - text run at (1,4) width 36: "outset" - RenderTableRow {TR} at (0,110) size 129x55 - RenderTableCell {TD} at (0,124) size 43x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (43,125) size 43x25 [border: none (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,0) size 36x21 - text run at (4,1) width 36: "outset" - RenderTableCell {TD} at (86,124) size 43x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 138x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 133x165 + RenderTableRow {TR} at (0,0) size 133x55 + RenderTableCell {TD} at (0,14) size 44x27 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (44,15) size 45x25 [border: (3px outset #00FF00) none (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (89,14) size 44x27 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,55) size 133x55 + RenderTableCell {TD} at (0,69) size 44x27 [border: (3px outset #00FF00) none (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (44,71) size 45x23 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,0) size 43x21 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (89,69) size 44x27 [border: (3px outset #00FF00) none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,4) size 37x19 + text run at (1,4) width 37: "outset" + RenderTableRow {TR} at (0,110) size 133x55 + RenderTableCell {TD} at (0,124) size 44x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (44,125) size 45x25 [border: none (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,0) size 37x21 + text run at (4,1) width 37: "outset" + RenderTableCell {TD} at (89,124) size 44x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-07-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-07-d-expected.txt index 7a78fd4ba81d..686dc111b97b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-07-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-07-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 152x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 147x165 - RenderTableRow {TR} at (0,0) size 147x55 - RenderTableCell {TD} at (0,14) size 49x27 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (49,15) size 49x25 [border: (3px groove #00FF00) none (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (98,14) size 49x27 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,55) size 147x55 - RenderTableCell {TD} at (0,69) size 49x27 [border: (3px groove #00FF00) none (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (49,71) size 49x23 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,0) size 40x21 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (98,69) size 49x27 [border: (3px groove #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 42x19 - text run at (1,4) width 42: "groove" - RenderTableRow {TR} at (0,110) size 147x55 - RenderTableCell {TD} at (0,124) size 49x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (49,125) size 49x25 [border: none (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,0) size 42x21 - text run at (4,1) width 42: "groove" - RenderTableCell {TD} at (98,124) size 49x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 158x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 153x165 + RenderTableRow {TR} at (0,0) size 153x55 + RenderTableCell {TD} at (0,14) size 51x27 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (51,15) size 51x25 [border: (3px groove #00FF00) none (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (102,14) size 51x27 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,55) size 153x55 + RenderTableCell {TD} at (0,69) size 51x27 [border: (3px groove #00FF00) none (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (51,71) size 51x23 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,0) size 43x21 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (102,69) size 51x27 [border: (3px groove #00FF00) none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,4) size 44x19 + text run at (1,4) width 44: "groove" + RenderTableRow {TR} at (0,110) size 153x55 + RenderTableCell {TD} at (0,124) size 51x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (51,125) size 51x25 [border: none (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,0) size 44x21 + text run at (4,1) width 44: "groove" + RenderTableCell {TD} at (102,124) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-08-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-08-d-expected.txt index 376515d02458..fe36acb0ccbc 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-08-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-08-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 115x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 110x165 - RenderTableRow {TR} at (0,0) size 110x55 - RenderTableCell {TD} at (0,14) size 34x27 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (34,15) size 42x25 [border: (3px inset #00FF00) none (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (76,14) size 34x27 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,55) size 110x55 - RenderTableCell {TD} at (0,69) size 34x27 [border: (3px inset #00FF00) none (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (34,71) size 42x23 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,0) size 40x21 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (76,69) size 34x27 [border: (3px inset #00FF00) none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,4) size 27x19 - text run at (1,4) width 27: "inset" - RenderTableRow {TR} at (0,110) size 110x55 - RenderTableCell {TD} at (0,124) size 34x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (34,125) size 42x25 [border: none (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,0) size 27x21 - text run at (4,1) width 27: "inset" - RenderTableCell {TD} at (76,124) size 34x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 122x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 117x165 + RenderTableRow {TR} at (0,0) size 117x55 + RenderTableCell {TD} at (0,14) size 36x27 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (36,15) size 45x25 [border: (3px inset #00FF00) none (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (81,14) size 36x27 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,55) size 117x55 + RenderTableCell {TD} at (0,69) size 36x27 [border: (3px inset #00FF00) none (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (36,71) size 45x23 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,0) size 43x21 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (81,69) size 36x27 [border: (3px inset #00FF00) none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,4) size 29x19 + text run at (1,4) width 29: "inset" + RenderTableRow {TR} at (0,110) size 117x55 + RenderTableCell {TD} at (0,124) size 36x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (36,125) size 45x25 [border: none (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,0) size 29x21 + text run at (4,1) width 29: "inset" + RenderTableCell {TD} at (81,124) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-09-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-09-d-expected.txt index 3da283d291f2..ad708bde83b1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-09-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-09-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 104x150 - RenderTableSection {TBODY} at (0,0) size 104x150 - RenderTableRow {TR} at (0,0) size 104x50 - RenderTableCell {TD} at (0,14) size 31x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (31,14) size 42x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (73,14) size 31x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,50) size 104x50 - RenderTableCell {TD} at (0,64) size 31x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (31,64) size 42x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (73,64) size 31x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,100) size 104x50 - RenderTableCell {TD} at (0,114) size 31x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (31,114) size 42x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (73,114) size 31x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 111x150 + RenderTableSection {TBODY} at (0,0) size 111x150 + RenderTableRow {TR} at (0,0) size 111x50 + RenderTableCell {TD} at (0,14) size 33x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (33,14) size 45x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (78,14) size 33x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,50) size 111x50 + RenderTableCell {TD} at (0,64) size 33x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (33,64) size 45x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (78,64) size 33x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,100) size 111x50 + RenderTableCell {TD} at (0,114) size 33x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (33,114) size 45x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (78,114) size 33x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-10-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-10-d-expected.txt index d8665d793ee3..71cdc61d2198 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-10-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-10-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 127x150 - RenderTableSection {TBODY} at (0,0) size 127x150 - RenderTableRow {TR} at (0,0) size 127x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 43x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (85,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 127x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 43x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 41x19 - text run at (1,1) width 41: "double" - RenderTableCell {TD} at (85,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 127x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 43x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (85,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 135x150 + RenderTableSection {TBODY} at (0,0) size 135x150 + RenderTableRow {TR} at (0,0) size 135x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 45x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 135x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 45x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "double" + RenderTableCell {TD} at (90,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 135x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 45x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-11-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-11-d-expected.txt index 5fef6a46ca2b..7bf3b8b56551 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-11-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-11-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 159x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 154x175 - RenderTableRow {TR} at (0,0) size 154x58 - RenderTableCell {TD} at (0,15) size 51x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,14) size 53x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (104,15) size 50x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,58) size 154x60 - RenderTableCell {TD} at (0,74) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,72) size 53x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 41x19 - text run at (6,6) width 41: "double" - RenderTableCell {TD} at (104,74) size 50x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 41x21 - text run at (6,4) width 41: "double" - RenderTableRow {TR} at (0,118) size 154x57 - RenderTableCell {TD} at (0,133) size 51x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,132) size 53x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 41x19 - text run at (4,6) width 41: "double" - RenderTableCell {TD} at (104,133) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 165x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 160x175 + RenderTableRow {TR} at (0,0) size 160x58 + RenderTableCell {TD} at (0,15) size 53x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,14) size 55x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (108,15) size 52x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,58) size 160x60 + RenderTableCell {TD} at (0,74) size 53x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,72) size 55x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 43x19 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (108,74) size 52x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 43x21 + text run at (6,4) width 43: "double" + RenderTableRow {TR} at (0,118) size 160x57 + RenderTableCell {TD} at (0,133) size 53x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,132) size 55x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 43x19 + text run at (4,6) width 43: "double" + RenderTableCell {TD} at (108,133) size 52x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-12-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-12-d-expected.txt index 45060d253a4e..da8536eec158 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-12-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-12-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 133x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 128x175 - RenderTableRow {TR} at (0,0) size 128x58 - RenderTableCell {TD} at (0,15) size 38x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,14) size 53x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (91,15) size 37x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,58) size 128x60 - RenderTableCell {TD} at (0,74) size 38x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,72) size 53x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 41x19 - text run at (6,6) width 41: "double" - RenderTableCell {TD} at (91,74) size 37x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 28x21 - text run at (6,4) width 28: "solid" - RenderTableRow {TR} at (0,118) size 128x57 - RenderTableCell {TD} at (0,133) size 38x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,132) size 53x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 28x19 - text run at (4,6) width 28: "solid" - RenderTableCell {TD} at (91,133) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 139x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 134x175 + RenderTableRow {TR} at (0,0) size 134x58 + RenderTableCell {TD} at (0,15) size 40x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,14) size 55x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (95,15) size 39x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,58) size 134x60 + RenderTableCell {TD} at (0,74) size 40x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,72) size 55x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 43x19 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (95,74) size 39x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 30x21 + text run at (6,4) width 30: "solid" + RenderTableRow {TR} at (0,118) size 134x57 + RenderTableCell {TD} at (0,133) size 40x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,132) size 55x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 30x19 + text run at (4,6) width 30: "solid" + RenderTableCell {TD} at (95,133) size 39x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-13-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-13-d-expected.txt index 6e3ca6f3967d..d36d5470ddf4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-13-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-13-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 158x175 - RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,14) size 53x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (106,15) size 52x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,72) size 53x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 41x19 - text run at (6,6) width 41: "double" - RenderTableCell {TD} at (106,74) size 52x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 43x21 - text run at (6,4) width 43: "dashed" - RenderTableRow {TR} at (0,118) size 158x57 - RenderTableCell {TD} at (0,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,132) size 53x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x19 - text run at (4,6) width 43: "dashed" - RenderTableCell {TD} at (106,133) size 52x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 167x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 162x175 + RenderTableRow {TR} at (0,0) size 162x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,14) size 55x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (109,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,58) size 162x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,72) size 55x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 43x19 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (109,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "dashed" + RenderTableRow {TR} at (0,118) size 162x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,132) size 55x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "dashed" + RenderTableCell {TD} at (109,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-14-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-14-d-expected.txt index ab010e628b46..b59f8bd6cd8d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-14-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-14-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 155x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 150x175 - RenderTableRow {TR} at (0,0) size 150x58 + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 157x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 152x175 + RenderTableRow {TR} at (0,0) size 152x58 RenderTableCell {TD} at (0,15) size 49x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,14) size 53x30 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (49,14) size 55x30 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (102,15) size 48x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (104,15) size 48x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableRow {TR} at (0,58) size 150x60 + RenderTableRow {TR} at (0,58) size 152x60 RenderTableCell {TD} at (0,74) size 49x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,72) size 53x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 41x19 - text run at (6,6) width 41: "double" - RenderTableCell {TD} at (102,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,72) size 55x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 43x19 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (104,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (6,3) size 39x21 text run at (6,4) width 39: "dotted" - RenderTableRow {TR} at (0,118) size 150x57 + RenderTableRow {TR} at (0,118) size 152x57 RenderTableCell {TD} at (0,133) size 49x27 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,132) size 53x29 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderTableCell {TD} at (49,132) size 55x29 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] RenderText {#text} at (4,6) size 39x19 text run at (4,6) width 39: "dotted" - RenderTableCell {TD} at (102,133) size 48x27 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderTableCell {TD} at (104,133) size 48x27 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-15-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-15-d-expected.txt index 5d82f9f7d76d..6fa82be25975 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-15-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-15-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 137x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 132x175 - RenderTableRow {TR} at (0,0) size 132x58 - RenderTableCell {TD} at (0,15) size 40x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,14) size 53x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (93,15) size 39x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,58) size 132x60 - RenderTableCell {TD} at (0,74) size 40x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,72) size 53x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 41x19 - text run at (6,6) width 41: "double" - RenderTableCell {TD} at (93,74) size 39x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 30x21 - text run at (6,4) width 30: "ridge" - RenderTableRow {TR} at (0,118) size 132x57 - RenderTableCell {TD} at (0,133) size 40x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,132) size 53x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x19 - text run at (4,6) width 30: "ridge" - RenderTableCell {TD} at (93,133) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 143x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 138x175 + RenderTableRow {TR} at (0,0) size 138x58 + RenderTableCell {TD} at (0,15) size 42x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,14) size 55x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (97,15) size 41x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,58) size 138x60 + RenderTableCell {TD} at (0,74) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,72) size 55x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 43x19 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (97,74) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 32x21 + text run at (6,4) width 32: "ridge" + RenderTableRow {TR} at (0,118) size 138x57 + RenderTableCell {TD} at (0,133) size 42x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,132) size 55x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 32x19 + text run at (4,6) width 32: "ridge" + RenderTableCell {TD} at (97,133) size 41x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-16-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-16-d-expected.txt index e128c2a56ed5..6acf2579ff26 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-16-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-16-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 149x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 144x175 - RenderTableRow {TR} at (0,0) size 144x58 - RenderTableCell {TD} at (0,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,14) size 53x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (99,15) size 45x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,58) size 144x60 - RenderTableCell {TD} at (0,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,72) size 53x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 41x19 - text run at (6,6) width 41: "double" - RenderTableCell {TD} at (99,74) size 45x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 36x21 - text run at (6,4) width 36: "outset" - RenderTableRow {TR} at (0,118) size 144x57 - RenderTableCell {TD} at (0,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,132) size 53x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 36x19 - text run at (4,6) width 36: "outset" - RenderTableCell {TD} at (99,133) size 45x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 153x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 148x175 + RenderTableRow {TR} at (0,0) size 148x58 + RenderTableCell {TD} at (0,15) size 47x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,14) size 55x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (102,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,58) size 148x60 + RenderTableCell {TD} at (0,74) size 47x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,72) size 55x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 43x19 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (102,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 37x21 + text run at (6,4) width 37: "outset" + RenderTableRow {TR} at (0,118) size 148x57 + RenderTableCell {TD} at (0,133) size 47x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,132) size 55x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 37x19 + text run at (4,6) width 37: "outset" + RenderTableCell {TD} at (102,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-17-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-17-d-expected.txt index 7f391ef27e44..d00479cd4f01 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-17-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-17-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 161x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 156x175 - RenderTableRow {TR} at (0,0) size 156x58 - RenderTableCell {TD} at (0,15) size 52x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,14) size 53x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (105,15) size 51x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,58) size 156x60 - RenderTableCell {TD} at (0,74) size 52x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,72) size 53x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 41x19 - text run at (6,6) width 41: "double" - RenderTableCell {TD} at (105,74) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 42x21 - text run at (6,4) width 42: "groove" - RenderTableRow {TR} at (0,118) size 156x57 - RenderTableCell {TD} at (0,133) size 52x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,132) size 53x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 42x19 - text run at (4,6) width 42: "groove" - RenderTableCell {TD} at (105,133) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 167x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 162x175 + RenderTableRow {TR} at (0,0) size 162x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,14) size 55x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (109,15) size 53x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,58) size 162x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,72) size 55x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 43x19 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (109,74) size 53x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "groove" + RenderTableRow {TR} at (0,118) size 162x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,132) size 55x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "groove" + RenderTableCell {TD} at (109,133) size 53x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-18-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-18-d-expected.txt index ae41a259bda8..9c9ed4e151d3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-18-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-18-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 131x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 126x175 - RenderTableRow {TR} at (0,0) size 126x58 - RenderTableCell {TD} at (0,15) size 37x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,14) size 53x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (90,15) size 36x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,58) size 126x60 - RenderTableCell {TD} at (0,74) size 37x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,72) size 53x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 41x19 - text run at (6,6) width 41: "double" - RenderTableCell {TD} at (90,74) size 36x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 27x21 - text run at (6,4) width 27: "inset" - RenderTableRow {TR} at (0,118) size 126x57 - RenderTableCell {TD} at (0,133) size 37x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,132) size 53x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 27x19 - text run at (4,6) width 27: "inset" - RenderTableCell {TD} at (90,133) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 137x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 132x175 + RenderTableRow {TR} at (0,0) size 132x58 + RenderTableCell {TD} at (0,15) size 39x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,14) size 55x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (94,15) size 38x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,58) size 132x60 + RenderTableCell {TD} at (0,74) size 39x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,72) size 55x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 43x19 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (94,74) size 38x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 29x21 + text run at (6,4) width 29: "inset" + RenderTableRow {TR} at (0,118) size 132x57 + RenderTableCell {TD} at (0,133) size 39x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,132) size 55x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 29x19 + text run at (4,6) width 29: "inset" + RenderTableCell {TD} at (94,133) size 38x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-19-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-19-d-expected.txt index 2b1139511db8..96785f8c4025 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-19-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-19-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 125x170 - RenderTableSection {TBODY} at (0,0) size 125x170 - RenderTableRow {TR} at (0,0) size 125x55 - RenderTableCell {TD} at (0,16) size 36x23 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,14) size 53x27 [border: none] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (89,16) size 36x23 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,55) size 125x60 - RenderTableCell {TD} at (0,74) size 36x22 [border: none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,69) size 53x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 41x19 - text run at (6,6) width 41: "double" - RenderTableCell {TD} at (89,74) size 36x22 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 29x19 - text run at (6,1) width 29: "none" - RenderTableRow {TR} at (0,115) size 125x55 - RenderTableCell {TD} at (0,131) size 36x23 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,129) size 53x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 29x19 - text run at (1,6) width 29: "none" - RenderTableCell {TD} at (89,131) size 36x23 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 131x170 + RenderTableSection {TBODY} at (0,0) size 131x170 + RenderTableRow {TR} at (0,0) size 131x55 + RenderTableCell {TD} at (0,16) size 38x23 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,14) size 55x27 [border: none] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (93,16) size 38x23 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,55) size 131x60 + RenderTableCell {TD} at (0,74) size 38x22 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,69) size 55x32 [border: (5px double #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 43x19 + text run at (6,6) width 43: "double" + RenderTableCell {TD} at (93,74) size 38x22 [border: none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,1) size 31x19 + text run at (6,1) width 31: "none" + RenderTableRow {TR} at (0,115) size 131x55 + RenderTableCell {TD} at (0,131) size 38x23 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,129) size 55x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,6) size 31x19 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (93,131) size 38x23 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-20-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-20-d-expected.txt index 8147edd8a435..b0b9c1da12e4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-20-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-20-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x150 - RenderTableSection {TBODY} at (0,0) size 126x150 - RenderTableRow {TR} at (0,0) size 126x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 42x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 126x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 42x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 28x19 - text run at (1,1) width 28: "solid" - RenderTableCell {TD} at (84,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 126x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 42x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 135x150 + RenderTableSection {TBODY} at (0,0) size 135x150 + RenderTableRow {TR} at (0,0) size 135x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 45x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 135x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 45x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 30x19 + text run at (1,1) width 30: "solid" + RenderTableCell {TD} at (90,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 135x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 45x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-21-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-21-d-expected.txt index 0bfc29460fcf..fa4afdef0d85 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-21-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-21-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 154x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 149x175 - RenderTableRow {TR} at (0,0) size 149x58 - RenderTableCell {TD} at (0,15) size 51x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,14) size 48x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (99,15) size 50x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,58) size 149x60 - RenderTableCell {TD} at (0,74) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,72) size 48x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 28x19 - text run at (6,6) width 28: "solid" - RenderTableCell {TD} at (99,74) size 50x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 41x21 - text run at (6,4) width 41: "double" - RenderTableRow {TR} at (0,118) size 149x57 - RenderTableCell {TD} at (0,133) size 51x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,132) size 48x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 41x19 - text run at (4,6) width 41: "double" - RenderTableCell {TD} at (99,133) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 160x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 155x175 + RenderTableRow {TR} at (0,0) size 155x58 + RenderTableCell {TD} at (0,15) size 53x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,14) size 50x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (103,15) size 52x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,58) size 155x60 + RenderTableCell {TD} at (0,74) size 53x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,72) size 50x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 30x19 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (103,74) size 52x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 43x21 + text run at (6,4) width 43: "double" + RenderTableRow {TR} at (0,118) size 155x57 + RenderTableCell {TD} at (0,133) size 53x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,132) size 50x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 43x19 + text run at (4,6) width 43: "double" + RenderTableCell {TD} at (103,133) size 52x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-22-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-22-d-expected.txt index b69257013d11..713694a3a746 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-22-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-22-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 120x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 115x175 - RenderTableRow {TR} at (0,0) size 115x58 - RenderTableCell {TD} at (0,15) size 38x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,14) size 40x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (78,15) size 37x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,58) size 115x60 - RenderTableCell {TD} at (0,74) size 38x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,72) size 40x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 28x19 - text run at (6,6) width 28: "solid" - RenderTableCell {TD} at (78,74) size 37x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 28x21 - text run at (6,4) width 28: "solid" - RenderTableRow {TR} at (0,118) size 115x57 - RenderTableCell {TD} at (0,133) size 38x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,132) size 40x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 28x19 - text run at (4,6) width 28: "solid" - RenderTableCell {TD} at (78,133) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 126x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 121x175 + RenderTableRow {TR} at (0,0) size 121x58 + RenderTableCell {TD} at (0,15) size 40x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,14) size 42x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (82,15) size 39x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,58) size 121x60 + RenderTableCell {TD} at (0,74) size 40x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,72) size 42x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 30x19 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (82,74) size 39x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 30x21 + text run at (6,4) width 30: "solid" + RenderTableRow {TR} at (0,118) size 121x57 + RenderTableCell {TD} at (0,133) size 40x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,132) size 42x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 30x19 + text run at (4,6) width 30: "solid" + RenderTableCell {TD} at (82,133) size 39x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-23-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-23-d-expected.txt index 82359b6addf9..ce8c88e20535 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-23-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-23-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 160x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 155x175 - RenderTableRow {TR} at (0,0) size 155x58 - RenderTableCell {TD} at (0,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,14) size 50x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (103,15) size 52x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,58) size 155x60 - RenderTableCell {TD} at (0,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,72) size 50x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 28x19 - text run at (6,6) width 28: "solid" - RenderTableCell {TD} at (103,74) size 52x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 43x21 - text run at (6,4) width 43: "dashed" - RenderTableRow {TR} at (0,118) size 155x57 - RenderTableCell {TD} at (0,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,132) size 50x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x19 - text run at (4,6) width 43: "dashed" - RenderTableCell {TD} at (103,133) size 52x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 30x19 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "dashed" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "dashed" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-24-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-24-d-expected.txt index 6ea35d635272..faf457b1b724 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-24-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-24-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" RenderTable {TABLE} at (0,36) size 148x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 143x175 RenderTableRow {TR} at (0,0) size 143x58 @@ -23,8 +23,8 @@ layer at (0,0) size 800x240 RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,72) size 46x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 28x19 - text run at (6,6) width 28: "solid" + RenderText {#text} at (6,6) size 30x19 + text run at (6,6) width 30: "solid" RenderTableCell {TD} at (95,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (6,3) size 39x21 text run at (6,4) width 39: "dotted" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-25-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-25-d-expected.txt index 9adf553b2288..cc0adc3ba1a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-25-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-25-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 124x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 119x175 - RenderTableRow {TR} at (0,0) size 119x58 - RenderTableCell {TD} at (0,15) size 40x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,14) size 40x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (80,15) size 39x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,58) size 119x60 - RenderTableCell {TD} at (0,74) size 40x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,72) size 40x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 28x19 - text run at (6,6) width 28: "solid" - RenderTableCell {TD} at (80,74) size 39x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 30x21 - text run at (6,4) width 30: "ridge" - RenderTableRow {TR} at (0,118) size 119x57 - RenderTableCell {TD} at (0,133) size 40x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,132) size 40x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x19 - text run at (4,6) width 30: "ridge" - RenderTableCell {TD} at (80,133) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 130x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 125x175 + RenderTableRow {TR} at (0,0) size 125x58 + RenderTableCell {TD} at (0,15) size 42x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,14) size 42x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (84,15) size 41x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,58) size 125x60 + RenderTableCell {TD} at (0,74) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,72) size 42x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 30x19 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (84,74) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 32x21 + text run at (6,4) width 32: "ridge" + RenderTableRow {TR} at (0,118) size 125x57 + RenderTableCell {TD} at (0,133) size 42x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,132) size 42x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 32x19 + text run at (4,6) width 32: "ridge" + RenderTableCell {TD} at (84,133) size 41x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-26-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-26-d-expected.txt index 4dd468878939..3158dc15f46c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-26-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-26-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 139x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 134x175 - RenderTableRow {TR} at (0,0) size 134x58 - RenderTableCell {TD} at (0,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,14) size 43x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (89,15) size 45x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,58) size 134x60 - RenderTableCell {TD} at (0,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,72) size 43x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 28x19 - text run at (6,6) width 28: "solid" - RenderTableCell {TD} at (89,74) size 45x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 36x21 - text run at (6,4) width 36: "outset" - RenderTableRow {TR} at (0,118) size 134x57 - RenderTableCell {TD} at (0,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,132) size 43x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 36x19 - text run at (4,6) width 36: "outset" - RenderTableCell {TD} at (89,133) size 45x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 142x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 137x175 + RenderTableRow {TR} at (0,0) size 137x58 + RenderTableCell {TD} at (0,15) size 47x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,14) size 44x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (91,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,58) size 137x60 + RenderTableCell {TD} at (0,74) size 47x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,72) size 44x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 30x19 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (91,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 37x21 + text run at (6,4) width 37: "outset" + RenderTableRow {TR} at (0,118) size 137x57 + RenderTableCell {TD} at (0,133) size 47x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,132) size 44x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 37x19 + text run at (4,6) width 37: "outset" + RenderTableCell {TD} at (91,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-27-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-27-d-expected.txt index 56849b342dfb..0a71f2c0bf93 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-27-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-27-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 157x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 152x175 - RenderTableRow {TR} at (0,0) size 152x58 - RenderTableCell {TD} at (0,15) size 52x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,14) size 49x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (101,15) size 51x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,58) size 152x60 - RenderTableCell {TD} at (0,74) size 52x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,72) size 49x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 28x19 - text run at (6,6) width 28: "solid" - RenderTableCell {TD} at (101,74) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 42x21 - text run at (6,4) width 42: "groove" - RenderTableRow {TR} at (0,118) size 152x57 - RenderTableCell {TD} at (0,133) size 52x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,132) size 49x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 42x19 - text run at (4,6) width 42: "groove" - RenderTableCell {TD} at (101,133) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 30x19 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "groove" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "groove" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-28-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-28-d-expected.txt index 7b318763c6a9..b7ee0769bd39 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-28-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-28-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 118x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 113x175 - RenderTableRow {TR} at (0,0) size 113x58 - RenderTableCell {TD} at (0,15) size 37x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,14) size 40x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (77,15) size 36x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,58) size 113x60 - RenderTableCell {TD} at (0,74) size 37x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,72) size 40x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 28x19 - text run at (6,6) width 28: "solid" - RenderTableCell {TD} at (77,74) size 36x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 27x21 - text run at (6,4) width 27: "inset" - RenderTableRow {TR} at (0,118) size 113x57 - RenderTableCell {TD} at (0,133) size 37x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,132) size 40x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 27x19 - text run at (4,6) width 27: "inset" - RenderTableCell {TD} at (77,133) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 124x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 119x175 + RenderTableRow {TR} at (0,0) size 119x58 + RenderTableCell {TD} at (0,15) size 39x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,14) size 42x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (81,15) size 38x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,58) size 119x60 + RenderTableCell {TD} at (0,74) size 39x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,72) size 42x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 30x19 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (81,74) size 38x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 29x21 + text run at (6,4) width 29: "inset" + RenderTableRow {TR} at (0,118) size 119x57 + RenderTableCell {TD} at (0,133) size 39x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,132) size 42x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 29x19 + text run at (4,6) width 29: "inset" + RenderTableCell {TD} at (81,133) size 38x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-29-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-29-d-expected.txt index 85f1970ab939..ff3b748c1e7c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-29-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-29-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 112x170 - RenderTableSection {TBODY} at (0,0) size 112x170 - RenderTableRow {TR} at (0,0) size 112x55 - RenderTableCell {TD} at (0,16) size 36x23 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,14) size 40x27 [border: none] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (76,16) size 36x23 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,55) size 112x60 - RenderTableCell {TD} at (0,74) size 36x22 [border: none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,69) size 40x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 28x19 - text run at (6,6) width 28: "solid" - RenderTableCell {TD} at (76,74) size 36x22 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 29x19 - text run at (6,1) width 29: "none" - RenderTableRow {TR} at (0,115) size 112x55 - RenderTableCell {TD} at (0,131) size 36x23 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,129) size 40x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 29x19 - text run at (1,6) width 29: "none" - RenderTableCell {TD} at (76,131) size 36x23 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 118x170 + RenderTableSection {TBODY} at (0,0) size 118x170 + RenderTableRow {TR} at (0,0) size 118x55 + RenderTableCell {TD} at (0,16) size 38x23 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,14) size 42x27 [border: none] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (80,16) size 38x23 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,55) size 118x60 + RenderTableCell {TD} at (0,74) size 38x22 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,69) size 42x32 [border: (5px solid #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 30x19 + text run at (6,6) width 30: "solid" + RenderTableCell {TD} at (80,74) size 38x22 [border: none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,1) size 31x19 + text run at (6,1) width 31: "none" + RenderTableRow {TR} at (0,115) size 118x55 + RenderTableCell {TD} at (0,131) size 38x23 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,129) size 42x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,6) size 31x19 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (80,131) size 38x23 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-30-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-30-d-expected.txt index 3486353939c0..804500550b3b 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-30-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-30-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 129x150 - RenderTableSection {TBODY} at (0,0) size 129x150 - RenderTableRow {TR} at (0,0) size 129x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 45x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (87,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 129x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 45x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x19 - text run at (1,1) width 43: "dashed" - RenderTableCell {TD} at (87,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 129x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 45x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (87,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 136x150 + RenderTableSection {TBODY} at (0,0) size 136x150 + RenderTableRow {TR} at (0,0) size 136x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 46x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (91,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 136x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 46x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 44x19 + text run at (1,1) width 44: "dashed" + RenderTableCell {TD} at (91,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 136x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 46x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (91,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-31-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-31-d-expected.txt index df44bc6ce902..beaa7bfd0cf9 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-31-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-31-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 161x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 156x175 - RenderTableRow {TR} at (0,0) size 156x58 - RenderTableCell {TD} at (0,15) size 51x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,14) size 55x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (106,15) size 50x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,58) size 156x60 - RenderTableCell {TD} at (0,74) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,72) size 55x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x19 - text run at (6,6) width 43: "dashed" - RenderTableCell {TD} at (106,74) size 50x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 41x21 - text run at (6,4) width 41: "double" - RenderTableRow {TR} at (0,118) size 156x57 - RenderTableCell {TD} at (0,133) size 51x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,132) size 55x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 41x19 - text run at (4,6) width 41: "double" - RenderTableCell {TD} at (106,133) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 166x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 161x175 + RenderTableRow {TR} at (0,0) size 161x58 + RenderTableCell {TD} at (0,15) size 53x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,14) size 56x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (109,15) size 52x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,58) size 161x60 + RenderTableCell {TD} at (0,74) size 53x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,72) size 56x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (109,74) size 52x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 43x21 + text run at (6,4) width 43: "double" + RenderTableRow {TR} at (0,118) size 161x57 + RenderTableCell {TD} at (0,133) size 53x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,132) size 56x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 43x19 + text run at (4,6) width 43: "double" + RenderTableCell {TD} at (109,133) size 52x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-32-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-32-d-expected.txt index 8fcd34d2ca5c..b7b5d01bb03e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-32-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-32-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 135x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 130x175 - RenderTableRow {TR} at (0,0) size 130x58 - RenderTableCell {TD} at (0,15) size 38x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,14) size 55x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (93,15) size 37x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,58) size 130x60 - RenderTableCell {TD} at (0,74) size 38x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,72) size 55x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x19 - text run at (6,6) width 43: "dashed" - RenderTableCell {TD} at (93,74) size 37x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 28x21 - text run at (6,4) width 28: "solid" - RenderTableRow {TR} at (0,118) size 130x57 - RenderTableCell {TD} at (0,133) size 38x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,132) size 55x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 28x19 - text run at (4,6) width 28: "solid" - RenderTableCell {TD} at (93,133) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 140x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 135x175 + RenderTableRow {TR} at (0,0) size 135x58 + RenderTableCell {TD} at (0,15) size 40x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,14) size 56x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (96,15) size 39x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,58) size 135x60 + RenderTableCell {TD} at (0,74) size 40x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,72) size 56x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (96,74) size 39x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 30x21 + text run at (6,4) width 30: "solid" + RenderTableRow {TR} at (0,118) size 135x57 + RenderTableCell {TD} at (0,133) size 40x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,132) size 56x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 30x19 + text run at (4,6) width 30: "solid" + RenderTableCell {TD} at (96,133) size 39x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-33-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-33-d-expected.txt index c437c774b939..5da114a7f476 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-33-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-33-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 165x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 160x175 - RenderTableRow {TR} at (0,0) size 160x58 - RenderTableCell {TD} at (0,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,14) size 55x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (108,15) size 52x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,58) size 160x60 - RenderTableCell {TD} at (0,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,72) size 55x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x19 - text run at (6,6) width 43: "dashed" - RenderTableCell {TD} at (108,74) size 52x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 43x21 - text run at (6,4) width 43: "dashed" - RenderTableRow {TR} at (0,118) size 160x57 - RenderTableCell {TD} at (0,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,132) size 55x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x19 - text run at (4,6) width 43: "dashed" - RenderTableCell {TD} at (108,133) size 52x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 168x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 163x175 + RenderTableRow {TR} at (0,0) size 163x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,14) size 56x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (110,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,58) size 163x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,72) size 56x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (110,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "dashed" + RenderTableRow {TR} at (0,118) size 163x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,132) size 56x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "dashed" + RenderTableCell {TD} at (110,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-34-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-34-d-expected.txt index faa3c607eef2..eb80d381fae1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-34-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-34-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 157x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 152x175 - RenderTableRow {TR} at (0,0) size 152x58 + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 158x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 153x175 + RenderTableRow {TR} at (0,0) size 153x58 RenderTableCell {TD} at (0,15) size 49x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,14) size 55x30 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (49,14) size 56x30 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (104,15) size 48x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (105,15) size 48x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableRow {TR} at (0,58) size 152x60 + RenderTableRow {TR} at (0,58) size 153x60 RenderTableCell {TD} at (0,74) size 49x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,72) size 55x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x19 - text run at (6,6) width 43: "dashed" - RenderTableCell {TD} at (104,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,72) size 56x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (105,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (6,3) size 39x21 text run at (6,4) width 39: "dotted" - RenderTableRow {TR} at (0,118) size 152x57 + RenderTableRow {TR} at (0,118) size 153x57 RenderTableCell {TD} at (0,133) size 49x27 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,132) size 55x29 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderTableCell {TD} at (49,132) size 56x29 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] RenderText {#text} at (4,6) size 39x19 text run at (4,6) width 39: "dotted" - RenderTableCell {TD} at (104,133) size 48x27 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderTableCell {TD} at (105,133) size 48x27 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-35-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-35-d-expected.txt index ea6c329bb4e9..9c12103c0a44 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-35-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-35-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 139x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 134x175 - RenderTableRow {TR} at (0,0) size 134x58 - RenderTableCell {TD} at (0,15) size 40x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,14) size 55x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (95,15) size 39x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,58) size 134x60 - RenderTableCell {TD} at (0,74) size 40x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,72) size 55x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x19 - text run at (6,6) width 43: "dashed" - RenderTableCell {TD} at (95,74) size 39x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 30x21 - text run at (6,4) width 30: "ridge" - RenderTableRow {TR} at (0,118) size 134x57 - RenderTableCell {TD} at (0,133) size 40x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,132) size 55x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x19 - text run at (4,6) width 30: "ridge" - RenderTableCell {TD} at (95,133) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 144x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 139x175 + RenderTableRow {TR} at (0,0) size 139x58 + RenderTableCell {TD} at (0,15) size 42x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,14) size 56x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (98,15) size 41x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,58) size 139x60 + RenderTableCell {TD} at (0,74) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,72) size 56x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (98,74) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 32x21 + text run at (6,4) width 32: "ridge" + RenderTableRow {TR} at (0,118) size 139x57 + RenderTableCell {TD} at (0,133) size 42x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,132) size 56x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 32x19 + text run at (4,6) width 32: "ridge" + RenderTableCell {TD} at (98,133) size 41x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-36-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-36-d-expected.txt index c1886ea6ca1c..dad34b545f6e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-36-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-36-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 151x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 146x175 - RenderTableRow {TR} at (0,0) size 146x58 - RenderTableCell {TD} at (0,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,14) size 55x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (101,15) size 45x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,58) size 146x60 - RenderTableCell {TD} at (0,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,72) size 55x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x19 - text run at (6,6) width 43: "dashed" - RenderTableCell {TD} at (101,74) size 45x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 36x21 - text run at (6,4) width 36: "outset" - RenderTableRow {TR} at (0,118) size 146x57 - RenderTableCell {TD} at (0,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,132) size 55x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 36x19 - text run at (4,6) width 36: "outset" - RenderTableCell {TD} at (101,133) size 45x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 154x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 149x175 + RenderTableRow {TR} at (0,0) size 149x58 + RenderTableCell {TD} at (0,15) size 47x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,14) size 56x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (103,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,58) size 149x60 + RenderTableCell {TD} at (0,74) size 47x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,72) size 56x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (103,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 37x21 + text run at (6,4) width 37: "outset" + RenderTableRow {TR} at (0,118) size 149x57 + RenderTableCell {TD} at (0,133) size 47x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,132) size 56x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 37x19 + text run at (4,6) width 37: "outset" + RenderTableCell {TD} at (103,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-37-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-37-d-expected.txt index d0a7959b56ca..3532dff1fae8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-37-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-37-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 158x175 - RenderTableRow {TR} at (0,0) size 158x58 - RenderTableCell {TD} at (0,15) size 52x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,14) size 55x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (107,15) size 51x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,58) size 158x60 - RenderTableCell {TD} at (0,74) size 52x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,72) size 55x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x19 - text run at (6,6) width 43: "dashed" - RenderTableCell {TD} at (107,74) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 42x21 - text run at (6,4) width 42: "groove" - RenderTableRow {TR} at (0,118) size 158x57 - RenderTableCell {TD} at (0,133) size 52x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,132) size 55x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 42x19 - text run at (4,6) width 42: "groove" - RenderTableCell {TD} at (107,133) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 168x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 163x175 + RenderTableRow {TR} at (0,0) size 163x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,14) size 56x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (110,15) size 53x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,58) size 163x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,72) size 56x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (110,74) size 53x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "groove" + RenderTableRow {TR} at (0,118) size 163x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,132) size 56x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "groove" + RenderTableCell {TD} at (110,133) size 53x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-38-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-38-d-expected.txt index 6f0808716373..cf4210103fb8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-38-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-38-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 133x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 128x175 - RenderTableRow {TR} at (0,0) size 128x58 - RenderTableCell {TD} at (0,15) size 37x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,14) size 55x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (92,15) size 36x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,58) size 128x60 - RenderTableCell {TD} at (0,74) size 37x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,72) size 55x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x19 - text run at (6,6) width 43: "dashed" - RenderTableCell {TD} at (92,74) size 36x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 27x21 - text run at (6,4) width 27: "inset" - RenderTableRow {TR} at (0,118) size 128x57 - RenderTableCell {TD} at (0,133) size 37x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,132) size 55x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 27x19 - text run at (4,6) width 27: "inset" - RenderTableCell {TD} at (92,133) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 138x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 133x175 + RenderTableRow {TR} at (0,0) size 133x58 + RenderTableCell {TD} at (0,15) size 39x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,14) size 56x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (95,15) size 38x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,58) size 133x60 + RenderTableCell {TD} at (0,74) size 39x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,72) size 56x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (95,74) size 38x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 29x21 + text run at (6,4) width 29: "inset" + RenderTableRow {TR} at (0,118) size 133x57 + RenderTableCell {TD} at (0,133) size 39x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,132) size 56x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 29x19 + text run at (4,6) width 29: "inset" + RenderTableCell {TD} at (95,133) size 38x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-39-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-39-d-expected.txt index 8f17c54cf801..903e1538a7cb 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-39-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-39-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 127x170 - RenderTableSection {TBODY} at (0,0) size 127x170 - RenderTableRow {TR} at (0,0) size 127x55 - RenderTableCell {TD} at (0,16) size 36x23 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,14) size 55x27 [border: none] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (91,16) size 36x23 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,55) size 127x60 - RenderTableCell {TD} at (0,74) size 36x22 [border: none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,69) size 55x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 43x19 - text run at (6,6) width 43: "dashed" - RenderTableCell {TD} at (91,74) size 36x22 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 29x19 - text run at (6,1) width 29: "none" - RenderTableRow {TR} at (0,115) size 127x55 - RenderTableCell {TD} at (0,131) size 36x23 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,129) size 55x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 29x19 - text run at (1,6) width 29: "none" - RenderTableCell {TD} at (91,131) size 36x23 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 132x170 + RenderTableSection {TBODY} at (0,0) size 132x170 + RenderTableRow {TR} at (0,0) size 132x55 + RenderTableCell {TD} at (0,16) size 38x23 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,14) size 56x27 [border: none] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (94,16) size 38x23 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,55) size 132x60 + RenderTableCell {TD} at (0,74) size 38x22 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,69) size 56x32 [border: (5px dashed #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "dashed" + RenderTableCell {TD} at (94,74) size 38x22 [border: none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,1) size 31x19 + text run at (6,1) width 31: "none" + RenderTableRow {TR} at (0,115) size 132x55 + RenderTableCell {TD} at (0,131) size 38x23 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,129) size 56x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,6) size 31x19 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (94,131) size 38x23 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-40-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-40-d-expected.txt index 6d801302e919..e64403c238af 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-40-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-40-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x150 - RenderTableSection {TBODY} at (0,0) size 126x150 - RenderTableRow {TR} at (0,0) size 126x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 42x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 126x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 42x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 135x150 + RenderTableSection {TBODY} at (0,0) size 135x150 + RenderTableRow {TR} at (0,0) size 135x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 45x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 135x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 45x22 [r=1 c=1 rs=1 cs=1] RenderText {#text} at (1,1) size 39x19 text run at (1,1) width 39: "dotted" - RenderTableCell {TD} at (84,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 126x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 42x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderTableCell {TD} at (90,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 135x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 45x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-41-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-41-d-expected.txt index bd8c90f3d1d2..ededbb290288 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-41-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-41-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 157x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 152x175 - RenderTableRow {TR} at (0,0) size 152x58 - RenderTableCell {TD} at (0,15) size 51x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,14) size 51x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (102,15) size 50x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,58) size 152x60 - RenderTableCell {TD} at (0,74) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 161x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 156x175 + RenderTableRow {TR} at (0,0) size 156x58 + RenderTableCell {TD} at (0,15) size 53x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,14) size 51x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (104,15) size 52x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,58) size 156x60 + RenderTableCell {TD} at (0,74) size 53x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (6,6) size 39x19 text run at (6,6) width 39: "dotted" - RenderTableCell {TD} at (102,74) size 50x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 41x21 - text run at (6,4) width 41: "double" - RenderTableRow {TR} at (0,118) size 152x57 - RenderTableCell {TD} at (0,133) size 51x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,132) size 51x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 41x19 - text run at (4,6) width 41: "double" - RenderTableCell {TD} at (102,133) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderTableCell {TD} at (104,74) size 52x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 43x21 + text run at (6,4) width 43: "double" + RenderTableRow {TR} at (0,118) size 156x57 + RenderTableCell {TD} at (0,133) size 53x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,132) size 51x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 43x19 + text run at (4,6) width 43: "double" + RenderTableCell {TD} at (104,133) size 52x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-42-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-42-d-expected.txt index aaa8a3910dc2..0e850ee4c8fb 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-42-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-42-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 131x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 126x175 - RenderTableRow {TR} at (0,0) size 126x58 - RenderTableCell {TD} at (0,15) size 38x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,14) size 51x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (89,15) size 37x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,58) size 126x60 - RenderTableCell {TD} at (0,74) size 38x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 135x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 130x175 + RenderTableRow {TR} at (0,0) size 130x58 + RenderTableCell {TD} at (0,15) size 40x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,14) size 51x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (91,15) size 39x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,58) size 130x60 + RenderTableCell {TD} at (0,74) size 40x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (6,6) size 39x19 text run at (6,6) width 39: "dotted" - RenderTableCell {TD} at (89,74) size 37x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 28x21 - text run at (6,4) width 28: "solid" - RenderTableRow {TR} at (0,118) size 126x57 - RenderTableCell {TD} at (0,133) size 38x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,132) size 51x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 28x19 - text run at (4,6) width 28: "solid" - RenderTableCell {TD} at (89,133) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderTableCell {TD} at (91,74) size 39x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 30x21 + text run at (6,4) width 30: "solid" + RenderTableRow {TR} at (0,118) size 130x57 + RenderTableCell {TD} at (0,133) size 40x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,132) size 51x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 30x19 + text run at (4,6) width 30: "solid" + RenderTableCell {TD} at (91,133) size 39x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-43-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-43-d-expected.txt index e85e034c98c8..71312021d954 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-43-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-43-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 161x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 156x175 - RenderTableRow {TR} at (0,0) size 156x58 - RenderTableCell {TD} at (0,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,14) size 51x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (104,15) size 52x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,58) size 156x60 - RenderTableCell {TD} at (0,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (6,6) size 39x19 text run at (6,6) width 39: "dotted" - RenderTableCell {TD} at (104,74) size 52x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 43x21 - text run at (6,4) width 43: "dashed" - RenderTableRow {TR} at (0,118) size 156x57 - RenderTableCell {TD} at (0,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,132) size 51x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x19 - text run at (4,6) width 43: "dashed" - RenderTableCell {TD} at (104,133) size 52x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "dashed" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "dashed" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-44-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-44-d-expected.txt index 2d86fee3fc87..1e0dddc47c8c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-44-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-44-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" RenderTable {TABLE} at (0,36) size 153x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 148x175 RenderTableRow {TR} at (0,0) size 148x58 diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-45-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-45-d-expected.txt index b938dfbccf6b..f2825ef678da 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-45-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-45-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 135x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 130x175 - RenderTableRow {TR} at (0,0) size 130x58 - RenderTableCell {TD} at (0,15) size 40x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,14) size 51x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (91,15) size 39x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,58) size 130x60 - RenderTableCell {TD} at (0,74) size 40x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 139x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 134x175 + RenderTableRow {TR} at (0,0) size 134x58 + RenderTableCell {TD} at (0,15) size 42x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,14) size 51x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (93,15) size 41x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,58) size 134x60 + RenderTableCell {TD} at (0,74) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (6,6) size 39x19 text run at (6,6) width 39: "dotted" - RenderTableCell {TD} at (91,74) size 39x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 30x21 - text run at (6,4) width 30: "ridge" - RenderTableRow {TR} at (0,118) size 130x57 - RenderTableCell {TD} at (0,133) size 40x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,132) size 51x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x19 - text run at (4,6) width 30: "ridge" - RenderTableCell {TD} at (91,133) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderTableCell {TD} at (93,74) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 32x21 + text run at (6,4) width 32: "ridge" + RenderTableRow {TR} at (0,118) size 134x57 + RenderTableCell {TD} at (0,133) size 42x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,132) size 51x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 32x19 + text run at (4,6) width 32: "ridge" + RenderTableCell {TD} at (93,133) size 41x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-46-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-46-d-expected.txt index 58f841eaa38d..e0d248820f2e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-46-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-46-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 147x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 142x175 - RenderTableRow {TR} at (0,0) size 142x58 - RenderTableCell {TD} at (0,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,14) size 51x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (97,15) size 45x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,58) size 142x60 - RenderTableCell {TD} at (0,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 149x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 144x175 + RenderTableRow {TR} at (0,0) size 144x58 + RenderTableCell {TD} at (0,15) size 47x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,14) size 51x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (98,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,58) size 144x60 + RenderTableCell {TD} at (0,74) size 47x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (6,6) size 39x19 text run at (6,6) width 39: "dotted" - RenderTableCell {TD} at (97,74) size 45x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 36x21 - text run at (6,4) width 36: "outset" - RenderTableRow {TR} at (0,118) size 142x57 - RenderTableCell {TD} at (0,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,132) size 51x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 36x19 - text run at (4,6) width 36: "outset" - RenderTableCell {TD} at (97,133) size 45x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderTableCell {TD} at (98,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 37x21 + text run at (6,4) width 37: "outset" + RenderTableRow {TR} at (0,118) size 144x57 + RenderTableCell {TD} at (0,133) size 47x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,132) size 51x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 37x19 + text run at (4,6) width 37: "outset" + RenderTableCell {TD} at (98,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-47-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-47-d-expected.txt index cbd8303096a4..ebedebaf28d4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-47-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-47-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 159x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 154x175 - RenderTableRow {TR} at (0,0) size 154x58 - RenderTableCell {TD} at (0,15) size 52x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,14) size 51x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (103,15) size 51x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,58) size 154x60 - RenderTableCell {TD} at (0,74) size 52x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (6,6) size 39x19 text run at (6,6) width 39: "dotted" - RenderTableCell {TD} at (103,74) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 42x21 - text run at (6,4) width 42: "groove" - RenderTableRow {TR} at (0,118) size 154x57 - RenderTableCell {TD} at (0,133) size 52x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,132) size 51x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 42x19 - text run at (4,6) width 42: "groove" - RenderTableCell {TD} at (103,133) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "groove" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "groove" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-48-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-48-d-expected.txt index 6978c2a44ccd..d418b1ad9101 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-48-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-48-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 129x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 124x175 - RenderTableRow {TR} at (0,0) size 124x58 - RenderTableCell {TD} at (0,15) size 37x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,14) size 51x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (88,15) size 36x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,58) size 124x60 - RenderTableCell {TD} at (0,74) size 37x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 133x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 128x175 + RenderTableRow {TR} at (0,0) size 128x58 + RenderTableCell {TD} at (0,15) size 39x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,14) size 51x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (90,15) size 38x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,58) size 128x60 + RenderTableCell {TD} at (0,74) size 39x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,72) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (6,6) size 39x19 text run at (6,6) width 39: "dotted" - RenderTableCell {TD} at (88,74) size 36x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 27x21 - text run at (6,4) width 27: "inset" - RenderTableRow {TR} at (0,118) size 124x57 - RenderTableCell {TD} at (0,133) size 37x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,132) size 51x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 27x19 - text run at (4,6) width 27: "inset" - RenderTableCell {TD} at (88,133) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderTableCell {TD} at (90,74) size 38x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 29x21 + text run at (6,4) width 29: "inset" + RenderTableRow {TR} at (0,118) size 128x57 + RenderTableCell {TD} at (0,133) size 39x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,132) size 51x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 29x19 + text run at (4,6) width 29: "inset" + RenderTableCell {TD} at (90,133) size 38x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-49-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-49-d-expected.txt index 521ca39dfb39..d4ccdd7c2df8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-49-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-49-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 123x170 - RenderTableSection {TBODY} at (0,0) size 123x170 - RenderTableRow {TR} at (0,0) size 123x55 - RenderTableCell {TD} at (0,16) size 36x23 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,14) size 51x27 [border: none] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (87,16) size 36x23 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,55) size 123x60 - RenderTableCell {TD} at (0,74) size 36x22 [border: none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,69) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 127x170 + RenderTableSection {TBODY} at (0,0) size 127x170 + RenderTableRow {TR} at (0,0) size 127x55 + RenderTableCell {TD} at (0,16) size 38x23 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,14) size 51x27 [border: none] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (89,16) size 38x23 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,55) size 127x60 + RenderTableCell {TD} at (0,74) size 38x22 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,69) size 51x32 [border: (5px dotted #00FF00)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (6,6) size 39x19 text run at (6,6) width 39: "dotted" - RenderTableCell {TD} at (87,74) size 36x22 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 29x19 - text run at (6,1) width 29: "none" - RenderTableRow {TR} at (0,115) size 123x55 - RenderTableCell {TD} at (0,131) size 36x23 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,129) size 51x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 29x19 - text run at (1,6) width 29: "none" - RenderTableCell {TD} at (87,131) size 36x23 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" + RenderTableCell {TD} at (89,74) size 38x22 [border: none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,1) size 31x19 + text run at (6,1) width 31: "none" + RenderTableRow {TR} at (0,115) size 127x55 + RenderTableCell {TD} at (0,131) size 38x23 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,129) size 51x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,6) size 31x19 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (89,131) size 38x23 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-50-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-50-d-expected.txt index 2cf34cf31844..5f70d24a3891 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-50-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-50-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x150 - RenderTableSection {TBODY} at (0,0) size 126x150 - RenderTableRow {TR} at (0,0) size 126x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 42x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 126x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 42x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 30x19 - text run at (1,1) width 30: "ridge" - RenderTableCell {TD} at (84,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 126x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 42x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 135x150 + RenderTableSection {TBODY} at (0,0) size 135x150 + RenderTableRow {TR} at (0,0) size 135x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 45x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 135x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 45x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 32x19 + text run at (1,1) width 32: "ridge" + RenderTableCell {TD} at (90,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 135x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 45x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-51-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-51-d-expected.txt index 206c1fbe0f2d..e8851b6b5fe3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-51-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-51-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 154x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 149x175 - RenderTableRow {TR} at (0,0) size 149x58 - RenderTableCell {TD} at (0,15) size 51x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,14) size 48x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (99,15) size 50x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,58) size 149x60 - RenderTableCell {TD} at (0,74) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,72) size 48x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x19 - text run at (6,6) width 30: "ridge" - RenderTableCell {TD} at (99,74) size 50x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 41x21 - text run at (6,4) width 41: "double" - RenderTableRow {TR} at (0,118) size 149x57 - RenderTableCell {TD} at (0,133) size 51x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,132) size 48x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 41x19 - text run at (4,6) width 41: "double" - RenderTableCell {TD} at (99,133) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 160x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 155x175 + RenderTableRow {TR} at (0,0) size 155x58 + RenderTableCell {TD} at (0,15) size 53x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,14) size 50x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (103,15) size 52x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,58) size 155x60 + RenderTableCell {TD} at (0,74) size 53x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,72) size 50x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 32x19 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (103,74) size 52x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 43x21 + text run at (6,4) width 43: "double" + RenderTableRow {TR} at (0,118) size 155x57 + RenderTableCell {TD} at (0,133) size 53x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,132) size 50x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 43x19 + text run at (4,6) width 43: "double" + RenderTableCell {TD} at (103,133) size 52x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-52-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-52-d-expected.txt index 7fda0ccf9021..60c513f47100 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-52-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-52-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 122x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 117x175 - RenderTableRow {TR} at (0,0) size 117x58 - RenderTableCell {TD} at (0,15) size 38x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,14) size 42x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (80,15) size 37x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,58) size 117x60 - RenderTableCell {TD} at (0,74) size 38x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,72) size 42x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x19 - text run at (6,6) width 30: "ridge" - RenderTableCell {TD} at (80,74) size 37x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 28x21 - text run at (6,4) width 28: "solid" - RenderTableRow {TR} at (0,118) size 117x57 - RenderTableCell {TD} at (0,133) size 38x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,132) size 42x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 28x19 - text run at (4,6) width 28: "solid" - RenderTableCell {TD} at (80,133) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 128x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 123x175 + RenderTableRow {TR} at (0,0) size 123x58 + RenderTableCell {TD} at (0,15) size 40x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,14) size 44x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (84,15) size 39x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,58) size 123x60 + RenderTableCell {TD} at (0,74) size 40x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,72) size 44x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 32x19 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (84,74) size 39x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 30x21 + text run at (6,4) width 30: "solid" + RenderTableRow {TR} at (0,118) size 123x57 + RenderTableCell {TD} at (0,133) size 40x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,132) size 44x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 30x19 + text run at (4,6) width 30: "solid" + RenderTableCell {TD} at (84,133) size 39x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-53-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-53-d-expected.txt index 9b1629af4306..0e505cb25aa1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-53-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-53-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 160x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 155x175 - RenderTableRow {TR} at (0,0) size 155x58 - RenderTableCell {TD} at (0,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,14) size 50x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (103,15) size 52x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,58) size 155x60 - RenderTableCell {TD} at (0,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,72) size 50x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x19 - text run at (6,6) width 30: "ridge" - RenderTableCell {TD} at (103,74) size 52x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 43x21 - text run at (6,4) width 43: "dashed" - RenderTableRow {TR} at (0,118) size 155x57 - RenderTableCell {TD} at (0,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,132) size 50x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x19 - text run at (4,6) width 43: "dashed" - RenderTableCell {TD} at (103,133) size 52x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 32x19 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "dashed" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "dashed" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-54-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-54-d-expected.txt index ceb3adb7a4a0..4ecd4c18e993 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-54-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-54-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" RenderTable {TABLE} at (0,36) size 148x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 143x175 RenderTableRow {TR} at (0,0) size 143x58 @@ -23,8 +23,8 @@ layer at (0,0) size 800x240 RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,72) size 46x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x19 - text run at (6,6) width 30: "ridge" + RenderText {#text} at (6,6) size 32x19 + text run at (6,6) width 32: "ridge" RenderTableCell {TD} at (95,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (6,3) size 39x21 text run at (6,4) width 39: "dotted" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-55-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-55-d-expected.txt index e3c3e888c8a4..848955134f2a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-55-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-55-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 121x175 - RenderTableRow {TR} at (0,0) size 121x58 - RenderTableCell {TD} at (0,15) size 40x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,14) size 42x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (82,15) size 39x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,58) size 121x60 - RenderTableCell {TD} at (0,74) size 40x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,72) size 42x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x19 - text run at (6,6) width 30: "ridge" - RenderTableCell {TD} at (82,74) size 39x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 30x21 - text run at (6,4) width 30: "ridge" - RenderTableRow {TR} at (0,118) size 121x57 - RenderTableCell {TD} at (0,133) size 40x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,132) size 42x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x19 - text run at (4,6) width 30: "ridge" - RenderTableCell {TD} at (82,133) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 132x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 127x175 + RenderTableRow {TR} at (0,0) size 127x58 + RenderTableCell {TD} at (0,15) size 42x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,14) size 44x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (86,15) size 41x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,58) size 127x60 + RenderTableCell {TD} at (0,74) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,72) size 44x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 32x19 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (86,74) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 32x21 + text run at (6,4) width 32: "ridge" + RenderTableRow {TR} at (0,118) size 127x57 + RenderTableCell {TD} at (0,133) size 42x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,132) size 44x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 32x19 + text run at (4,6) width 32: "ridge" + RenderTableCell {TD} at (86,133) size 41x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-56-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-56-d-expected.txt index 268a94700ffa..05112c636753 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-56-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-56-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 139x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 134x175 - RenderTableRow {TR} at (0,0) size 134x58 - RenderTableCell {TD} at (0,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,14) size 43x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (89,15) size 45x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,58) size 134x60 - RenderTableCell {TD} at (0,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,72) size 43x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x19 - text run at (6,6) width 30: "ridge" - RenderTableCell {TD} at (89,74) size 45x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 36x21 - text run at (6,4) width 36: "outset" - RenderTableRow {TR} at (0,118) size 134x57 - RenderTableCell {TD} at (0,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,132) size 43x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 36x19 - text run at (4,6) width 36: "outset" - RenderTableCell {TD} at (89,133) size 45x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 142x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 137x175 + RenderTableRow {TR} at (0,0) size 137x58 + RenderTableCell {TD} at (0,15) size 47x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,14) size 44x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (91,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,58) size 137x60 + RenderTableCell {TD} at (0,74) size 47x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,72) size 44x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 32x19 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (91,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 37x21 + text run at (6,4) width 37: "outset" + RenderTableRow {TR} at (0,118) size 137x57 + RenderTableCell {TD} at (0,133) size 47x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,132) size 44x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 37x19 + text run at (4,6) width 37: "outset" + RenderTableCell {TD} at (91,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-57-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-57-d-expected.txt index a422a413ac68..453dcd370ca8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-57-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-57-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 157x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 152x175 - RenderTableRow {TR} at (0,0) size 152x58 - RenderTableCell {TD} at (0,15) size 52x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,14) size 49x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (101,15) size 51x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,58) size 152x60 - RenderTableCell {TD} at (0,74) size 52x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,72) size 49x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x19 - text run at (6,6) width 30: "ridge" - RenderTableCell {TD} at (101,74) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 42x21 - text run at (6,4) width 42: "groove" - RenderTableRow {TR} at (0,118) size 152x57 - RenderTableCell {TD} at (0,133) size 52x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,132) size 49x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 42x19 - text run at (4,6) width 42: "groove" - RenderTableCell {TD} at (101,133) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 32x19 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "groove" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "groove" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-58-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-58-d-expected.txt index 6ef169f0ac9e..6dcd4c0d9215 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-58-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-58-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 120x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 115x175 - RenderTableRow {TR} at (0,0) size 115x58 - RenderTableCell {TD} at (0,15) size 37x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,14) size 42x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (79,15) size 36x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,58) size 115x60 - RenderTableCell {TD} at (0,74) size 37x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,72) size 42x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x19 - text run at (6,6) width 30: "ridge" - RenderTableCell {TD} at (79,74) size 36x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 27x21 - text run at (6,4) width 27: "inset" - RenderTableRow {TR} at (0,118) size 115x57 - RenderTableCell {TD} at (0,133) size 37x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,132) size 42x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 27x19 - text run at (4,6) width 27: "inset" - RenderTableCell {TD} at (79,133) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 126x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 121x175 + RenderTableRow {TR} at (0,0) size 121x58 + RenderTableCell {TD} at (0,15) size 39x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,14) size 44x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (83,15) size 38x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,58) size 121x60 + RenderTableCell {TD} at (0,74) size 39x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,72) size 44x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 32x19 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (83,74) size 38x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 29x21 + text run at (6,4) width 29: "inset" + RenderTableRow {TR} at (0,118) size 121x57 + RenderTableCell {TD} at (0,133) size 39x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,132) size 44x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 29x19 + text run at (4,6) width 29: "inset" + RenderTableCell {TD} at (83,133) size 38x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-59-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-59-d-expected.txt index 7a1d3264ad73..6342abac9c90 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-59-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-59-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 114x170 - RenderTableSection {TBODY} at (0,0) size 114x170 - RenderTableRow {TR} at (0,0) size 114x55 - RenderTableCell {TD} at (0,16) size 36x23 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,14) size 42x27 [border: none] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (78,16) size 36x23 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,55) size 114x60 - RenderTableCell {TD} at (0,74) size 36x22 [border: none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,69) size 42x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 30x19 - text run at (6,6) width 30: "ridge" - RenderTableCell {TD} at (78,74) size 36x22 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 29x19 - text run at (6,1) width 29: "none" - RenderTableRow {TR} at (0,115) size 114x55 - RenderTableCell {TD} at (0,131) size 36x23 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,129) size 42x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 29x19 - text run at (1,6) width 29: "none" - RenderTableCell {TD} at (78,131) size 36x23 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 120x170 + RenderTableSection {TBODY} at (0,0) size 120x170 + RenderTableRow {TR} at (0,0) size 120x55 + RenderTableCell {TD} at (0,16) size 38x23 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,14) size 44x27 [border: none] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (82,16) size 38x23 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,55) size 120x60 + RenderTableCell {TD} at (0,74) size 38x22 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,69) size 44x32 [border: (5px ridge #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 32x19 + text run at (6,6) width 32: "ridge" + RenderTableCell {TD} at (82,74) size 38x22 [border: none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,1) size 31x19 + text run at (6,1) width 31: "none" + RenderTableRow {TR} at (0,115) size 120x55 + RenderTableCell {TD} at (0,131) size 38x23 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,129) size 44x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,6) size 31x19 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (82,131) size 38x23 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-60-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-60-d-expected.txt index dbf628b561fe..dc49900ac113 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-60-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-60-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x150 - RenderTableSection {TBODY} at (0,0) size 126x150 - RenderTableRow {TR} at (0,0) size 126x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 42x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 126x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 42x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 36x19 - text run at (1,1) width 36: "outset" - RenderTableCell {TD} at (84,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 126x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 42x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 135x150 + RenderTableSection {TBODY} at (0,0) size 135x150 + RenderTableRow {TR} at (0,0) size 135x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 45x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 135x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 45x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 37x19 + text run at (1,1) width 37: "outset" + RenderTableCell {TD} at (90,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 135x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 45x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-61-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-61-d-expected.txt index 475b1401826f..9bab22e0ca75 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-61-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-61-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 154x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 149x175 - RenderTableRow {TR} at (0,0) size 149x58 - RenderTableCell {TD} at (0,15) size 51x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,14) size 48x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (99,15) size 50x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,58) size 149x60 - RenderTableCell {TD} at (0,74) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,72) size 48x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 36x19 - text run at (6,6) width 36: "outset" - RenderTableCell {TD} at (99,74) size 50x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 41x21 - text run at (6,4) width 41: "double" - RenderTableRow {TR} at (0,118) size 149x57 - RenderTableCell {TD} at (0,133) size 51x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,132) size 48x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 41x19 - text run at (4,6) width 41: "double" - RenderTableCell {TD} at (99,133) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 160x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 155x175 + RenderTableRow {TR} at (0,0) size 155x58 + RenderTableCell {TD} at (0,15) size 53x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,14) size 50x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (103,15) size 52x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,58) size 155x60 + RenderTableCell {TD} at (0,74) size 53x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,72) size 50x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 37x19 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (103,74) size 52x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 43x21 + text run at (6,4) width 43: "double" + RenderTableRow {TR} at (0,118) size 155x57 + RenderTableCell {TD} at (0,133) size 53x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,132) size 50x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 43x19 + text run at (4,6) width 43: "double" + RenderTableCell {TD} at (103,133) size 52x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-62-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-62-d-expected.txt index 31f07b79eeee..030666213e9f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-62-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-62-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 128x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 123x175 - RenderTableRow {TR} at (0,0) size 123x58 - RenderTableCell {TD} at (0,15) size 38x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,14) size 48x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (86,15) size 37x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,58) size 123x60 - RenderTableCell {TD} at (0,74) size 38x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,72) size 48x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 36x19 - text run at (6,6) width 36: "outset" - RenderTableCell {TD} at (86,74) size 37x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 28x21 - text run at (6,4) width 28: "solid" - RenderTableRow {TR} at (0,118) size 123x57 - RenderTableCell {TD} at (0,133) size 38x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,132) size 48x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 28x19 - text run at (4,6) width 28: "solid" - RenderTableCell {TD} at (86,133) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 133x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 128x175 + RenderTableRow {TR} at (0,0) size 128x58 + RenderTableCell {TD} at (0,15) size 40x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,14) size 49x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (89,15) size 39x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,58) size 128x60 + RenderTableCell {TD} at (0,74) size 40x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,72) size 49x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 37x19 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (89,74) size 39x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 30x21 + text run at (6,4) width 30: "solid" + RenderTableRow {TR} at (0,118) size 128x57 + RenderTableCell {TD} at (0,133) size 40x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,132) size 49x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 30x19 + text run at (4,6) width 30: "solid" + RenderTableCell {TD} at (89,133) size 39x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-63-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-63-d-expected.txt index ab7de400349a..176a247ecb2a 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-63-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-63-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 160x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 155x175 - RenderTableRow {TR} at (0,0) size 155x58 - RenderTableCell {TD} at (0,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,14) size 50x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (103,15) size 52x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,58) size 155x60 - RenderTableCell {TD} at (0,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,72) size 50x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 36x19 - text run at (6,6) width 36: "outset" - RenderTableCell {TD} at (103,74) size 52x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 43x21 - text run at (6,4) width 43: "dashed" - RenderTableRow {TR} at (0,118) size 155x57 - RenderTableCell {TD} at (0,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,132) size 50x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x19 - text run at (4,6) width 43: "dashed" - RenderTableCell {TD} at (103,133) size 52x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 37x19 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "dashed" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "dashed" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-64-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-64-d-expected.txt index 32858d513ee4..a06373bdfb04 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-64-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-64-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 150x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 145x175 - RenderTableRow {TR} at (0,0) size 145x58 + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 151x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 146x175 + RenderTableRow {TR} at (0,0) size 146x58 RenderTableCell {TD} at (0,15) size 49x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,14) size 48x30 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (49,14) size 49x30 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (97,15) size 48x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (98,15) size 48x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableRow {TR} at (0,58) size 145x60 + RenderTableRow {TR} at (0,58) size 146x60 RenderTableCell {TD} at (0,74) size 49x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,72) size 48x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 36x19 - text run at (6,6) width 36: "outset" - RenderTableCell {TD} at (97,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,72) size 49x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 37x19 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (98,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (6,3) size 39x21 text run at (6,4) width 39: "dotted" - RenderTableRow {TR} at (0,118) size 145x57 + RenderTableRow {TR} at (0,118) size 146x57 RenderTableCell {TD} at (0,133) size 49x27 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,132) size 48x29 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderTableCell {TD} at (49,132) size 49x29 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] RenderText {#text} at (4,6) size 39x19 text run at (4,6) width 39: "dotted" - RenderTableCell {TD} at (97,133) size 48x27 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderTableCell {TD} at (98,133) size 48x27 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-65-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-65-d-expected.txt index a2c634a62756..e533e3070b65 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-65-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-65-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 132x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 127x175 - RenderTableRow {TR} at (0,0) size 127x58 - RenderTableCell {TD} at (0,15) size 40x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,14) size 48x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (88,15) size 39x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,58) size 127x60 - RenderTableCell {TD} at (0,74) size 40x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,72) size 48x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 36x19 - text run at (6,6) width 36: "outset" - RenderTableCell {TD} at (88,74) size 39x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 30x21 - text run at (6,4) width 30: "ridge" - RenderTableRow {TR} at (0,118) size 127x57 - RenderTableCell {TD} at (0,133) size 40x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,132) size 48x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x19 - text run at (4,6) width 30: "ridge" - RenderTableCell {TD} at (88,133) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 137x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 132x175 + RenderTableRow {TR} at (0,0) size 132x58 + RenderTableCell {TD} at (0,15) size 42x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,14) size 49x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (91,15) size 41x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,58) size 132x60 + RenderTableCell {TD} at (0,74) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,72) size 49x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 37x19 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (91,74) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 32x21 + text run at (6,4) width 32: "ridge" + RenderTableRow {TR} at (0,118) size 132x57 + RenderTableCell {TD} at (0,133) size 42x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,132) size 49x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 32x19 + text run at (4,6) width 32: "ridge" + RenderTableCell {TD} at (91,133) size 41x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-66-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-66-d-expected.txt index 6f67546723c8..a8ca4c73079d 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-66-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-66-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 144x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 139x175 - RenderTableRow {TR} at (0,0) size 139x58 - RenderTableCell {TD} at (0,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,14) size 48x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (94,15) size 45x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,58) size 139x60 - RenderTableCell {TD} at (0,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,72) size 48x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 36x19 - text run at (6,6) width 36: "outset" - RenderTableCell {TD} at (94,74) size 45x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 36x21 - text run at (6,4) width 36: "outset" - RenderTableRow {TR} at (0,118) size 139x57 - RenderTableCell {TD} at (0,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,132) size 48x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 36x19 - text run at (4,6) width 36: "outset" - RenderTableCell {TD} at (94,133) size 45x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 147x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 142x175 + RenderTableRow {TR} at (0,0) size 142x58 + RenderTableCell {TD} at (0,15) size 47x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,14) size 49x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (96,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,58) size 142x60 + RenderTableCell {TD} at (0,74) size 47x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,72) size 49x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 37x19 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (96,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 37x21 + text run at (6,4) width 37: "outset" + RenderTableRow {TR} at (0,118) size 142x57 + RenderTableCell {TD} at (0,133) size 47x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,132) size 49x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 37x19 + text run at (4,6) width 37: "outset" + RenderTableCell {TD} at (96,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-67-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-67-d-expected.txt index 125cb1f5cfb0..f96e17aa314f 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-67-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-67-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 157x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 152x175 - RenderTableRow {TR} at (0,0) size 152x58 - RenderTableCell {TD} at (0,15) size 52x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,14) size 49x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (101,15) size 51x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,58) size 152x60 - RenderTableCell {TD} at (0,74) size 52x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,72) size 49x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 36x19 - text run at (6,6) width 36: "outset" - RenderTableCell {TD} at (101,74) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 42x21 - text run at (6,4) width 42: "groove" - RenderTableRow {TR} at (0,118) size 152x57 - RenderTableCell {TD} at (0,133) size 52x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,132) size 49x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 42x19 - text run at (4,6) width 42: "groove" - RenderTableCell {TD} at (101,133) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 37x19 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "groove" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "groove" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-68-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-68-d-expected.txt index e49989c96062..138da3e38edd 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-68-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-68-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 121x175 - RenderTableRow {TR} at (0,0) size 121x58 - RenderTableCell {TD} at (0,15) size 37x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,14) size 48x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (85,15) size 36x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,58) size 121x60 - RenderTableCell {TD} at (0,74) size 37x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,72) size 48x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 36x19 - text run at (6,6) width 36: "outset" - RenderTableCell {TD} at (85,74) size 36x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 27x21 - text run at (6,4) width 27: "inset" - RenderTableRow {TR} at (0,118) size 121x57 - RenderTableCell {TD} at (0,133) size 37x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,132) size 48x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 27x19 - text run at (4,6) width 27: "inset" - RenderTableCell {TD} at (85,133) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 131x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 126x175 + RenderTableRow {TR} at (0,0) size 126x58 + RenderTableCell {TD} at (0,15) size 39x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,14) size 49x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (88,15) size 38x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,58) size 126x60 + RenderTableCell {TD} at (0,74) size 39x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,72) size 49x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 37x19 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (88,74) size 38x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 29x21 + text run at (6,4) width 29: "inset" + RenderTableRow {TR} at (0,118) size 126x57 + RenderTableCell {TD} at (0,133) size 39x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,132) size 49x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 29x19 + text run at (4,6) width 29: "inset" + RenderTableCell {TD} at (88,133) size 38x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-69-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-69-d-expected.txt index cbe00e4dc723..653ba0564ca3 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-69-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-69-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 120x170 - RenderTableSection {TBODY} at (0,0) size 120x170 - RenderTableRow {TR} at (0,0) size 120x55 - RenderTableCell {TD} at (0,16) size 36x23 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,14) size 48x27 [border: none] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (84,16) size 36x23 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,55) size 120x60 - RenderTableCell {TD} at (0,74) size 36x22 [border: none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,69) size 48x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 36x19 - text run at (6,6) width 36: "outset" - RenderTableCell {TD} at (84,74) size 36x22 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 29x19 - text run at (6,1) width 29: "none" - RenderTableRow {TR} at (0,115) size 120x55 - RenderTableCell {TD} at (0,131) size 36x23 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,129) size 48x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 29x19 - text run at (1,6) width 29: "none" - RenderTableCell {TD} at (84,131) size 36x23 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 125x170 + RenderTableSection {TBODY} at (0,0) size 125x170 + RenderTableRow {TR} at (0,0) size 125x55 + RenderTableCell {TD} at (0,16) size 38x23 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,14) size 49x27 [border: none] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (87,16) size 38x23 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,55) size 125x60 + RenderTableCell {TD} at (0,74) size 38x22 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,69) size 49x32 [border: (5px outset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 37x19 + text run at (6,6) width 37: "outset" + RenderTableCell {TD} at (87,74) size 38x22 [border: none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,1) size 31x19 + text run at (6,1) width 31: "none" + RenderTableRow {TR} at (0,115) size 125x55 + RenderTableCell {TD} at (0,131) size 38x23 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,129) size 49x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,6) size 31x19 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (87,131) size 38x23 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-70-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-70-d-expected.txt index a8f581420e72..3f303f245c47 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-70-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-70-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 128x150 - RenderTableSection {TBODY} at (0,0) size 128x150 - RenderTableRow {TR} at (0,0) size 128x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 44x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (86,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 128x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 44x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 42x19 - text run at (1,1) width 42: "groove" - RenderTableCell {TD} at (86,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 128x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 44x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (86,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 136x150 + RenderTableSection {TBODY} at (0,0) size 136x150 + RenderTableRow {TR} at (0,0) size 136x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 46x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (91,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 136x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 46x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 44x19 + text run at (1,1) width 44: "groove" + RenderTableCell {TD} at (91,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 136x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 46x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (91,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-71-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-71-d-expected.txt index 1f9562d8d9bd..0281f3a357a4 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-71-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-71-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 160x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 155x175 - RenderTableRow {TR} at (0,0) size 155x58 - RenderTableCell {TD} at (0,15) size 51x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,14) size 54x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (105,15) size 50x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,58) size 155x60 - RenderTableCell {TD} at (0,74) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,72) size 54x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 42x19 - text run at (6,6) width 42: "groove" - RenderTableCell {TD} at (105,74) size 50x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 41x21 - text run at (6,4) width 41: "double" - RenderTableRow {TR} at (0,118) size 155x57 - RenderTableCell {TD} at (0,133) size 51x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,132) size 54x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 41x19 - text run at (4,6) width 41: "double" - RenderTableCell {TD} at (105,133) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 166x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 161x175 + RenderTableRow {TR} at (0,0) size 161x58 + RenderTableCell {TD} at (0,15) size 53x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,14) size 56x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (109,15) size 52x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,58) size 161x60 + RenderTableCell {TD} at (0,74) size 53x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,72) size 56x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (109,74) size 52x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 43x21 + text run at (6,4) width 43: "double" + RenderTableRow {TR} at (0,118) size 161x57 + RenderTableCell {TD} at (0,133) size 53x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,132) size 56x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 43x19 + text run at (4,6) width 43: "double" + RenderTableCell {TD} at (109,133) size 52x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-72-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-72-d-expected.txt index a8598ac439e6..9e9b3d675b56 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-72-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-72-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 134x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 129x175 - RenderTableRow {TR} at (0,0) size 129x58 - RenderTableCell {TD} at (0,15) size 38x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,14) size 54x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (92,15) size 37x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,58) size 129x60 - RenderTableCell {TD} at (0,74) size 38x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,72) size 54x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 42x19 - text run at (6,6) width 42: "groove" - RenderTableCell {TD} at (92,74) size 37x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 28x21 - text run at (6,4) width 28: "solid" - RenderTableRow {TR} at (0,118) size 129x57 - RenderTableCell {TD} at (0,133) size 38x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,132) size 54x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 28x19 - text run at (4,6) width 28: "solid" - RenderTableCell {TD} at (92,133) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 140x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 135x175 + RenderTableRow {TR} at (0,0) size 135x58 + RenderTableCell {TD} at (0,15) size 40x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,14) size 56x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (96,15) size 39x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,58) size 135x60 + RenderTableCell {TD} at (0,74) size 40x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,72) size 56x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (96,74) size 39x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 30x21 + text run at (6,4) width 30: "solid" + RenderTableRow {TR} at (0,118) size 135x57 + RenderTableCell {TD} at (0,133) size 40x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,132) size 56x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 30x19 + text run at (4,6) width 30: "solid" + RenderTableCell {TD} at (96,133) size 39x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-73-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-73-d-expected.txt index d8ed5b25a2f7..223a65496e77 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-73-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-73-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 164x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 159x175 - RenderTableRow {TR} at (0,0) size 159x58 - RenderTableCell {TD} at (0,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,14) size 54x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (107,15) size 52x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,58) size 159x60 - RenderTableCell {TD} at (0,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,72) size 54x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 42x19 - text run at (6,6) width 42: "groove" - RenderTableCell {TD} at (107,74) size 52x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 43x21 - text run at (6,4) width 43: "dashed" - RenderTableRow {TR} at (0,118) size 159x57 - RenderTableCell {TD} at (0,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,132) size 54x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x19 - text run at (4,6) width 43: "dashed" - RenderTableCell {TD} at (107,133) size 52x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 168x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 163x175 + RenderTableRow {TR} at (0,0) size 163x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,14) size 56x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (110,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,58) size 163x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,72) size 56x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (110,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "dashed" + RenderTableRow {TR} at (0,118) size 163x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,132) size 56x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "dashed" + RenderTableCell {TD} at (110,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-74-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-74-d-expected.txt index 3f879a470fef..81dc339e0a50 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-74-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-74-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 156x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 151x175 - RenderTableRow {TR} at (0,0) size 151x58 + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 158x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 153x175 + RenderTableRow {TR} at (0,0) size 153x58 RenderTableCell {TD} at (0,15) size 49x28 [border: (3px dotted #00FF00)] [r=0 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,14) size 54x30 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (49,14) size 56x30 [border: (3px dotted #00FF00) (5px dotted #FF0000) (3px dotted #00FF00)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (103,15) size 48x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (105,15) size 48x28 [border: (3px dotted #00FF00)] [r=0 c=2 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableRow {TR} at (0,58) size 151x60 + RenderTableRow {TR} at (0,58) size 153x60 RenderTableCell {TD} at (0,74) size 49x28 [border: (3px dotted #00FF00) (5px dotted #FF0000) (2px dotted #00FF00)] [r=1 c=0 rs=1 cs=1] RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,72) size 54x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 42x19 - text run at (6,6) width 42: "groove" - RenderTableCell {TD} at (103,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderTableCell {TD} at (49,72) size 56x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (105,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (6,3) size 39x21 text run at (6,4) width 39: "dotted" - RenderTableRow {TR} at (0,118) size 151x57 + RenderTableRow {TR} at (0,118) size 153x57 RenderTableCell {TD} at (0,133) size 49x27 [border: (3px dotted #00FF00)] [r=2 c=0 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" - RenderTableCell {TD} at (49,132) size 54x29 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderTableCell {TD} at (49,132) size 56x29 [border: (5px dotted #FF0000) (2px dotted #00FF00)] [r=2 c=1 rs=1 cs=1] RenderText {#text} at (4,6) size 39x19 text run at (4,6) width 39: "dotted" - RenderTableCell {TD} at (103,133) size 48x27 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderTableCell {TD} at (105,133) size 48x27 [border: (3px dotted #00FF00)] [r=2 c=2 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-75-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-75-d-expected.txt index 72c9ecbeb274..b19a6cbd2ecd 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-75-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-75-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 138x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 133x175 - RenderTableRow {TR} at (0,0) size 133x58 - RenderTableCell {TD} at (0,15) size 40x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,14) size 54x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (94,15) size 39x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,58) size 133x60 - RenderTableCell {TD} at (0,74) size 40x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,72) size 54x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 42x19 - text run at (6,6) width 42: "groove" - RenderTableCell {TD} at (94,74) size 39x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 30x21 - text run at (6,4) width 30: "ridge" - RenderTableRow {TR} at (0,118) size 133x57 - RenderTableCell {TD} at (0,133) size 40x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,132) size 54x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x19 - text run at (4,6) width 30: "ridge" - RenderTableCell {TD} at (94,133) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 144x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 139x175 + RenderTableRow {TR} at (0,0) size 139x58 + RenderTableCell {TD} at (0,15) size 42x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,14) size 56x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (98,15) size 41x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,58) size 139x60 + RenderTableCell {TD} at (0,74) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,72) size 56x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (98,74) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 32x21 + text run at (6,4) width 32: "ridge" + RenderTableRow {TR} at (0,118) size 139x57 + RenderTableCell {TD} at (0,133) size 42x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,132) size 56x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 32x19 + text run at (4,6) width 32: "ridge" + RenderTableCell {TD} at (98,133) size 41x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-76-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-76-d-expected.txt index db45e7d1ede2..b1f397247a38 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-76-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-76-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 150x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 145x175 - RenderTableRow {TR} at (0,0) size 145x58 - RenderTableCell {TD} at (0,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,14) size 54x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (100,15) size 45x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,58) size 145x60 - RenderTableCell {TD} at (0,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,72) size 54x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 42x19 - text run at (6,6) width 42: "groove" - RenderTableCell {TD} at (100,74) size 45x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 36x21 - text run at (6,4) width 36: "outset" - RenderTableRow {TR} at (0,118) size 145x57 - RenderTableCell {TD} at (0,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,132) size 54x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 36x19 - text run at (4,6) width 36: "outset" - RenderTableCell {TD} at (100,133) size 45x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 154x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 149x175 + RenderTableRow {TR} at (0,0) size 149x58 + RenderTableCell {TD} at (0,15) size 47x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,14) size 56x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (103,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,58) size 149x60 + RenderTableCell {TD} at (0,74) size 47x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,72) size 56x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (103,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 37x21 + text run at (6,4) width 37: "outset" + RenderTableRow {TR} at (0,118) size 149x57 + RenderTableCell {TD} at (0,133) size 47x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,132) size 56x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 37x19 + text run at (4,6) width 37: "outset" + RenderTableCell {TD} at (103,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-77-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-77-d-expected.txt index d36d5eccb44c..48004a1d1f54 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-77-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-77-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 162x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 157x175 - RenderTableRow {TR} at (0,0) size 157x58 - RenderTableCell {TD} at (0,15) size 52x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,14) size 54x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (106,15) size 51x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,58) size 157x60 - RenderTableCell {TD} at (0,74) size 52x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,72) size 54x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 42x19 - text run at (6,6) width 42: "groove" - RenderTableCell {TD} at (106,74) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 42x21 - text run at (6,4) width 42: "groove" - RenderTableRow {TR} at (0,118) size 157x57 - RenderTableCell {TD} at (0,133) size 52x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,132) size 54x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 42x19 - text run at (4,6) width 42: "groove" - RenderTableCell {TD} at (106,133) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 168x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 163x175 + RenderTableRow {TR} at (0,0) size 163x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,14) size 56x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (110,15) size 53x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,58) size 163x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,72) size 56x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (110,74) size 53x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "groove" + RenderTableRow {TR} at (0,118) size 163x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,132) size 56x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "groove" + RenderTableCell {TD} at (110,133) size 53x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-78-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-78-d-expected.txt index f7294d6470d6..ded6af7b96a6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-78-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-78-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 132x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 127x175 - RenderTableRow {TR} at (0,0) size 127x58 - RenderTableCell {TD} at (0,15) size 37x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,14) size 54x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (91,15) size 36x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,58) size 127x60 - RenderTableCell {TD} at (0,74) size 37x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,72) size 54x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 42x19 - text run at (6,6) width 42: "groove" - RenderTableCell {TD} at (91,74) size 36x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 27x21 - text run at (6,4) width 27: "inset" - RenderTableRow {TR} at (0,118) size 127x57 - RenderTableCell {TD} at (0,133) size 37x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,132) size 54x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 27x19 - text run at (4,6) width 27: "inset" - RenderTableCell {TD} at (91,133) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 138x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 133x175 + RenderTableRow {TR} at (0,0) size 133x58 + RenderTableCell {TD} at (0,15) size 39x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,14) size 56x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (95,15) size 38x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,58) size 133x60 + RenderTableCell {TD} at (0,74) size 39x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,72) size 56x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (95,74) size 38x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 29x21 + text run at (6,4) width 29: "inset" + RenderTableRow {TR} at (0,118) size 133x57 + RenderTableCell {TD} at (0,133) size 39x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,132) size 56x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 29x19 + text run at (4,6) width 29: "inset" + RenderTableCell {TD} at (95,133) size 38x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-79-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-79-d-expected.txt index 2a8a4cbe245f..899eded627f1 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-79-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-79-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x170 - RenderTableSection {TBODY} at (0,0) size 126x170 - RenderTableRow {TR} at (0,0) size 126x55 - RenderTableCell {TD} at (0,16) size 36x23 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,14) size 54x27 [border: none] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (90,16) size 36x23 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,55) size 126x60 - RenderTableCell {TD} at (0,74) size 36x22 [border: none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,69) size 54x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 42x19 - text run at (6,6) width 42: "groove" - RenderTableCell {TD} at (90,74) size 36x22 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 29x19 - text run at (6,1) width 29: "none" - RenderTableRow {TR} at (0,115) size 126x55 - RenderTableCell {TD} at (0,131) size 36x23 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,129) size 54x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 29x19 - text run at (1,6) width 29: "none" - RenderTableCell {TD} at (90,131) size 36x23 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 132x170 + RenderTableSection {TBODY} at (0,0) size 132x170 + RenderTableRow {TR} at (0,0) size 132x55 + RenderTableCell {TD} at (0,16) size 38x23 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,14) size 56x27 [border: none] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (94,16) size 38x23 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,55) size 132x60 + RenderTableCell {TD} at (0,74) size 38x22 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,69) size 56x32 [border: (5px groove #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 44x19 + text run at (6,6) width 44: "groove" + RenderTableCell {TD} at (94,74) size 38x22 [border: none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,1) size 31x19 + text run at (6,1) width 31: "none" + RenderTableRow {TR} at (0,115) size 132x55 + RenderTableCell {TD} at (0,131) size 38x23 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,129) size 56x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,6) size 31x19 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (94,131) size 38x23 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-80-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-80-d-expected.txt index 7e392d09ea5c..52b74aa19a19 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-80-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-80-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x150 - RenderTableSection {TBODY} at (0,0) size 126x150 - RenderTableRow {TR} at (0,0) size 126x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 42x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 126x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 42x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 27x19 - text run at (1,1) width 27: "inset" - RenderTableCell {TD} at (84,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 126x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 42x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 135x150 + RenderTableSection {TBODY} at (0,0) size 135x150 + RenderTableRow {TR} at (0,0) size 135x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 45x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 135x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 45x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 29x19 + text run at (1,1) width 29: "inset" + RenderTableCell {TD} at (90,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 135x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 45x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-81-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-81-d-expected.txt index 0a8fc764a86b..6b141a24f381 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-81-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-81-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 154x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 149x175 - RenderTableRow {TR} at (0,0) size 149x58 - RenderTableCell {TD} at (0,15) size 51x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,14) size 48x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (99,15) size 50x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,58) size 149x60 - RenderTableCell {TD} at (0,74) size 51x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 41x21 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,72) size 48x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 27x19 - text run at (6,6) width 27: "inset" - RenderTableCell {TD} at (99,74) size 50x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 41x21 - text run at (6,4) width 41: "double" - RenderTableRow {TR} at (0,118) size 149x57 - RenderTableCell {TD} at (0,133) size 51x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (51,132) size 48x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 41x19 - text run at (4,6) width 41: "double" - RenderTableCell {TD} at (99,133) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 160x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 155x175 + RenderTableRow {TR} at (0,0) size 155x58 + RenderTableCell {TD} at (0,15) size 53x28 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,14) size 50x30 [border: (3px double #00FF00) (5px double #FF0000) (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (103,15) size 52x28 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,58) size 155x60 + RenderTableCell {TD} at (0,74) size 53x28 [border: (3px double #00FF00) (5px double #FF0000) (2px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 43x21 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,72) size 50x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 29x19 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (103,74) size 52x28 [border: (3px double #00FF00) (5px double #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 43x21 + text run at (6,4) width 43: "double" + RenderTableRow {TR} at (0,118) size 155x57 + RenderTableCell {TD} at (0,133) size 53x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (53,132) size 50x29 [border: (5px double #FF0000) (2px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 43x19 + text run at (4,6) width 43: "double" + RenderTableCell {TD} at (103,133) size 52x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-82-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-82-d-expected.txt index ae4319f1ec79..6bf58f29a57c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-82-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-82-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 119x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 114x175 - RenderTableRow {TR} at (0,0) size 114x58 - RenderTableCell {TD} at (0,15) size 38x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,14) size 39x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (77,15) size 37x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,58) size 114x60 - RenderTableCell {TD} at (0,74) size 38x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 28x21 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,72) size 39x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 27x19 - text run at (6,6) width 27: "inset" - RenderTableCell {TD} at (77,74) size 37x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 28x21 - text run at (6,4) width 28: "solid" - RenderTableRow {TR} at (0,118) size 114x57 - RenderTableCell {TD} at (0,133) size 38x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (38,132) size 39x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 28x19 - text run at (4,6) width 28: "solid" - RenderTableCell {TD} at (77,133) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 125x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 120x175 + RenderTableRow {TR} at (0,0) size 120x58 + RenderTableCell {TD} at (0,15) size 40x28 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,14) size 41x30 [border: (3px solid #00FF00) (5px solid #FF0000) (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (81,15) size 39x28 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,58) size 120x60 + RenderTableCell {TD} at (0,74) size 40x28 [border: (3px solid #00FF00) (5px solid #FF0000) (2px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 30x21 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,72) size 41x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 29x19 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (81,74) size 39x28 [border: (3px solid #00FF00) (5px solid #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 30x21 + text run at (6,4) width 30: "solid" + RenderTableRow {TR} at (0,118) size 120x57 + RenderTableCell {TD} at (0,133) size 40x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (40,132) size 41x29 [border: (5px solid #FF0000) (2px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 30x19 + text run at (4,6) width 30: "solid" + RenderTableCell {TD} at (81,133) size 39x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-83-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-83-d-expected.txt index 7cdcb069d2ad..d5dbccbe013e 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-83-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-83-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 160x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 155x175 - RenderTableRow {TR} at (0,0) size 155x58 - RenderTableCell {TD} at (0,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,14) size 50x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (103,15) size 52x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,58) size 155x60 - RenderTableCell {TD} at (0,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 43x21 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,72) size 50x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 27x19 - text run at (6,6) width 27: "inset" - RenderTableCell {TD} at (103,74) size 52x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 43x21 - text run at (6,4) width 43: "dashed" - RenderTableRow {TR} at (0,118) size 155x57 - RenderTableCell {TD} at (0,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (53,132) size 50x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 43x19 - text run at (4,6) width 43: "dashed" - RenderTableCell {TD} at (103,133) size 52x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px dashed #00FF00) (5px dashed #FF0000) (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px dashed #00FF00) (5px dashed #FF0000) (2px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 29x19 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px dashed #00FF00) (5px dashed #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "dashed" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px dashed #FF0000) (2px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "dashed" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-84-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-84-d-expected.txt index 4f614f65a96a..5ebfdae3b769 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-84-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-84-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" RenderTable {TABLE} at (0,36) size 148x180 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 143x175 RenderTableRow {TR} at (0,0) size 143x58 @@ -23,8 +23,8 @@ layer at (0,0) size 800x240 RenderText {#text} at (4,3) size 39x21 text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (49,72) size 46x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 27x19 - text run at (6,6) width 27: "inset" + RenderText {#text} at (6,6) size 29x19 + text run at (6,6) width 29: "inset" RenderTableCell {TD} at (95,74) size 48x28 [border: (3px dotted #00FF00) (5px dotted #FF0000)] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (6,3) size 39x21 text run at (6,4) width 39: "dotted" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-85-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-85-d-expected.txt index 7972d2b5fde4..f13c4a6e01f8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-85-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-85-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 123x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 118x175 - RenderTableRow {TR} at (0,0) size 118x58 - RenderTableCell {TD} at (0,15) size 40x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,14) size 39x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (79,15) size 39x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,58) size 118x60 - RenderTableCell {TD} at (0,74) size 40x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 30x21 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,72) size 39x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 27x19 - text run at (6,6) width 27: "inset" - RenderTableCell {TD} at (79,74) size 39x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 30x21 - text run at (6,4) width 30: "ridge" - RenderTableRow {TR} at (0,118) size 118x57 - RenderTableCell {TD} at (0,133) size 40x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (40,132) size 39x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 30x19 - text run at (4,6) width 30: "ridge" - RenderTableCell {TD} at (79,133) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 129x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 124x175 + RenderTableRow {TR} at (0,0) size 124x58 + RenderTableCell {TD} at (0,15) size 42x28 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,14) size 41x30 [border: (3px ridge #00FF00) (5px ridge #FF0000) (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (83,15) size 41x28 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,58) size 124x60 + RenderTableCell {TD} at (0,74) size 42x28 [border: (3px ridge #00FF00) (5px ridge #FF0000) (2px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 32x21 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,72) size 41x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 29x19 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (83,74) size 41x28 [border: (3px ridge #00FF00) (5px ridge #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 32x21 + text run at (6,4) width 32: "ridge" + RenderTableRow {TR} at (0,118) size 124x57 + RenderTableCell {TD} at (0,133) size 42x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (42,132) size 41x29 [border: (5px ridge #FF0000) (2px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 32x19 + text run at (4,6) width 32: "ridge" + RenderTableCell {TD} at (83,133) size 41x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-86-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-86-d-expected.txt index 8a27d5bcfbbe..67449a5111b0 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-86-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-86-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 139x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 134x175 - RenderTableRow {TR} at (0,0) size 134x58 - RenderTableCell {TD} at (0,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,14) size 43x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (89,15) size 45x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,58) size 134x60 - RenderTableCell {TD} at (0,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 36x21 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,72) size 43x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 27x19 - text run at (6,6) width 27: "inset" - RenderTableCell {TD} at (89,74) size 45x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 36x21 - text run at (6,4) width 36: "outset" - RenderTableRow {TR} at (0,118) size 134x57 - RenderTableCell {TD} at (0,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (46,132) size 43x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 36x19 - text run at (4,6) width 36: "outset" - RenderTableCell {TD} at (89,133) size 45x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 142x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 137x175 + RenderTableRow {TR} at (0,0) size 137x58 + RenderTableCell {TD} at (0,15) size 47x28 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,14) size 44x30 [border: (3px outset #00FF00) (5px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (91,15) size 46x28 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,58) size 137x60 + RenderTableCell {TD} at (0,74) size 47x28 [border: (3px outset #00FF00) (5px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 37x21 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,72) size 44x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 29x19 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (91,74) size 46x28 [border: (3px outset #00FF00) (5px outset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 37x21 + text run at (6,4) width 37: "outset" + RenderTableRow {TR} at (0,118) size 137x57 + RenderTableCell {TD} at (0,133) size 47x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (47,132) size 44x29 [border: (5px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 37x19 + text run at (4,6) width 37: "outset" + RenderTableCell {TD} at (91,133) size 46x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-87-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-87-d-expected.txt index 20e6394304be..bfdcd12b92cf 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-87-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-87-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 157x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 152x175 - RenderTableRow {TR} at (0,0) size 152x58 - RenderTableCell {TD} at (0,15) size 52x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,14) size 49x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (101,15) size 51x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,58) size 152x60 - RenderTableCell {TD} at (0,74) size 52x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 42x21 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,72) size 49x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 27x19 - text run at (6,6) width 27: "inset" - RenderTableCell {TD} at (101,74) size 51x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 42x21 - text run at (6,4) width 42: "groove" - RenderTableRow {TR} at (0,118) size 152x57 - RenderTableCell {TD} at (0,133) size 52x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (52,132) size 49x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 42x19 - text run at (4,6) width 42: "groove" - RenderTableCell {TD} at (101,133) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 163x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 158x175 + RenderTableRow {TR} at (0,0) size 158x58 + RenderTableCell {TD} at (0,15) size 54x28 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,14) size 51x30 [border: (3px groove #00FF00) (5px groove #FF0000) (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (105,15) size 53x28 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,58) size 158x60 + RenderTableCell {TD} at (0,74) size 54x28 [border: (3px groove #00FF00) (5px groove #FF0000) (2px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 44x21 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,72) size 51x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 29x19 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (105,74) size 53x28 [border: (3px groove #00FF00) (5px groove #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 44x21 + text run at (6,4) width 44: "groove" + RenderTableRow {TR} at (0,118) size 158x57 + RenderTableCell {TD} at (0,133) size 54x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (54,132) size 51x29 [border: (5px groove #FF0000) (2px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 44x19 + text run at (4,6) width 44: "groove" + RenderTableCell {TD} at (105,133) size 53x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-88-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-88-d-expected.txt index 337300ca77bb..387fb4800cb6 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-88-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-88-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x240 RenderBlock {HTML} at (0,0) size 800x240 RenderBody {BODY} at (8,16) size 784x216 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 117x180 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 112x175 - RenderTableRow {TR} at (0,0) size 112x58 - RenderTableCell {TD} at (0,15) size 37x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,14) size 39x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (76,15) size 36x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,58) size 112x60 - RenderTableCell {TD} at (0,74) size 37x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,3) size 27x21 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,72) size 39x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 27x19 - text run at (6,6) width 27: "inset" - RenderTableCell {TD} at (76,74) size 36x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,3) size 27x21 - text run at (6,4) width 27: "inset" - RenderTableRow {TR} at (0,118) size 112x57 - RenderTableCell {TD} at (0,133) size 37x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (37,132) size 39x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,6) size 27x19 - text run at (4,6) width 27: "inset" - RenderTableCell {TD} at (76,133) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 123x180 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 118x175 + RenderTableRow {TR} at (0,0) size 118x58 + RenderTableCell {TD} at (0,15) size 39x28 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,14) size 41x30 [border: (3px inset #00FF00) (5px inset #FF0000) (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (80,15) size 38x28 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,58) size 118x60 + RenderTableCell {TD} at (0,74) size 39x28 [border: (3px inset #00FF00) (5px inset #FF0000) (2px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,3) size 29x21 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,72) size 41x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 29x19 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (80,74) size 38x28 [border: (3px inset #00FF00) (5px inset #FF0000)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,3) size 29x21 + text run at (6,4) width 29: "inset" + RenderTableRow {TR} at (0,118) size 118x57 + RenderTableCell {TD} at (0,133) size 39x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (39,132) size 41x29 [border: (5px inset #FF0000) (2px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,6) size 29x19 + text run at (4,6) width 29: "inset" + RenderTableCell {TD} at (80,133) size 38x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-89-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-89-d-expected.txt index 201d662c76ce..266f3c248b25 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-89-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-89-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 111x170 - RenderTableSection {TBODY} at (0,0) size 111x170 - RenderTableRow {TR} at (0,0) size 111x55 - RenderTableCell {TD} at (0,16) size 36x23 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,14) size 39x27 [border: none] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (75,16) size 36x23 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,55) size 111x60 - RenderTableCell {TD} at (0,74) size 36x22 [border: none] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,69) size 39x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (6,6) size 27x19 - text run at (6,6) width 27: "inset" - RenderTableCell {TD} at (75,74) size 36x22 [border: none] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,1) size 29x19 - text run at (6,1) width 29: "none" - RenderTableRow {TR} at (0,115) size 111x55 - RenderTableCell {TD} at (0,131) size 36x23 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (36,129) size 39x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,6) size 29x19 - text run at (1,6) width 29: "none" - RenderTableCell {TD} at (75,131) size 36x23 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,0) size 29x21 - text run at (1,1) width 29: "none" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 117x170 + RenderTableSection {TBODY} at (0,0) size 117x170 + RenderTableRow {TR} at (0,0) size 117x55 + RenderTableCell {TD} at (0,16) size 38x23 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,14) size 41x27 [border: none] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (79,16) size 38x23 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,55) size 117x60 + RenderTableCell {TD} at (0,74) size 38x22 [border: none] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,69) size 41x32 [border: (5px inset #00FF00)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 29x19 + text run at (6,6) width 29: "inset" + RenderTableCell {TD} at (79,74) size 38x22 [border: none] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,1) size 31x19 + text run at (6,1) width 31: "none" + RenderTableRow {TR} at (0,115) size 117x55 + RenderTableCell {TD} at (0,131) size 38x23 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (38,129) size 41x27 [border: (5px none #FF0000)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,6) size 31x19 + text run at (1,6) width 31: "none" + RenderTableCell {TD} at (79,131) size 38x23 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,0) size 31x21 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-90-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-90-d-expected.txt index febd1af51054..5dc3bac557ce 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-90-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-90-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 126x150 - RenderTableSection {TBODY} at (0,0) size 126x150 - RenderTableRow {TR} at (0,0) size 126x50 - RenderTableCell {TD} at (0,14) size 42x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,14) size 42x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,14) size 42x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,50) size 126x50 - RenderTableCell {TD} at (0,64) size 42x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,64) size 42x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (84,64) size 42x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableRow {TR} at (0,100) size 126x50 - RenderTableCell {TD} at (0,114) size 42x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (42,114) size 42x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" - RenderTableCell {TD} at (84,114) size 42x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 40x19 - text run at (1,1) width 40: "hidden" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 135x150 + RenderTableSection {TBODY} at (0,0) size 135x150 + RenderTableRow {TR} at (0,0) size 135x50 + RenderTableCell {TD} at (0,14) size 45x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,14) size 45x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,14) size 45x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,50) size 135x50 + RenderTableCell {TD} at (0,64) size 45x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,64) size 45x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (90,64) size 45x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableRow {TR} at (0,100) size 135x50 + RenderTableCell {TD} at (0,114) size 45x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (45,114) size 45x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" + RenderTableCell {TD} at (90,114) size 45x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 43x19 + text run at (1,1) width 43: "hidden" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-91-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-91-d-expected.txt index 9921bc7feae4..5483ff96de85 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-91-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-91-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 149x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 144x165 - RenderTableRow {TR} at (0,0) size 144x55 - RenderTableCell {TD} at (0,14) size 48x27 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (48,14) size 48x27 [border: (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (96,14) size 48x27 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,55) size 144x55 - RenderTableCell {TD} at (0,69) size 48x27 [border: (3px double #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (48,69) size 48x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x19 - text run at (4,4) width 29: "none" - RenderTableCell {TD} at (96,69) size 48x27 [border: (3px double #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableRow {TR} at (0,110) size 144x55 - RenderTableCell {TD} at (0,124) size 48x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (48,124) size 48x27 [border: (3px double #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" - RenderTableCell {TD} at (96,124) size 48x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 41x19 - text run at (4,4) width 41: "double" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 155x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 150x165 + RenderTableRow {TR} at (0,0) size 150x55 + RenderTableCell {TD} at (0,14) size 50x27 [border: (3px double #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (50,14) size 50x27 [border: (3px double #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (100,14) size 50x27 [border: (3px double #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,55) size 150x55 + RenderTableCell {TD} at (0,69) size 50x27 [border: (3px double #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (50,69) size 50x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 31x19 + text run at (4,4) width 31: "none" + RenderTableCell {TD} at (100,69) size 50x27 [border: (3px double #00FF00)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableRow {TR} at (0,110) size 150x55 + RenderTableCell {TD} at (0,124) size 50x27 [border: (3px double #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (50,124) size 50x27 [border: (3px double #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" + RenderTableCell {TD} at (100,124) size 50x27 [border: (3px double #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 43x19 + text run at (4,4) width 43: "double" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-92-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-92-d-expected.txt index 79f2d00ef309..3ad521bc0280 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-92-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-92-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 111x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 106x165 - RenderTableRow {TR} at (0,0) size 106x55 - RenderTableCell {TD} at (0,14) size 35x27 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (35,14) size 36x27 [border: (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (71,14) size 35x27 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,55) size 106x55 - RenderTableCell {TD} at (0,69) size 35x27 [border: (3px solid #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (35,69) size 36x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x19 - text run at (4,4) width 29: "none" - RenderTableCell {TD} at (71,69) size 35x27 [border: (3px solid #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableRow {TR} at (0,110) size 106x55 - RenderTableCell {TD} at (0,124) size 35x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (35,124) size 36x27 [border: (3px solid #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" - RenderTableCell {TD} at (71,124) size 35x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 28x19 - text run at (4,4) width 28: "solid" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 117x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 112x165 + RenderTableRow {TR} at (0,0) size 112x55 + RenderTableCell {TD} at (0,14) size 37x27 [border: (3px solid #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (37,14) size 38x27 [border: (3px solid #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (75,14) size 37x27 [border: (3px solid #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,55) size 112x55 + RenderTableCell {TD} at (0,69) size 37x27 [border: (3px solid #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (37,69) size 38x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 31x19 + text run at (4,4) width 31: "none" + RenderTableCell {TD} at (75,69) size 37x27 [border: (3px solid #00FF00)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableRow {TR} at (0,110) size 112x55 + RenderTableCell {TD} at (0,124) size 37x27 [border: (3px solid #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (37,124) size 38x27 [border: (3px solid #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" + RenderTableCell {TD} at (75,124) size 37x27 [border: (3px solid #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 30x19 + text run at (4,4) width 30: "solid" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-93-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-93-d-expected.txt index 79226c1ec0e3..f7047b41ca0c 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-93-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-93-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 155x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 150x165 - RenderTableRow {TR} at (0,0) size 150x55 - RenderTableCell {TD} at (0,14) size 50x27 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (50,14) size 50x27 [border: (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (100,14) size 50x27 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,55) size 150x55 - RenderTableCell {TD} at (0,69) size 50x27 [border: (3px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (50,69) size 50x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x19 - text run at (4,4) width 29: "none" - RenderTableCell {TD} at (100,69) size 50x27 [border: (3px dashed #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableRow {TR} at (0,110) size 150x55 - RenderTableCell {TD} at (0,124) size 50x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (50,124) size 50x27 [border: (3px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" - RenderTableCell {TD} at (100,124) size 50x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 43x19 - text run at (4,4) width 43: "dashed" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 158x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 153x165 + RenderTableRow {TR} at (0,0) size 153x55 + RenderTableCell {TD} at (0,14) size 51x27 [border: (3px dashed #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (51,14) size 51x27 [border: (3px dashed #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (102,14) size 51x27 [border: (3px dashed #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,55) size 153x55 + RenderTableCell {TD} at (0,69) size 51x27 [border: (3px dashed #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (51,69) size 51x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 31x19 + text run at (4,4) width 31: "none" + RenderTableCell {TD} at (102,69) size 51x27 [border: (3px dashed #00FF00)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableRow {TR} at (0,110) size 153x55 + RenderTableCell {TD} at (0,124) size 51x27 [border: (3px dashed #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (51,124) size 51x27 [border: (3px dashed #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" + RenderTableCell {TD} at (102,124) size 51x27 [border: (3px dashed #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "dashed" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-94-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-94-d-expected.txt index 448d0844fefc..d3b0f5ed9fbd 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-94-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-94-d-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" RenderTable {TABLE} at (0,36) size 143x170 [border: (2px none #808080)] RenderTableSection {TBODY} at (2,2) size 138x165 RenderTableRow {TR} at (0,0) size 138x55 @@ -23,8 +23,8 @@ layer at (0,0) size 800x230 RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" RenderTableCell {TD} at (46,69) size 46x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x19 - text run at (4,4) width 29: "none" + RenderText {#text} at (4,4) size 31x19 + text run at (4,4) width 31: "none" RenderTableCell {TD} at (92,69) size 46x27 [border: (3px dotted #00FF00)] [r=1 c=2 rs=1 cs=1] RenderText {#text} at (4,4) size 39x19 text run at (4,4) width 39: "dotted" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-95-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-95-d-expected.txt index deffa861abae..7950a6bd8066 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-95-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-95-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 116x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 111x165 - RenderTableRow {TR} at (0,0) size 111x55 - RenderTableCell {TD} at (0,14) size 37x27 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (37,14) size 37x27 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (74,14) size 37x27 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,55) size 111x55 - RenderTableCell {TD} at (0,69) size 37x27 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (37,69) size 37x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x19 - text run at (4,4) width 29: "none" - RenderTableCell {TD} at (74,69) size 37x27 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableRow {TR} at (0,110) size 111x55 - RenderTableCell {TD} at (0,124) size 37x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (37,124) size 37x27 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" - RenderTableCell {TD} at (74,124) size 37x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 30x19 - text run at (4,4) width 30: "ridge" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 122x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 117x165 + RenderTableRow {TR} at (0,0) size 117x55 + RenderTableCell {TD} at (0,14) size 39x27 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (39,14) size 39x27 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (78,14) size 39x27 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,55) size 117x55 + RenderTableCell {TD} at (0,69) size 39x27 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (39,69) size 39x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 31x19 + text run at (4,4) width 31: "none" + RenderTableCell {TD} at (78,69) size 39x27 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableRow {TR} at (0,110) size 117x55 + RenderTableCell {TD} at (0,124) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (39,124) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" + RenderTableCell {TD} at (78,124) size 39x27 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 32x19 + text run at (4,4) width 32: "ridge" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-96-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-96-d-expected.txt index 6548b75d4220..84d2a7b7c194 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-96-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-96-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 134x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 129x165 - RenderTableRow {TR} at (0,0) size 129x55 - RenderTableCell {TD} at (0,14) size 43x27 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (43,14) size 43x27 [border: (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (86,14) size 43x27 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,55) size 129x55 - RenderTableCell {TD} at (0,69) size 43x27 [border: (3px outset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (43,69) size 43x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x19 - text run at (4,4) width 29: "none" - RenderTableCell {TD} at (86,69) size 43x27 [border: (3px outset #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableRow {TR} at (0,110) size 129x55 - RenderTableCell {TD} at (0,124) size 43x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (43,124) size 43x27 [border: (3px outset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" - RenderTableCell {TD} at (86,124) size 43x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 36x19 - text run at (4,4) width 36: "outset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 137x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 132x165 + RenderTableRow {TR} at (0,0) size 132x55 + RenderTableCell {TD} at (0,14) size 44x27 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (44,14) size 44x27 [border: (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (88,14) size 44x27 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,55) size 132x55 + RenderTableCell {TD} at (0,69) size 44x27 [border: (3px outset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (44,69) size 44x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 31x19 + text run at (4,4) width 31: "none" + RenderTableCell {TD} at (88,69) size 44x27 [border: (3px outset #00FF00)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableRow {TR} at (0,110) size 132x55 + RenderTableCell {TD} at (0,124) size 44x27 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (44,124) size 44x27 [border: (3px outset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" + RenderTableCell {TD} at (88,124) size 44x27 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 37x19 + text run at (4,4) width 37: "outset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-97-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-97-d-expected.txt index d5874b38847e..add722ecabab 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-97-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-97-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 152x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 147x165 - RenderTableRow {TR} at (0,0) size 147x55 - RenderTableCell {TD} at (0,14) size 49x27 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (49,14) size 49x27 [border: (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (98,14) size 49x27 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,55) size 147x55 - RenderTableCell {TD} at (0,69) size 49x27 [border: (3px groove #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (49,69) size 49x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x19 - text run at (4,4) width 29: "none" - RenderTableCell {TD} at (98,69) size 49x27 [border: (3px groove #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableRow {TR} at (0,110) size 147x55 - RenderTableCell {TD} at (0,124) size 49x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (49,124) size 49x27 [border: (3px groove #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" - RenderTableCell {TD} at (98,124) size 49x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 42x19 - text run at (4,4) width 42: "groove" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 158x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 153x165 + RenderTableRow {TR} at (0,0) size 153x55 + RenderTableCell {TD} at (0,14) size 51x27 [border: (3px groove #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (51,14) size 51x27 [border: (3px groove #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (102,14) size 51x27 [border: (3px groove #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,55) size 153x55 + RenderTableCell {TD} at (0,69) size 51x27 [border: (3px groove #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (51,69) size 51x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 31x19 + text run at (4,4) width 31: "none" + RenderTableCell {TD} at (102,69) size 51x27 [border: (3px groove #00FF00)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableRow {TR} at (0,110) size 153x55 + RenderTableCell {TD} at (0,124) size 51x27 [border: (3px groove #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (51,124) size 51x27 [border: (3px groove #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" + RenderTableCell {TD} at (102,124) size 51x27 [border: (3px groove #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 44x19 + text run at (4,4) width 44: "groove" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-98-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-98-d-expected.txt index ae8b6d0e2237..671c8e4aa8a8 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-98-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-98-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x230 RenderBlock {HTML} at (0,0) size 800x230 RenderBody {BODY} at (8,16) size 784x206 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 109x170 [border: (2px none #808080)] - RenderTableSection {TBODY} at (2,2) size 104x165 - RenderTableRow {TR} at (0,0) size 104x55 - RenderTableCell {TD} at (0,14) size 34x27 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (34,14) size 36x27 [border: (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (70,14) size 34x27 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,55) size 104x55 - RenderTableCell {TD} at (0,69) size 34x27 [border: (3px inset #00FF00)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (34,69) size 36x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 29x19 - text run at (4,4) width 29: "none" - RenderTableCell {TD} at (70,69) size 34x27 [border: (3px inset #00FF00)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableRow {TR} at (0,110) size 104x55 - RenderTableCell {TD} at (0,124) size 34x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (34,124) size 36x27 [border: (3px inset #00FF00)] [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" - RenderTableCell {TD} at (70,124) size 34x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (4,4) size 27x19 - text run at (4,4) width 27: "inset" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 115x170 [border: (2px none #808080)] + RenderTableSection {TBODY} at (2,2) size 110x165 + RenderTableRow {TR} at (0,0) size 110x55 + RenderTableCell {TD} at (0,14) size 36x27 [border: (3px inset #00FF00)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (36,14) size 38x27 [border: (3px inset #00FF00)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (74,14) size 36x27 [border: (3px inset #00FF00)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,55) size 110x55 + RenderTableCell {TD} at (0,69) size 36x27 [border: (3px inset #00FF00)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (36,69) size 38x27 [border: (3px none #FF0000)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 31x19 + text run at (4,4) width 31: "none" + RenderTableCell {TD} at (74,69) size 36x27 [border: (3px inset #00FF00)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableRow {TR} at (0,110) size 110x55 + RenderTableCell {TD} at (0,124) size 36x27 [border: (3px inset #00FF00)] [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (36,124) size 38x27 [border: (3px inset #00FF00)] [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" + RenderTableCell {TD} at (74,124) size 36x27 [border: (3px inset #00FF00)] [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (4,4) size 29x19 + text run at (4,4) width 29: "inset" diff --git a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-99-d-expected.txt b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-99-d-expected.txt index 909b25989902..ef247fb14601 100644 --- a/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-99-d-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/t170602-bdr-conflct-w-99-d-expected.txt @@ -4,37 +4,37 @@ layer at (0,0) size 800x210 RenderBlock {HTML} at (0,0) size 800x210 RenderBody {BODY} at (8,16) size 784x186 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "There should be no red borders on the table below" - RenderTable {TABLE} at (0,36) size 93x150 - RenderTableSection {TBODY} at (0,0) size 93x150 - RenderTableRow {TR} at (0,0) size 93x50 - RenderTableCell {TD} at (0,14) size 31x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (31,14) size 31x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (62,14) size 31x22 [r=0 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,50) size 93x50 - RenderTableCell {TD} at (0,64) size 31x22 [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (31,64) size 31x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (62,64) size 31x22 [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableRow {TR} at (0,100) size 93x50 - RenderTableCell {TD} at (0,114) size 31x22 [r=2 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (31,114) size 31x22 [r=2 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" - RenderTableCell {TD} at (62,114) size 31x22 [r=2 c=2 rs=1 cs=1] - RenderText {#text} at (1,1) size 29x19 - text run at (1,1) width 29: "none" + RenderText {#text} at (0,0) size 317x19 + text run at (0,0) width 317: "There should be no red borders on the table below" + RenderTable {TABLE} at (0,36) size 99x150 + RenderTableSection {TBODY} at (0,0) size 99x150 + RenderTableRow {TR} at (0,0) size 99x50 + RenderTableCell {TD} at (0,14) size 33x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (33,14) size 33x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (66,14) size 33x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,50) size 99x50 + RenderTableCell {TD} at (0,64) size 33x22 [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (33,64) size 33x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (66,64) size 33x22 [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableRow {TR} at (0,100) size 99x50 + RenderTableCell {TD} at (0,114) size 33x22 [r=2 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (33,114) size 33x22 [r=2 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" + RenderTableCell {TD} at (66,114) size 33x22 [r=2 c=2 rs=1 cs=1] + RenderText {#text} at (1,1) size 31x19 + text run at (1,1) width 31: "none" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-015-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-015-expected.txt index fb6802caf9d5..3f084ef97bae 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-015-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-015-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-016-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-016-expected.txt index 47859b6f48e3..4a8c12f6636a 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-016-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-016-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-023-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-023-expected.txt index a1e95b0cebe9..a289a2162fed 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-023-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-023-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x117 RenderBlock {html} at (0,0) size 800x117 RenderBody {body} at (8,16) size 784x93 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x57 RenderBlock (relative positioned) {div} at (0,36) size 784x57 layer at (8,52) size 784x57 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] - RenderTable {table} at (1,1) size 144x55 [border: (5px outset #808080)] - RenderTableSection {tbody} at (5,5) size 134x45 - RenderTableRow {tr} at (0,2) size 134x41 - RenderTableCell {td} at (2,2) size 130x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 126x36 - text run at (2,2) width 126: "Some text" -layer at (8,52) size 146x57 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 146x57 [color=#008000] - RenderTable {table} at (1,1) size 144x55 [border: (5px outset #808080)] - RenderTableSection {tbody} at (5,5) size 134x45 - RenderTableRow {tr} at (0,2) size 134x41 - RenderTableCell {td} at (2,2) size 130x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 126x36 - text run at (2,2) width 126: "Some text" + RenderTable {table} at (1,1) size 147x55 [border: (5px outset #808080)] + RenderTableSection {tbody} at (5,5) size 137x45 + RenderTableRow {tr} at (0,2) size 137x41 + RenderTableCell {td} at (2,2) size 133x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 129x36 + text run at (2,2) width 129: "Some text" +layer at (8,52) size 149x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 149x57 [color=#008000] + RenderTable {table} at (1,1) size 147x55 [border: (5px outset #808080)] + RenderTableSection {tbody} at (5,5) size 137x45 + RenderTableRow {tr} at (0,2) size 137x41 + RenderTableCell {td} at (2,2) size 133x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 129x36 + text run at (2,2) width 129: "Some text" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-024-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-024-expected.txt index a1e95b0cebe9..a289a2162fed 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-024-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-024-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x117 RenderBlock {html} at (0,0) size 800x117 RenderBody {body} at (8,16) size 784x93 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x57 RenderBlock (relative positioned) {div} at (0,36) size 784x57 layer at (8,52) size 784x57 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] - RenderTable {table} at (1,1) size 144x55 [border: (5px outset #808080)] - RenderTableSection {tbody} at (5,5) size 134x45 - RenderTableRow {tr} at (0,2) size 134x41 - RenderTableCell {td} at (2,2) size 130x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 126x36 - text run at (2,2) width 126: "Some text" -layer at (8,52) size 146x57 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 146x57 [color=#008000] - RenderTable {table} at (1,1) size 144x55 [border: (5px outset #808080)] - RenderTableSection {tbody} at (5,5) size 134x45 - RenderTableRow {tr} at (0,2) size 134x41 - RenderTableCell {td} at (2,2) size 130x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 126x36 - text run at (2,2) width 126: "Some text" + RenderTable {table} at (1,1) size 147x55 [border: (5px outset #808080)] + RenderTableSection {tbody} at (5,5) size 137x45 + RenderTableRow {tr} at (0,2) size 137x41 + RenderTableCell {td} at (2,2) size 133x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 129x36 + text run at (2,2) width 129: "Some text" +layer at (8,52) size 149x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 149x57 [color=#008000] + RenderTable {table} at (1,1) size 147x55 [border: (5px outset #808080)] + RenderTableSection {tbody} at (5,5) size 137x45 + RenderTableRow {tr} at (0,2) size 137x41 + RenderTableCell {td} at (2,2) size 133x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 129x36 + text run at (2,2) width 129: "Some text" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-035-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-035-expected.txt index dadf29d1e604..f447085eaebc 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-035-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-035-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x117 RenderBlock {html} at (0,0) size 800x117 RenderBody {body} at (8,16) size 784x93 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x57 RenderBlock (relative positioned) {div} at (0,36) size 784x57 layer at (8,52) size 784x57 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] - RenderTable {table} at (1,1) size 60x55 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 62x57 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 62x57 [color=#008000] - RenderTable {table} at (1,1) size 60x55 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 63x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x57 [color=#008000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-036-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-036-expected.txt index dadf29d1e604..f447085eaebc 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-036-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-036-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x117 RenderBlock {html} at (0,0) size 800x117 RenderBody {body} at (8,16) size 784x93 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x57 RenderBlock (relative positioned) {div} at (0,36) size 784x57 layer at (8,52) size 784x57 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] - RenderTable {table} at (1,1) size 60x55 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 62x57 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 62x57 [color=#008000] - RenderTable {table} at (1,1) size 60x55 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 63x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x57 [color=#008000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-037-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-037-expected.txt index dadf29d1e604..f447085eaebc 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-037-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-037-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x117 RenderBlock {html} at (0,0) size 800x117 RenderBody {body} at (8,16) size 784x93 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x57 RenderBlock (relative positioned) {div} at (0,36) size 784x57 layer at (8,52) size 784x57 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] - RenderTable {table} at (1,1) size 60x55 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 62x57 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 62x57 [color=#008000] - RenderTable {table} at (1,1) size 60x55 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 63x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x57 [color=#008000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-038-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-038-expected.txt index dadf29d1e604..f447085eaebc 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-038-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-038-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x117 RenderBlock {html} at (0,0) size 800x117 RenderBody {body} at (8,16) size 784x93 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x57 RenderBlock (relative positioned) {div} at (0,36) size 784x57 layer at (8,52) size 784x57 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x57 [color=#FF0000] - RenderTable {table} at (1,1) size 60x55 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 62x57 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 62x57 [color=#008000] - RenderTable {table} at (1,1) size 60x55 [border: (5px outset #808080)] - RenderTableSection (anonymous) at (5,5) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 63x57 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 63x57 [color=#008000] + RenderTable {table} at (1,1) size 61x55 [border: (5px outset #808080)] + RenderTableSection (anonymous) at (5,5) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-045-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-045-expected.txt index dba8bf3fc245..3540bf7ce1e4 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-045-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-045-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x109 RenderBlock {html} at (0,0) size 800x109 RenderBody {body} at (8,16) size 784x85 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x49 RenderBlock (relative positioned) {div} at (0,36) size 784x49 layer at (8,52) size 784x49 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 54x49 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 54x49 [color=#008000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-046-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-046-expected.txt index dba8bf3fc245..3540bf7ce1e4 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-046-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-046-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x109 RenderBlock {html} at (0,0) size 800x109 RenderBody {body} at (8,16) size 784x85 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x49 RenderBlock (relative positioned) {div} at (0,36) size 784x49 layer at (8,52) size 784x49 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 54x49 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 54x49 [color=#008000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-047-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-047-expected.txt index dba8bf3fc245..3540bf7ce1e4 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-047-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-047-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x109 RenderBlock {html} at (0,0) size 800x109 RenderBody {body} at (8,16) size 784x85 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x49 RenderBlock (relative positioned) {div} at (0,36) size 784x49 layer at (8,52) size 784x49 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 54x49 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 54x49 [color=#008000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-048-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-048-expected.txt index dba8bf3fc245..3540bf7ce1e4 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-048-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-048-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x109 RenderBlock {html} at (0,0) size 800x109 RenderBody {body} at (8,16) size 784x85 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x49 RenderBlock (relative positioned) {div} at (0,36) size 784x49 layer at (8,52) size 784x49 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 54x49 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 54x49 [color=#008000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-049-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-049-expected.txt index dba8bf3fc245..3540bf7ce1e4 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-049-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-049-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x109 RenderBlock {html} at (0,0) size 800x109 RenderBody {body} at (8,16) size 784x85 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x49 RenderBlock (relative positioned) {div} at (0,36) size 784x49 layer at (8,52) size 784x49 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 54x49 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 54x49 [color=#008000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-050-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-050-expected.txt index dba8bf3fc245..3540bf7ce1e4 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-050-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-050-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x109 RenderBlock {html} at (0,0) size 800x109 RenderBody {body} at (8,16) size 784x85 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x49 RenderBlock (relative positioned) {div} at (0,36) size 784x49 layer at (8,52) size 784x49 RenderBlock (relative positioned) zI: 1 {div} at (0,0) size 784x49 [color=#FF0000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" -layer at (8,52) size 54x49 - RenderBlock (positioned) zI: 2 {div} at (0,0) size 54x49 [color=#008000] - RenderTable {table} at (1,1) size 52x47 [border: (1px outset #808080)] - RenderTableSection {tbody} at (1,1) size 50x45 - RenderTableRow {tr} at (0,2) size 50x41 - RenderTableCell {td} at (2,2) size 46x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 42x36 - text run at (2,2) width 42: "TD" + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" +layer at (8,52) size 55x49 + RenderBlock (positioned) zI: 2 {div} at (0,0) size 55x49 [color=#008000] + RenderTable {table} at (1,1) size 53x47 [border: (1px outset #808080)] + RenderTableSection {tbody} at (1,1) size 51x45 + RenderTableRow {tr} at (0,2) size 51x41 + RenderTableCell {td} at (2,2) size 47x41 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 43x36 + text run at (2,2) width 43: "TD" diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-055-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-055-expected.txt index 64988918aa8f..525c4993c902 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-055-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-055-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x312 RenderBlock {html} at (0,0) size 800x312 RenderBody {body} at (8,16) size 784x288 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x252 RenderBlock (relative positioned) {div} at (0,36) size 784x252 layer at (8,52) size 784x252 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-056-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-056-expected.txt index 64988918aa8f..525c4993c902 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-056-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-056-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x312 RenderBlock {html} at (0,0) size 800x312 RenderBody {body} at (8,16) size 784x288 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x252 RenderBlock (relative positioned) {div} at (0,36) size 784x252 layer at (8,52) size 784x252 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-115-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-115-expected.txt index cdea7f8b775a..0ff754e5438d 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-115-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-115-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-116-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-116-expected.txt index 308495ce75c7..b4bd1530fda0 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-116-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-116-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-117-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-117-expected.txt index 2f322cc2136e..1164e1145263 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-117-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-117-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-118-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-118-expected.txt index 9e02ba0e5ec2..a6e69e3e8873 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-118-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-118-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-119-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-119-expected.txt index c0ae587d3a0e..94b57c1bbc09 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-119-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-119-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-120-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-120-expected.txt index a3f0afe1f170..53c4b5a84052 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-120-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-120-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-121-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-121-expected.txt index cdea7f8b775a..0ff754e5438d 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-121-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-121-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-122-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-122-expected.txt index 308495ce75c7..b4bd1530fda0 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-122-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-122-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-177-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-177-expected.txt index fe8e013135d2..f79f6bd170da 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-177-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-177-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-178-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-178-expected.txt index c286004c8938..215a1dc4becc 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-178-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-178-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-179-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-179-expected.txt index fe8e013135d2..f79f6bd170da 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-179-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-179-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-180-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-180-expected.txt index c286004c8938..215a1dc4becc 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-180-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-180-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-189-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-189-expected.txt index 2228bd517163..1f6fc9472a33 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-189-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-189-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-190-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-190-expected.txt index 8f46fc2ae0a3..1501f631af01 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-190-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-190-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-191-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-191-expected.txt index 2228bd517163..1f6fc9472a33 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-191-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-191-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-192-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-192-expected.txt index 8f46fc2ae0a3..1501f631af01 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-192-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-192-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-193-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-193-expected.txt index 2228bd517163..1f6fc9472a33 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-193-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-193-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-194-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-194-expected.txt index 8f46fc2ae0a3..1501f631af01 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-194-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-194-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-195-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-195-expected.txt index 2228bd517163..1f6fc9472a33 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-195-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-195-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-196-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-196-expected.txt index 8f46fc2ae0a3..1501f631af01 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-196-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-196-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-205-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-205-expected.txt index db4d10777a6c..94acc7dd712b 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-205-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-205-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-206-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-206-expected.txt index a0bf5cf1bdbd..9df15028a05f 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-206-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-206-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x99 RenderBlock {html} at (0,0) size 800x99 RenderBody {body} at (8,16) size 784x75 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x39 RenderBlock (relative positioned) {div} at (0,36) size 784x39 layer at (8,52) size 784x39 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-207-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-207-expected.txt index b8b525e7df5e..ab76748ec3a9 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-207-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-207-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x91 RenderBlock {html} at (0,0) size 800x91 RenderBody {body} at (8,16) size 784x67 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x31 RenderBlock (relative positioned) {div} at (0,36) size 784x31 layer at (8,52) size 784x31 diff --git a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-208-expected.txt b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-208-expected.txt index 3b52c3549f76..dba39aecd8e6 100644 --- a/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-208-expected.txt +++ b/LayoutTests/platform/wincairo/css2.1/tables/table-anonymous-objects-208-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x91 RenderBlock {html} at (0,0) size 800x91 RenderBody {body} at (8,16) size 784x67 RenderBlock {p} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 361x19 - text run at (0,0) width 361: "There should be no red below, except for antialiasing issues." + RenderText {#text} at (0,0) size 379x19 + text run at (0,0) width 379: "There should be no red below, except for antialiasing issues." layer at (8,52) size 784x31 RenderBlock (relative positioned) {div} at (0,36) size 784x31 layer at (8,52) size 784x31 diff --git a/LayoutTests/platform/wincairo/css3/flexbox/flexbox-baseline-expected.txt b/LayoutTests/platform/wincairo/css3/flexbox/flexbox-baseline-expected.txt index 2273f95dc176..3f4af6ce3f83 100644 --- a/LayoutTests/platform/wincairo/css3/flexbox/flexbox-baseline-expected.txt +++ b/LayoutTests/platform/wincairo/css3/flexbox/flexbox-baseline-expected.txt @@ -5,224 +5,224 @@ layer at (0,0) size 800x504 layer at (0,0) size 800x504 RenderBody {BODY} at (0,0) size 800x504 RenderBlock {DIV} at (0,0) size 800x55 - RenderText {#text} at (0,20) size 69x19 - text run at (0,20) width 69: "before text " - RenderFlexibleBox {DIV} at (69,5) size 122x50 [bgcolor=#D3D3D3] - RenderBlock {DIV} at (0,30) size 37x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "below" - RenderBlock {DIV} at (37,15) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderBlock {DIV} at (85,0) size 37x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "above" - RenderText {#text} at (191,20) size 57x19 - text run at (191,20) width 57: " after text" + RenderText {#text} at (0,20) size 71x19 + text run at (0,20) width 71: "before text " + RenderFlexibleBox {DIV} at (71,5) size 128x50 [bgcolor=#D3D3D3] + RenderBlock {DIV} at (0,30) size 39x20 + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "below" + RenderBlock {DIV} at (39,15) size 51x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderBlock {DIV} at (90,0) size 38x20 + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "above" + RenderText {#text} at (199,20) size 59x19 + text run at (199,20) width 59: " after text" RenderBlock {DIV} at (0,55) size 800x45 - RenderText {#text} at (0,25) size 69x19 - text run at (0,25) width 69: "before text " - RenderFlexibleBox {DIV} at (69,5) size 85x40 [bgcolor=#D3D3D3] - RenderBlock {DIV} at (0,20) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderBlock {DIV} at (48,0) size 0x0 - RenderBlock {DIV} at (48,0) size 37x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "above" - RenderText {#text} at (154,25) size 57x19 - text run at (154,25) width 57: " after text" + RenderText {#text} at (0,25) size 71x19 + text run at (0,25) width 71: "before text " + RenderFlexibleBox {DIV} at (71,5) size 89x40 [bgcolor=#D3D3D3] + RenderBlock {DIV} at (0,20) size 51x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderBlock {DIV} at (51,0) size 0x0 + RenderBlock {DIV} at (51,0) size 38x20 + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "above" + RenderText {#text} at (160,25) size 59x19 + text run at (160,25) width 59: " after text" RenderBlock {DIV} at (0,100) size 800x72 - RenderText {#text} at (0,30) size 69x19 - text run at (0,30) width 69: "before text " - RenderFlexibleBox {DIV} at (69,5) size 151x67 [bgcolor=#D3D3D3] + RenderText {#text} at (0,30) size 71x19 + text run at (0,30) width 71: "before text " + RenderFlexibleBox {DIV} at (71,5) size 152x67 [bgcolor=#D3D3D3] RenderBlock {H2} at (0,19) size 114x28 RenderText {#text} at (0,0) size 114x26 text run at (0,0) width 114: "h2 baseline" - RenderBlock {DIV} at (114,0) size 37x67 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "above" - RenderText {#text} at (220,30) size 57x19 - text run at (220,30) width 57: " after text" + RenderBlock {DIV} at (114,0) size 38x67 + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "above" + RenderText {#text} at (223,30) size 59x19 + text run at (223,30) width 59: " after text" RenderBlock {DIV} at (0,172) size 800x72 - RenderText {#text} at (0,5) size 69x19 - text run at (0,5) width 69: "before text " - RenderFlexibleBox {DIV} at (69,5) size 139x67 [bgcolor=#D3D3D3] - RenderBlock {DIV} at (0,0) size 48x67 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderBlock {H2} at (48,19) size 91x28 + RenderText {#text} at (0,5) size 71x19 + text run at (0,5) width 71: "before text " + RenderFlexibleBox {DIV} at (71,5) size 142x67 [bgcolor=#D3D3D3] + RenderBlock {DIV} at (0,0) size 51x67 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderBlock {H2} at (51,19) size 91x28 RenderText {#text} at (0,0) size 91x26 text run at (0,0) width 91: "h2 below" - RenderText {#text} at (208,5) size 57x19 - text run at (208,5) width 57: " after text" + RenderText {#text} at (213,5) size 59x19 + text run at (213,5) width 59: " after text" RenderBlock {DIV} at (0,244) size 800x45 - RenderText {#text} at (0,11) size 169x19 - text run at (0,11) width 169: "should align with the middle " - RenderFlexibleBox {DIV} at (169,5) size 40x40 [bgcolor=#D3D3D3] + RenderText {#text} at (0,11) size 183x19 + text run at (0,11) width 183: "should align with the middle " + RenderFlexibleBox {DIV} at (183,5) size 40x40 [bgcolor=#D3D3D3] RenderBlock {DIV} at (0,0) size 40x21 [border: none (1px solid #000000) none] - RenderText {#text} at (209,11) size 116x19 - text run at (209,11) width 116: " of the grey flexbox" + RenderText {#text} at (223,11) size 124x19 + text run at (223,11) width 124: " of the grey flexbox" RenderBlock {DIV} at (0,289) size 800x40 - RenderText {#text} at (0,20) size 172x19 - text run at (0,20) width 172: "should align with the bottom " - RenderFlexibleBox {DIV} at (172,5) size 30x30 [bgcolor=#D3D3D3] - RenderText {#text} at (202,20) size 116x19 - text run at (202,20) width 116: " of the grey flexbox" + RenderText {#text} at (0,20) size 184x19 + text run at (0,20) width 184: "should align with the bottom " + RenderFlexibleBox {DIV} at (184,5) size 30x30 [bgcolor=#D3D3D3] + RenderText {#text} at (214,20) size 124x19 + text run at (214,20) width 124: " of the grey flexbox" RenderBlock {DIV} at (0,329) size 800x45 - RenderText {#text} at (0,5) size 69x19 - text run at (0,5) width 69: "before text " - RenderFlexibleBox {DIV} at (69,5) size 48x40 [bgcolor=#D3D3D3] - RenderBlock {DIV} at (0,0) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderBlock {DIV} at (0,20) size 48x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "below" - RenderText {#text} at (117,5) size 57x19 - text run at (117,5) width 57: " after text" + RenderText {#text} at (0,5) size 71x19 + text run at (0,5) width 71: "before text " + RenderFlexibleBox {DIV} at (71,5) size 51x40 [bgcolor=#D3D3D3] + RenderBlock {DIV} at (0,0) size 51x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderBlock {DIV} at (0,20) size 51x20 + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "below" + RenderText {#text} at (122,5) size 59x19 + text run at (122,5) width 59: " after text" RenderBlock {DIV} at (0,374) size 800x45 - RenderText {#text} at (0,25) size 69x19 - text run at (0,25) width 69: "before text " - RenderFlexibleBox {DIV} at (69,5) size 48x40 [bgcolor=#D3D3D3] - RenderBlock {DIV} at (0,20) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderBlock {DIV} at (0,0) size 48x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "above" - RenderText {#text} at (117,25) size 57x19 - text run at (117,25) width 57: " after text" + RenderText {#text} at (0,25) size 71x19 + text run at (0,25) width 71: "before text " + RenderFlexibleBox {DIV} at (71,5) size 51x40 [bgcolor=#D3D3D3] + RenderBlock {DIV} at (0,20) size 51x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderBlock {DIV} at (0,0) size 51x20 + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "above" + RenderText {#text} at (122,25) size 59x19 + text run at (122,25) width 59: " after text" RenderBlock {DIV} at (0,419) size 800x45 - RenderText {#text} at (0,10) size 169x19 - text run at (0,10) width 169: "should align with the middle " - RenderFlexibleBox {DIV} at (169,5) size 40x40 [bgcolor=#D3D3D3] + RenderText {#text} at (0,10) size 183x19 + text run at (0,10) width 183: "should align with the middle " + RenderFlexibleBox {DIV} at (183,5) size 40x40 [bgcolor=#D3D3D3] RenderBlock {DIV} at (0,0) size 40x21 [border: none (1px solid #000000) none] RenderBlock {DIV} at (0,20) size 40x20 - RenderText {#text} at (209,10) size 116x19 - text run at (209,10) width 116: " of the grey flexbox" + RenderText {#text} at (223,10) size 124x19 + text run at (223,10) width 124: " of the grey flexbox" RenderBlock {DIV} at (0,464) size 800x40 - RenderText {#text} at (0,20) size 172x19 - text run at (0,20) width 172: "should align with the bottom " - RenderFlexibleBox {DIV} at (172,5) size 30x30 [bgcolor=#D3D3D3] - RenderText {#text} at (202,20) size 116x19 - text run at (202,20) width 116: " of the grey flexbox" + RenderText {#text} at (0,20) size 184x19 + text run at (0,20) width 184: "should align with the bottom " + RenderFlexibleBox {DIV} at (184,5) size 30x30 [bgcolor=#D3D3D3] + RenderText {#text} at (214,20) size 124x19 + text run at (214,20) width 124: " of the grey flexbox" layer at (400,0) size 360x424 RenderBlock (positioned) {DIV} at (400,0) size 360x424 RenderBlock {DIV} at (0,0) size 360x55 - RenderText {#text} at (0,35) size 69x19 - text run at (0,35) width 69: "before text " - RenderFlexibleBox {DIV} at (69,5) size 48x50 [bgcolor=#D3D3D3] - RenderBlock {DIV} at (0,30) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderText {#text} at (117,35) size 57x19 - text run at (117,35) width 57: " after text" + RenderText {#text} at (0,35) size 71x19 + text run at (0,35) width 71: "before text " + RenderFlexibleBox {DIV} at (71,5) size 51x50 [bgcolor=#D3D3D3] + RenderBlock {DIV} at (0,30) size 51x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderText {#text} at (122,35) size 59x19 + text run at (122,35) width 59: " after text" RenderBlock {DIV} at (0,55) size 360x45 - RenderText {#text} at (0,5) size 69x19 - text run at (0,5) width 69: "before text " - RenderFlexibleBox {DIV} at (69,5) size 85x40 [bgcolor=#D3D3D3] - RenderBlock {DIV} at (0,0) size 48x40 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderBlock {DIV} at (48,20) size 37x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "below" - RenderText {#text} at (154,5) size 57x19 - text run at (154,5) width 57: " after text" + RenderText {#text} at (0,5) size 71x19 + text run at (0,5) width 71: "before text " + RenderFlexibleBox {DIV} at (71,5) size 90x40 [bgcolor=#D3D3D3] + RenderBlock {DIV} at (0,0) size 51x40 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderBlock {DIV} at (51,20) size 39x20 + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "below" + RenderText {#text} at (161,5) size 59x19 + text run at (161,5) width 59: " after text" RenderBlock {DIV} at (0,100) size 360x45 - RenderText {#text} at (0,15) size 69x19 - text run at (0,15) width 69: "before text " - RenderBlock {DIV} at (69,0) size 153x45 - RenderFlexibleBox {DIV} at (0,5) size 122x40 [bgcolor=#D3D3D3] - RenderBlock {DIV} at (0,0) size 37x40 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "above" - RenderBlock {DIV} at (37,10) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderBlock {DIV} at (85,0) size 37x40 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "above" - RenderText {#text} at (122,15) size 31x19 - text run at (122,15) width 31: " after" - RenderText {#text} at (222,15) size 26x19 - text run at (222,15) width 26: " text" + RenderText {#text} at (0,15) size 71x19 + text run at (0,15) width 71: "before text " + RenderBlock {DIV} at (71,0) size 159x45 + RenderFlexibleBox {DIV} at (0,5) size 127x40 [bgcolor=#D3D3D3] + RenderBlock {DIV} at (0,0) size 38x40 + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "above" + RenderBlock {DIV} at (38,10) size 51x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderBlock {DIV} at (89,0) size 38x40 + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "above" + RenderText {#text} at (127,15) size 32x19 + text run at (127,15) width 32: " after" + RenderText {#text} at (230,15) size 27x19 + text run at (230,15) width 27: " text" RenderBlock {DIV} at (0,145) size 360x40 - RenderText {#text} at (0,10) size 69x19 - text run at (0,10) width 69: "before text " - RenderBlock {DIV} at (69,0) size 48x40 - RenderFlexibleBox {DIV} at (0,10) size 48x30 [bgcolor=#808080] - RenderBlock (anonymous) at (0,0) size 48x30 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderText {#text} at (117,10) size 57x19 - text run at (117,10) width 57: " after text" - RenderTable {TABLE} at (0,190) size 229x76 [bgcolor=#D3D3D3] - RenderTableSection {TBODY} at (0,0) size 229x76 - RenderTableRow {TR} at (0,2) size 229x72 - RenderTableCell {TD} at (2,52) size 45x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 43x19 - text run at (1,1) width 43: "bottom" - RenderTableCell {TD} at (49,32) size 50x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 48x19 - text run at (1,1) width 48: "baseline" - RenderTableCell {TD} at (101,2) size 22x22 [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (0,10) size 71x19 + text run at (0,10) width 71: "before text " + RenderBlock {DIV} at (71,0) size 51x40 + RenderFlexibleBox {DIV} at (0,10) size 51x30 [bgcolor=#808080] + RenderBlock (anonymous) at (0,0) size 51x30 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderText {#text} at (122,10) size 59x19 + text run at (122,10) width 59: " after text" + RenderTable {TABLE} at (0,190) size 239x76 [bgcolor=#D3D3D3] + RenderTableSection {TBODY} at (0,0) size 239x76 + RenderTableRow {TR} at (0,2) size 239x72 + RenderTableCell {TD} at (2,52) size 46x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 44x19 + text run at (1,1) width 44: "bottom" + RenderTableCell {TD} at (50,32) size 53x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 51x19 + text run at (1,1) width 51: "baseline" + RenderTableCell {TD} at (105,2) size 22x22 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "top" - RenderTableCell {TD} at (125,22) size 50x52 [r=0 c=3 rs=1 cs=1] - RenderFlexibleBox {DIV} at (1,11) size 48x40 [bgcolor=#808080] - RenderBlock {DIV} at (0,0) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderBlock {DIV} at (0,20) size 48x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "below" - RenderTableCell {TD} at (177,2) size 50x52 [r=0 c=4 rs=1 cs=1] - RenderFlexibleBox {DIV} at (1,11) size 48x40 [bgcolor=#808080] - RenderBlock {DIV} at (0,20) size 48x20 - RenderText {#text} at (0,0) size 48x19 - text run at (0,0) width 48: "baseline" - RenderBlock {DIV} at (0,0) size 48x20 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "above" - RenderTable {TABLE} at (0,271) size 280x83 [bgcolor=#D3D3D3] - RenderTableSection {TBODY} at (0,0) size 280x83 - RenderTableRow {TR} at (0,2) size 280x79 - RenderTableCell {TD} at (2,58) size 45x23 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,0) size 43x21 - text run at (1,1) width 43: "bottom" - RenderTableCell {TD} at (49,37) size 50x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 48x19 - text run at (1,1) width 48: "baseline" - RenderTableCell {TD} at (101,2) size 22x22 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (129,22) size 53x52 [r=0 c=3 rs=1 cs=1] + RenderFlexibleBox {DIV} at (1,11) size 51x40 [bgcolor=#808080] + RenderBlock {DIV} at (0,0) size 51x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderBlock {DIV} at (0,20) size 51x20 + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "below" + RenderTableCell {TD} at (184,2) size 53x52 [r=0 c=4 rs=1 cs=1] + RenderFlexibleBox {DIV} at (1,11) size 51x40 [bgcolor=#808080] + RenderBlock {DIV} at (0,20) size 51x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "baseline" + RenderBlock {DIV} at (0,0) size 51x20 + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "above" + RenderTable {TABLE} at (0,271) size 285x83 [bgcolor=#D3D3D3] + RenderTableSection {TBODY} at (0,0) size 285x83 + RenderTableRow {TR} at (0,2) size 285x79 + RenderTableCell {TD} at (2,58) size 46x23 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,0) size 44x21 + text run at (1,1) width 44: "bottom" + RenderTableCell {TD} at (50,37) size 53x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 51x19 + text run at (1,1) width 51: "baseline" + RenderTableCell {TD} at (105,2) size 22x22 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "top" - RenderTableCell {TD} at (125,2) size 153x79 [r=0 c=3 rs=1 cs=1] - RenderFlexibleBox {DIV} at (1,11) size 151x67 [bgcolor=#808080] + RenderTableCell {TD} at (129,2) size 154x79 [r=0 c=3 rs=1 cs=1] + RenderFlexibleBox {DIV} at (1,11) size 152x67 [bgcolor=#808080] RenderBlock {H2} at (0,19) size 114x28 RenderText {#text} at (0,0) size 114x26 text run at (0,0) width 114: "h2 baseline" - RenderBlock {DIV} at (114,0) size 37x67 - RenderText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "above" + RenderBlock {DIV} at (114,0) size 38x67 + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "above" RenderBlock {DIV} at (0,353) size 360x71 - RenderText {#text} at (0,20) size 69x19 - text run at (0,20) width 69: "before text " - RenderFlexibleBox {DIV} at (69,5) size 167x65 [bgcolor=#D3D3D3] - RenderText {#text} at (236,20) size 57x19 - text run at (236,20) width 57: " after text" -layer at (469,359) size 167x65 clip at (469,359) size 152x65 scrollY 10 scrollHeight 75 - RenderBlock {DIV} at (0,0) size 167x65 - RenderText {#text} at (0,15) size 147x19 - text run at (0,15) width 147: "The baseline is based on" - RenderBR {BR} at (147,15) size 0x19 - RenderText {#text} at (0,35) size 152x19 - text run at (0,35) width 152: "the non-scrolled position;" - RenderBR {BR} at (152,35) size 0x19 - RenderText {#text} at (0,55) size 104x19 - text run at (0,55) width 104: "this won't line up." -layer at (469,5) size 50x20 - RenderBlock (positioned) {DIV} at (69,5) size 50x20 - RenderText {#text} at (0,0) size 50x19 - text run at (0,0) width 50: "absolute" + RenderText {#text} at (0,20) size 71x19 + text run at (0,20) width 71: "before text " + RenderFlexibleBox {DIV} at (71,5) size 174x65 [bgcolor=#D3D3D3] + RenderText {#text} at (245,20) size 59x19 + text run at (245,20) width 59: " after text" +layer at (471,359) size 174x65 clip at (471,359) size 159x65 scrollY 10 scrollHeight 75 + RenderBlock {DIV} at (0,0) size 174x65 + RenderText {#text} at (0,15) size 154x19 + text run at (0,15) width 154: "The baseline is based on" + RenderBR {BR} at (154,15) size 0x19 + RenderText {#text} at (0,35) size 159x19 + text run at (0,35) width 159: "the non-scrolled position;" + RenderBR {BR} at (159,35) size 0x19 + RenderText {#text} at (0,55) size 112x19 + text run at (0,55) width 112: "this won't line up." +layer at (471,5) size 52x20 + RenderBlock (positioned) {DIV} at (71,5) size 52x20 + RenderText {#text} at (0,0) size 52x19 + text run at (0,0) width 52: "absolute" diff --git a/LayoutTests/platform/wincairo/css3/unicode-bidi-isolate-basic-expected.txt b/LayoutTests/platform/wincairo/css3/unicode-bidi-isolate-basic-expected.txt index e3af73546118..165058043e01 100644 --- a/LayoutTests/platform/wincairo/css3/unicode-bidi-isolate-basic-expected.txt +++ b/LayoutTests/platform/wincairo/css3/unicode-bidi-isolate-basic-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x76 RenderBlock {HTML} at (0,0) size 800x76 RenderBody {BODY} at (8,8) size 784x60 RenderBlock {DIV} at (0,0) size 784x60 - RenderText {#text} at (0,0) size 783x59 - text run at (0,0) width 669: "This table shows unicode-bidi: isolate behavior (in red) with display: inline-block behavior overlapping in green. " - text run at (669,0) width 112: "You should see no" - text run at (0,20) width 92: "red in this test! " - text run at (92,20) width 691: "Behavior between these two methods should be identical for non-wrapping strings, assuming unicode-bidi: isolate is" - text run at (0,40) width 231: "implemented and functioning correctly." + RenderText {#text} at (0,0) size 784x59 + text run at (0,0) width 711: "This table shows unicode-bidi: isolate behavior (in red) with display: inline-block behavior overlapping in green. " + text run at (711,0) width 72: "You should" + text run at (0,20) width 140: "see no red in this test! " + text run at (140,20) width 644: "Behavior between these two methods should be identical for non-wrapping strings, assuming unicode-" + text run at (0,40) width 336: "bidi: isolate is implemented and functioning correctly." layer at (8,68) size 25x400 RenderBlock (positioned) {DIV} at (0,0) size 25x400 [color=#FF0000] RenderMultiColumnSet at (0,0) size 25x400 diff --git a/LayoutTests/platform/wincairo/editing/caret/caret-color-expected.txt b/LayoutTests/platform/wincairo/editing/caret/caret-color-expected.txt index ce13116e7d7c..3946fbfcd047 100644 --- a/LayoutTests/platform/wincairo/editing/caret/caret-color-expected.txt +++ b/LayoutTests/platform/wincairo/editing/caret/caret-color-expected.txt @@ -9,12 +9,12 @@ layer at (0,0) size 800x100 RenderBlock {HTML} at (0,0) size 800x100 RenderBody {BODY} at (8,16) size 784x76 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 703x39 - text run at (0,0) width 703: "This tests to make sure that the caret is visible in the black background by getting the caret color from the color of the" - text run at (0,20) width 629: "element(span) containing the text, not the root editable element(div) that has the contentEditable attribute." + RenderText {#text} at (0,0) size 735x39 + text run at (0,0) width 735: "This tests to make sure that the caret is visible in the black background by getting the caret color from the color of the" + text run at (0,20) width 660: "element(span) containing the text, not the root editable element(div) that has the contentEditable attribute." RenderBlock {DIV} at (0,56) size 784x20 [bgcolor=#000000] - RenderInline {SPAN} at (0,0) size 117x19 [color=#FFFFFF] - RenderText {#text} at (0,0) size 117x19 - text run at (0,0) width 117: "Where is my caret?" + RenderInline {SPAN} at (0,0) size 121x19 [color=#FFFFFF] + RenderText {#text} at (0,0) size 121x19 + text run at (0,0) width 121: "Where is my caret?" RenderText {#text} at (0,0) size 0x0 caret: position 17 of child 0 {#text} of child 1 {SPAN} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/4922367-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/4922367-expected.txt index 0ff107928e11..38e55605d379 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/4922367-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/4922367-expected.txt @@ -4,10 +4,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 759x39 - text run at (0,0) width 369: "This tests selecting and deleting the paragraph before a table. " - text run at (369,0) width 390: "You should see only a table in the editable region below, with the" - text run at (0,20) width 113: "caret just before it." + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 386: "This tests selecting and deleting the paragraph before a table. " + text run at (386,0) width 387: "You should see only a table in the editable region below, with" + text run at (0,20) width 139: "the caret just before it." RenderBlock {DIV} at (0,56) size 784x30 RenderBlock {DIV} at (0,0) size 784x30 RenderTable {TABLE} at (0,0) size 32x30 [border: (1px solid #BBBBBB)] diff --git a/LayoutTests/platform/wincairo/editing/deleting/5099303-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/5099303-expected.txt index 86c1487f53fc..77ac86bd876c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/5099303-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/5099303-expected.txt @@ -4,16 +4,16 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 721x19 - text run at (0,0) width 721: "This tests for a bug where deleting from the start of a paragraph after a table would leave the caret in the wrong position." + RenderText {#text} at (0,0) size 756x19 + text run at (0,0) width 756: "This tests for a bug where deleting from the start of a paragraph after a table would leave the caret in the wrong position." RenderBlock {DIV} at (0,36) size 784x50 - RenderTable {TABLE} at (0,0) size 335x30 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 333x28 - RenderTableRow {TR} at (0,2) size 333x24 - RenderTableCell {TD} at (2,2) size 323x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 319x19 - text run at (2,2) width 319: "The caret should be between these two parenthesis: (" - RenderTableCell {TD} at (327,12) size 4x4 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderTable {TABLE} at (0,0) size 348x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 346x28 + RenderTableRow {TR} at (0,2) size 346x24 + RenderTableCell {TD} at (2,2) size 336x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 332x19 + text run at (2,2) width 332: "The caret should be between these two parenthesis: (" + RenderTableCell {TD} at (340,12) size 4x4 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] RenderBlock {DIV} at (0,30) size 784x20 RenderText {#text} at (0,0) size 9x19 text run at (0,0) width 9: ")." diff --git a/LayoutTests/platform/wincairo/editing/deleting/5126166-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/5126166-expected.txt index 1f0319f68f5c..17ba0c1edcac 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/5126166-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/5126166-expected.txt @@ -4,10 +4,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 783x39 - text run at (0,0) width 393: "This tests deleting a selection that ends inside an empty table cell. " - text run at (393,0) width 390: "No merging should happen, only editable selected content should" - text run at (0,20) width 76: "be removed." + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 414: "This tests deleting a selection that ends inside an empty table cell. " + text run at (414,0) width 365: "No merging should happen, only editable selected content" + text run at (0,20) width 124: "should be removed." RenderBlock {DIV} at (0,56) size 784x60 RenderTable {TABLE} at (0,0) size 16x30 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 14x28 @@ -15,11 +15,11 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (2,2) size 4x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderTableCell {TD} at (8,2) size 4x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] RenderBR {BR} at (2,2) size 0x19 - RenderTable {TABLE} at (0,30) size 334x30 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 332x28 - RenderTableRow {TR} at (0,2) size 332x24 + RenderTable {TABLE} at (0,30) size 351x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 349x28 + RenderTableRow {TR} at (0,2) size 349x24 RenderTableCell {TD} at (2,2) size 4x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderTableCell {TD} at (8,2) size 322x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (2,2) size 318x19 - text run at (2,2) width 318: "There should be one empty cell to the left of this one." + RenderTableCell {TD} at (8,2) size 339x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (2,2) size 335x19 + text run at (2,2) width 335: "There should be one empty cell to the left of this one." caret: position 0 of child 0 {BR} of child 3 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/5144139-2-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/5144139-2-expected.txt index 33a7cc68c39b..9318f6d41027 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/5144139-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/5144139-2-expected.txt @@ -4,22 +4,22 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 758x39 - text run at (0,0) width 758: "This tests to see that deleting a selection that starts just before a table and ends inside the table does not insert a placeholder br" - text run at (0,20) width 87: "unnecessarily. " - text run at (87,20) width 245: "You should see two ToDos, one empty. " - text run at (332,20) width 260: "The caret should be just before the second." + RenderText {#text} at (0,0) size 769x39 + text run at (0,0) width 769: "This tests to see that deleting a selection that starts just before a table and ends inside the table does not insert a placeholder" + text run at (0,20) width 109: "br unnecessarily. " + text run at (109,20) width 252: "You should see two ToDos, one empty. " + text run at (361,20) width 269: "The caret should be just before the second." RenderBlock {DIV} at (0,56) size 784x56 - RenderTable {TABLE} at (0,0) size 126x28 - RenderTableSection {TBODY} at (0,0) size 126x28 - RenderTableRow {TR} at (0,2) size 126x24 + RenderTable {TABLE} at (0,0) size 129x28 + RenderTableSection {TBODY} at (0,0) size 129x28 + RenderTableRow {TR} at (0,2) size 129x24 RenderTableCell {TD} at (2,3) size 18x22 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 16x19 text run at (1,1) width 16: "\x{21D2}" - RenderTableCell {TD} at (22,3) size 90x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 88x19 - text run at (1,1) width 88: "ToDo Content" - RenderTableCell {TD} at (114,2) size 10x24 [r=0 c=2 rs=1 cs=1] + RenderTableCell {TD} at (22,3) size 93x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 91x19 + text run at (1,1) width 91: "ToDo Content" + RenderTableCell {TD} at (117,2) size 10x24 [r=0 c=2 rs=1 cs=1] RenderText {#text} at (1,3) size 8x19 text run at (1,3) width 8: "\x{21E3}" RenderTable {TABLE} at (0,28) size 38x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/5206311-1-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/5206311-1-expected.txt index 9d81dd9bca9e..a2ebde7193ce 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/5206311-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/5206311-1-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 337x19 - text run at (0,0) width 201: "This empties a row (the second). " - text run at (201,0) width 136: "It should be removed. " - RenderInline {B} at (0,0) size 766x39 - RenderText {#text} at (337,0) size 766x39 - text run at (337,0) width 429: "This demonstrates a bug: the two cells that contained the ends of" - text run at (0,20) width 622: "the selection aren't given a placeholder and so appear differently than the other emptied cells." + RenderText {#text} at (0,0) size 350x19 + text run at (0,0) width 209: "This empties a row (the second). " + text run at (209,0) width 141: "It should be removed. " + RenderInline {B} at (0,0) size 768x39 + RenderText {#text} at (350,0) size 768x39 + text run at (350,0) width 418: "This demonstrates a bug: the two cells that contained the ends" + text run at (0,20) width 646: "of the selection aren't given a placeholder and so appear differently than the other emptied cells." RenderBlock {DIV} at (0,56) size 784x56 RenderTable {TABLE} at (0,0) size 38x56 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 36x54 @@ -28,8 +28,8 @@ layer at (0,0) size 800x600 RenderText {#text} at (2,2) size 8x19 text run at (2,2) width 8: "9" RenderBlock {P} at (0,128) size 784x20 - RenderText {#text} at (0,0) size 566x19 - text run at (0,0) width 566: "This empties a row (the second), but it still contains the selection and so shouldn't be removed." + RenderText {#text} at (0,0) size 593x19 + text run at (0,0) width 593: "This empties a row (the second), but it still contains the selection and so shouldn't be removed." RenderBlock {DIV} at (0,164) size 784x82 RenderTable {TABLE} at (0,0) size 46x82 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 44x80 @@ -59,13 +59,13 @@ layer at (0,0) size 800x600 RenderText {#text} at (2,2) size 8x19 text run at (2,2) width 8: "9" RenderBlock {P} at (0,262) size 784x20 - RenderText {#text} at (0,0) size 289x19 - text run at (0,0) width 289: "This empties the first row, it should be removed." + RenderText {#text} at (0,0) size 303x19 + text run at (0,0) width 303: "This empties the first row, it should be removed." RenderBlock {DIV} at (0,298) size 784x76 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 36x19 - text run at (0,0) width 32: "Hello" - text run at (32,0) width 4: " " + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 35: "Hello" + text run at (35,0) width 4: " " RenderTable {TABLE} at (0,20) size 46x56 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 44x54 RenderTableRow {TR} at (0,2) size 44x24 diff --git a/LayoutTests/platform/wincairo/editing/deleting/5272440-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/5272440-expected.txt index 8d652cbef375..5586d607e205 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/5272440-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/5272440-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 633x19 - text run at (0,0) width 633: "This tests for a bug where deleting the contents of an editable root that's inline would introduce a new line." + RenderText {#text} at (0,0) size 669x19 + text run at (0,0) width 669: "This tests for a bug where deleting the contents of an editable root that's inline would introduce a new line." RenderBlock {DIV} at (0,36) size 784x22 [border: (1px solid #000000)] - RenderInline {SPAN} at (0,0) size 370x19 - RenderText {#text} at (1,1) size 370x19 - text run at (1,1) width 370: "There shouldn't be any blank lines in the black bordered area." - RenderBR {BR} at (371,1) size 0x19 + RenderInline {SPAN} at (0,0) size 387x19 + RenderText {#text} at (1,1) size 387x19 + text run at (1,1) width 387: "There shouldn't be any blank lines in the black bordered area." + RenderBR {BR} at (388,1) size 0x19 caret: position 62 of child 0 {#text} of child 0 {SPAN} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/5369009-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/5369009-expected.txt index 3ddd17fec5cc..86271127517c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/5369009-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/5369009-expected.txt @@ -4,19 +4,19 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 749x39 - text run at (0,0) width 749: "This tests for a hang on delete where a style rule would cause style spans in content moved after the delete to be displayed as" - text run at (0,20) width 177: "blocks. You should see Hello" - RenderInline {B} at (0,0) size 41x19 - RenderText {#text} at (177,20) size 41x19 - text run at (177,20) width 41: "World" - RenderText {#text} at (218,20) size 45x19 - text run at (218,20) width 45: " below." + RenderText {#text} at (0,0) size 783x39 + text run at (0,0) width 783: "This tests for a hang on delete where a style rule would cause style spans in content moved after the delete to be displayed as" + text run at (0,20) width 184: "blocks. You should see Hello" + RenderInline {B} at (0,0) size 43x19 + RenderText {#text} at (184,20) size 43x19 + text run at (184,20) width 43: "World" + RenderText {#text} at (227,20) size 46x19 + text run at (227,20) width 46: " below." RenderBlock {DIV} at (0,56) size 784x20 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "Hello" - RenderInline {SPAN} at (0,0) size 41x19 - RenderText {#text} at (32,0) size 41x19 - text run at (32,0) width 41: "World" + RenderText {#text} at (0,0) size 35x19 + text run at (0,0) width 35: "Hello" + RenderInline {SPAN} at (0,0) size 43x19 + RenderText {#text} at (35,0) size 43x19 + text run at (35,0) width 43: "World" caret: position 5 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/5433862-2-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/5433862-2-expected.txt index 6836c0fda918..1524d53e49a0 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/5433862-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/5433862-2-expected.txt @@ -4,40 +4,40 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 780x39 - text run at (0,0) width 555: "This tests for a bug where empty table rows well after the selection to delete were removed. " - text run at (555,0) width 225: "There should be five rows in the table" - text run at (0,20) width 218: "below, before and after the deletion." + RenderText {#text} at (0,0) size 783x39 + text run at (0,0) width 579: "This tests for a bug where empty table rows well after the selection to delete were removed. " + text run at (579,0) width 204: "There should be five rows in the" + text run at (0,20) width 260: "table below, before and after the deletion." RenderBlock {DIV} at (0,56) size 784x140 - RenderTable {TABLE} at (0,0) size 107x140 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 105x138 - RenderTableRow {TR} at (0,2) size 105x32 - RenderTableCell {TD} at (2,2) size 32x32 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (0,0) size 109x140 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 107x138 + RenderTableRow {TR} at (0,2) size 107x32 + RenderTableCell {TD} at (2,2) size 33x32 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] RenderBR {BR} at (6,6) size 0x19 - RenderTableCell {TD} at (36,2) size 32x32 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] - RenderTableCell {TD} at (70,2) size 33x32 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] - RenderTableRow {TR} at (0,36) size 105x32 - RenderTableCell {TD} at (2,36) size 32x32 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (6,6) size 20x19 - text run at (6,6) width 20: "foo" - RenderTableCell {TD} at (36,36) size 32x32 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTableCell {TD} at (37,2) size 32x32 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderTableCell {TD} at (71,2) size 34x32 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] + RenderTableRow {TR} at (0,36) size 107x32 + RenderTableCell {TD} at (2,36) size 33x32 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (6,6) size 21x19 + text run at (6,6) width 21: "foo" + RenderTableCell {TD} at (37,36) size 32x32 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] RenderText {#text} at (6,6) size 20x19 text run at (6,6) width 20: "bar" - RenderTableCell {TD} at (70,36) size 33x32 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] - RenderText {#text} at (6,6) size 21x19 - text run at (6,6) width 21: "baz" - RenderTableRow {TR} at (0,70) size 105x32 - RenderTableCell {TD} at (2,70) size 32x32 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1] + RenderTableCell {TD} at (71,36) size 34x32 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] + RenderText {#text} at (6,6) size 22x19 + text run at (6,6) width 22: "baz" + RenderTableRow {TR} at (0,70) size 107x32 + RenderTableCell {TD} at (2,70) size 33x32 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1] RenderBR {BR} at (6,6) size 0x19 - RenderTableCell {TD} at (36,70) size 32x32 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1] + RenderTableCell {TD} at (37,70) size 32x32 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1] RenderBR {BR} at (6,6) size 0x19 - RenderTableCell {TD} at (70,70) size 33x32 [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1] + RenderTableCell {TD} at (71,70) size 34x32 [border: (1px inset #808080)] [r=2 c=2 rs=1 cs=1] RenderBR {BR} at (6,6) size 0x19 - RenderTableRow {TR} at (0,104) size 105x32 - RenderTableCell {TD} at (2,104) size 32x32 [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,104) size 107x32 + RenderTableCell {TD} at (2,104) size 33x32 [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=1] RenderBR {BR} at (6,6) size 0x19 - RenderTableCell {TD} at (36,104) size 32x32 [border: (1px inset #808080)] [r=3 c=1 rs=1 cs=1] + RenderTableCell {TD} at (37,104) size 32x32 [border: (1px inset #808080)] [r=3 c=1 rs=1 cs=1] RenderBR {BR} at (6,6) size 0x19 - RenderTableCell {TD} at (70,104) size 33x32 [border: (1px inset #808080)] [r=3 c=2 rs=1 cs=1] + RenderTableCell {TD} at (71,104) size 34x32 [border: (1px inset #808080)] [r=3 c=2 rs=1 cs=1] RenderBR {BR} at (6,6) size 0x19 caret: position 0 of child 0 {BR} of child 0 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/5483370-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/5483370-expected.txt index 76220805cc46..9f6423bd98f7 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/5483370-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/5483370-expected.txt @@ -4,19 +4,19 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 751x39 - text run at (0,0) width 676: "This tests for a problem where empty table rows after the selection being deleted would be removed incorrectly. " - text run at (676,0) width 75: "Only the last" - text run at (0,20) width 302: "letter in 'foo' should be removed during this delete." + RenderText {#text} at (0,0) size 760x39 + text run at (0,0) width 705: "This tests for a problem where empty table rows after the selection being deleted would be removed incorrectly. " + text run at (705,0) width 55: "Only the" + text run at (0,20) width 343: "last letter in 'foo' should be removed during this delete." RenderBlock {DIV} at (0,56) size 784x56 - RenderTable {TABLE} at (0,0) size 28x56 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 26x54 - RenderTableRow {TR} at (0,2) size 26x24 - RenderTableCell {TD} at (2,2) size 16x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 12x19 - text run at (2,2) width 12: "fo" - RenderTableCell {TD} at (20,2) size 4x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] - RenderTableRow {TR} at (0,28) size 26x24 - RenderTableCell {TD} at (2,28) size 16x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderTableCell {TD} at (20,28) size 4x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTable {TABLE} at (0,0) size 29x56 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 27x54 + RenderTableRow {TR} at (0,2) size 27x24 + RenderTableCell {TD} at (2,2) size 17x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 13x19 + text run at (2,2) width 13: "fo" + RenderTableCell {TD} at (21,2) size 4x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderTableRow {TR} at (0,28) size 27x24 + RenderTableCell {TD} at (2,28) size 17x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableCell {TD} at (21,28) size 4x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] caret: position 2 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-3608445-fix-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-3608445-fix-expected.txt index 9d536be12307..47af86074d1c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-3608445-fix-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-3608445-fix-expected.txt @@ -31,14 +31,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 205x83 + RenderInline {SPAN} at (0,0) size 201x83 RenderText {#text} at (14,14) size 15x27 text run at (14,14) width 15: "s " RenderBR {BR} at (29,14) size 0x27 RenderBR {BR} at (14,42) size 0x27 - RenderText {#text} at (14,70) size 205x27 + RenderText {#text} at (14,70) size 201x27 text run at (14,70) width 6: " " - text run at (20,70) width 88: "war. We " - text run at (108,70) width 111: "of that war." + text run at (20,70) width 85: "war. We " + text run at (105,70) width 110: "of that war." RenderText {#text} at (0,0) size 0x0 caret: position 0 of child 4 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-3608462-fix-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-3608462-fix-expected.txt index 612d38a314a1..42587067248a 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-3608462-fix-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-3608462-fix-expected.txt @@ -35,7 +35,7 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x248 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 180x137 + RenderInline {SPAN} at (0,0) size 181x137 RenderText {#text} at (14,96) size 11x27 text run at (14,96) width 11: "a" RenderImage {IMG} at (25,14) size 76x103 @@ -43,7 +43,7 @@ layer at (0,0) size 800x600 text run at (101,96) width 46: "new " RenderBR {BR} at (147,96) size 0x27 RenderImage {IMG} at (14,124) size 76x103 - RenderText {#text} at (90,206) size 104x27 - text run at (90,206) width 104: " conceived" + RenderText {#text} at (90,206) size 105x27 + text run at (90,206) width 105: " conceived" RenderText {#text} at (0,0) size 0x0 caret: position 0 of child 4 {IMG} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-3857753-fix-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-3857753-fix-expected.txt index 7234fc9c9303..5daaba7e364f 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-3857753-fix-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-3857753-fix-expected.txt @@ -25,10 +25,10 @@ layer at (0,0) size 800x600 RenderText {#text} at (25,0) size 12x27 text run at (25,0) width 12: "o" RenderBlock {DIV} at (14,42) size 756x28 - RenderInline {B} at (0,0) size 54x26 - RenderText {#text} at (0,0) size 54x26 - text run at (0,0) width 54: "three" - RenderInline {I} at (0,0) size 42x27 - RenderText {#text} at (54,0) size 42x27 - text run at (54,0) width 42: "four" + RenderInline {B} at (0,0) size 53x26 + RenderText {#text} at (0,0) size 53x26 + text run at (0,0) width 53: "three" + RenderInline {I} at (0,0) size 40x27 + RenderText {#text} at (53,0) size 40x27 + text run at (53,0) width 40: "four" caret: position 2 of child 0 {#text} of child 0 {B} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-3865854-fix-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-3865854-fix-expected.txt index ebdbc16426d1..16d1dccb7f1f 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-3865854-fix-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-3865854-fix-expected.txt @@ -20,11 +20,11 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 36x26 text run at (0,0) width 36: "one" RenderBlock {DIV} at (14,41) size 756x27 - RenderInline {B} at (0,0) size 54x26 - RenderText {#text} at (0,0) size 54x26 - text run at (0,0) width 54: "three" + RenderInline {B} at (0,0) size 53x26 + RenderText {#text} at (0,0) size 53x26 + text run at (0,0) width 53: "three" RenderBlock {DIV} at (14,68) size 756x28 - RenderInline {I} at (0,0) size 42x27 - RenderText {#text} at (0,0) size 42x27 - text run at (0,0) width 42: "four" + RenderInline {I} at (0,0) size 40x27 + RenderText {#text} at (0,0) size 40x27 + text run at (0,0) width 40: "four" caret: position 3 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-3928305-fix-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-3928305-fix-expected.txt index 981c759c4648..f4c367f9d6cc 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-3928305-fix-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-3928305-fix-expected.txt @@ -19,8 +19,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 288x19 - text run at (0,0) width 288: "Should see a blank line between \"foo\" and \"baz\"" + RenderText {#text} at (0,0) size 309x19 + text run at (0,0) width 309: "Should see a blank line between \"foo\" and \"baz\"" RenderBlock {DIV} at (0,20) size 784x24 RenderBlock {DIV} at (0,44) size 784x112 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x28 @@ -29,6 +29,6 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (14,42) size 756x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (14,70) size 756x28 - RenderText {#text} at (0,0) size 33x27 - text run at (0,0) width 33: "baz" + RenderText {#text} at (0,0) size 34x27 + text run at (0,0) width 34: "baz" caret: position 0 of child 2 {BR} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-4083333-fix-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-4083333-fix-expected.txt index bcded73147df..faa717470a4a 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-4083333-fix-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-4083333-fix-expected.txt @@ -12,10 +12,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 102x27 - RenderText {#text} at (14,14) size 78x27 - text run at (14,14) width 78: "this is a " - RenderInline {A} at (0,0) size 24x27 [color=#0000EE] - RenderText {#text} at (92,14) size 24x27 - text run at (92,14) width 24: "lin" + RenderInline {SPAN} at (0,0) size 106x27 + RenderText {#text} at (14,14) size 80x27 + text run at (14,14) width 80: "this is a " + RenderInline {A} at (0,0) size 26x27 [color=#0000EE] + RenderText {#text} at (94,14) size 26x27 + text run at (94,14) width 26: "lin" caret: position 3 of child 0 {#text} of child 1 {A} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-001-expected.txt index c1d20a6cbab6..c5262fbc578b 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-001-expected.txt @@ -19,6 +19,6 @@ layer at (0,0) size 800x585 RenderInline {SPAN} at (0,0) size 32x27 RenderText {#text} at (74,84) size 32x27 text run at (74,84) width 32: "foo" - RenderText {#text} at (106,84) size 33x27 - text run at (106,84) width 33: "baz" + RenderText {#text} at (106,84) size 34x27 + text run at (106,84) width 34: "baz" caret: position 3 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-002-expected.txt index c1d20a6cbab6..c5262fbc578b 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-002-expected.txt @@ -19,6 +19,6 @@ layer at (0,0) size 800x585 RenderInline {SPAN} at (0,0) size 32x27 RenderText {#text} at (74,84) size 32x27 text run at (74,84) width 32: "foo" - RenderText {#text} at (106,84) size 33x27 - text run at (106,84) width 33: "baz" + RenderText {#text} at (106,84) size 34x27 + text run at (106,84) width 34: "baz" caret: position 3 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-003-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-003-expected.txt index c1d20a6cbab6..c5262fbc578b 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-after-span-ws-003-expected.txt @@ -19,6 +19,6 @@ layer at (0,0) size 800x585 RenderInline {SPAN} at (0,0) size 32x27 RenderText {#text} at (74,84) size 32x27 text run at (74,84) width 32: "foo" - RenderText {#text} at (106,84) size 33x27 - text run at (106,84) width 33: "baz" + RenderText {#text} at (106,84) size 34x27 + text run at (106,84) width 34: "baz" caret: position 3 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-and-undo-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-and-undo-expected.txt index d125e1d99d2e..adab8898b35c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-and-undo-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-and-undo-expected.txt @@ -40,11 +40,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 749x55 - text run at (14,14) width 749: "Should see \"foo bar baz\" in the red box. Insertion point should be between the" - text run at (14,42) width 201: "\"b\" and \"a\" of \"baz\"." + RenderText {#text} at (14,14) size 756x55 + text run at (14,14) width 756: "Should see \"foo bar baz\" in the red box. Insertion point should be between the" + text run at (14,42) width 202: "\"b\" and \"a\" of \"baz\"." RenderBlock {DIV} at (0,108) size 784x56 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 108x27 - text run at (14,14) width 108: "foo bar baz" + RenderText {#text} at (14,14) size 109x27 + text run at (14,14) width 109: "foo bar baz" caret: position 9 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-002-expected.txt index 48fff84b97af..da9b0721c7ef 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-002-expected.txt @@ -15,20 +15,20 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x83 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 730x55 - text run at (0,27) width 730: "Deleting when a selection starts in a blank line created by a BR element and" - text run at (0,55) width 284: "extends to the end of a block." + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 741x55 + text run at (0,27) width 741: "Deleting when a selection starts in a blank line created by a BR element and" + text run at (0,55) width 285: "extends to the end of a block." RenderBlock {DIV} at (14,113) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 721x83 - text run at (0,27) width 721: "Should see the three lines in the red box. First line should be \"A\". Next two" - text run at (0,55) width 721: "lines should be empty. Insertion point should be blinking on the second line" - text run at (0,83) width 196: "(the first blank one)." + RenderText {#text} at (0,27) size 732x83 + text run at (0,27) width 730: "Should see the three lines in the red box. First line should be \"A\". Next two" + text run at (0,55) width 732: "lines should be empty. Insertion point should be blinking on the second line" + text run at (0,83) width 198: "(the first blank one)." RenderBlock {DIV} at (0,262) size 784x88 RenderBlock {DIV} at (0,0) size 784x88 [border: (2px solid #FF0000)] RenderBlock {P} at (2,2) size 780x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-003-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-003-expected.txt index f3f73d5ba722..fcb73e64e7ff 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-003-expected.txt @@ -16,20 +16,20 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x111 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 731x83 - text run at (0,27) width 731: "Deleting when a selection starts in a blank line created by a block with a BR" - text run at (0,55) width 724: "placeholder in it and extends to a character that is not at the end of a block." - text run at (0,83) width 729: "This ensures that some of our \"special-case\" code does not run for this case." + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 742x83 + text run at (0,27) width 742: "Deleting when a selection starts in a blank line created by a block with a BR" + text run at (0,55) width 730: "placeholder in it and extends to a character that is not at the end of a block." + text run at (0,83) width 735: "This ensures that some of our \"special-case\" code does not run for this case." RenderBlock {DIV} at (14,141) size 756x83 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 674x55 - text run at (0,27) width 674: "Should see the two lines in the red box. Each should contain \"A\" only." - text run at (0,55) width 611: "Insertion point should be blinking at the start of the second line." + RenderText {#text} at (0,27) size 680x55 + text run at (0,27) width 680: "Should see the two lines in the red box. Each should contain \"A\" only." + text run at (0,55) width 620: "Insertion point should be blinking at the start of the second line." RenderBlock {DIV} at (0,262) size 784x60 RenderBlock {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] RenderBlock {P} at (2,2) size 780x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-004-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-004-expected.txt index 46529a4bb1ff..ae27dff9392b 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-004-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-004-expected.txt @@ -16,20 +16,20 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x111 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 746x83 - text run at (0,27) width 730: "Deleting when a selection starts in a blank line created by a BR element and" - text run at (0,55) width 746: "extends to a character that is not at the end of a block. This ensures that some" - text run at (0,83) width 505: "of our \"special-case\" code does not run for this case." + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 751x83 + text run at (0,27) width 741: "Deleting when a selection starts in a blank line created by a BR element and" + text run at (0,55) width 751: "extends to a character that is not at the end of a block. This ensures that some" + text run at (0,83) width 508: "of our \"special-case\" code does not run for this case." RenderBlock {DIV} at (14,141) size 756x83 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 674x55 - text run at (0,27) width 674: "Should see the two lines in the red box. Each should contain \"A\" only." - text run at (0,55) width 611: "Insertion point should be blinking at the start of the second line." + RenderText {#text} at (0,27) size 680x55 + text run at (0,27) width 680: "Should see the two lines in the red box. Each should contain \"A\" only." + text run at (0,55) width 620: "Insertion point should be blinking at the start of the second line." RenderBlock {DIV} at (0,262) size 784x60 RenderBlock {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] RenderBlock {P} at (2,2) size 780x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-005-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-005-expected.txt index dd8f5c6f56c0..d7a1fb62c925 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-005-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-005-expected.txt @@ -15,20 +15,20 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x83 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 730x55 - text run at (0,27) width 730: "Deleting when a selection starts in a blank line created by a BR element and" - text run at (0,55) width 345: "extends to the end of the document." + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 741x55 + text run at (0,27) width 741: "Deleting when a selection starts in a blank line created by a BR element and" + text run at (0,55) width 346: "extends to the end of the document." RenderBlock {DIV} at (14,113) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 734x83 - text run at (0,27) width 707: "Should see the two lines in the red box. First line should be \"A\". Next one" - text run at (0,55) width 734: "should be empty. Insertion point should be blinking at the start of the second" - text run at (0,83) width 41: "line." + RenderText {#text} at (0,27) size 741x83 + text run at (0,27) width 716: "Should see the two lines in the red box. First line should be \"A\". Next one" + text run at (0,55) width 741: "should be empty. Insertion point should be blinking at the start of the second" + text run at (0,83) width 43: "line." RenderBlock {DIV} at (0,262) size 784x60 RenderBlock {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] RenderBlock {P} at (2,2) size 780x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-006-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-006-expected.txt index e76de29f30c9..022539760260 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-006-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-006-expected.txt @@ -15,20 +15,20 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x83 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 731x55 - text run at (0,27) width 731: "Deleting when a selection starts in a blank line created by a block with a BR" - text run at (0,55) width 547: "placeholder in it and extends to the end of the document." + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 742x55 + text run at (0,27) width 742: "Deleting when a selection starts in a blank line created by a block with a BR" + text run at (0,55) width 552: "placeholder in it and extends to the end of the document." RenderBlock {DIV} at (14,113) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 734x83 - text run at (0,27) width 707: "Should see the two lines in the red box. First line should be \"A\". Next one" - text run at (0,55) width 734: "should be empty. Insertion point should be blinking at the start of the second" - text run at (0,83) width 41: "line." + RenderText {#text} at (0,27) size 741x83 + text run at (0,27) width 716: "Should see the two lines in the red box. First line should be \"A\". Next one" + text run at (0,55) width 741: "should be empty. Insertion point should be blinking at the start of the second" + text run at (0,83) width 43: "line." RenderBlock {DIV} at (0,262) size 784x60 RenderBlock {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)] RenderBlock {P} at (2,2) size 780x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-007-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-007-expected.txt index 8913938b3aba..e50ff0e6b282 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-007-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-007-expected.txt @@ -18,21 +18,21 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x83 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 732x55 - text run at (0,27) width 732: "Deleting when a selection starts at the beginning of a paragraph preceded by" - text run at (0,55) width 650: "another block and extends into the middle of a following paragraph." + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 742x55 + text run at (0,27) width 742: "Deleting when a selection starts at the beginning of a paragraph preceded by" + text run at (0,55) width 660: "another block and extends into the middle of a following paragraph." RenderBlock {DIV} at (14,113) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 755x83 - text run at (0,27) width 738: "Should see the three lines in the red box. First line should be \"one\". Next one" - text run at (0,55) width 166: "should be \"two\". " - text run at (166,55) width 589: "Next one should be \"ur\". Insertion point should be blinking at" - text run at (0,83) width 238: "the start of the third line." + RenderText {#text} at (0,27) size 747x83 + text run at (0,27) width 747: "Should see the three lines in the red box. First line should be \"one\". Next one" + text run at (0,55) width 167: "should be \"two\". " + text run at (167,55) width 573: "Next one should be \"ur\". Insertion point should be blinking" + text run at (0,83) width 265: "at the start of the third line." RenderBlock {DIV} at (0,262) size 784x88 RenderBlock {DIV} at (0,0) size 784x88 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (2,2) size 780x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-008-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-008-expected.txt index fbcfd948800a..c8a3bc6f7380 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-008-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-008-expected.txt @@ -19,21 +19,21 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x83 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 679x55 - text run at (0,27) width 679: "Deleting when a selection starts in the middle of the last paragraph and" - text run at (0,55) width 347: "extends to the end of that paragraph" + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 690x55 + text run at (0,27) width 690: "Deleting when a selection starts in the middle of the last paragraph and" + text run at (0,55) width 348: "extends to the end of that paragraph" RenderBlock {DIV} at (14,113) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 729x83 - text run at (0,27) width 729: "Should see the four lines in the red box. First line should be \"one\". Next one" - text run at (0,55) width 166: "should be \"two\". " - text run at (166,55) width 506: "Next one should be \"three\". Last one should be \"fo\"." - text run at (0,83) width 658: "Insertion point should be blinking at the start of the fourth (last) line." + RenderText {#text} at (0,27) size 738x83 + text run at (0,27) width 738: "Should see the four lines in the red box. First line should be \"one\". Next one" + text run at (0,55) width 167: "should be \"two\". " + text run at (167,55) width 508: "Next one should be \"three\". Last one should be \"fo\"." + text run at (0,83) width 668: "Insertion point should be blinking at the start of the fourth (last) line." RenderBlock {DIV} at (0,262) size 784x116 RenderBlock {DIV} at (0,0) size 784x116 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (2,2) size 780x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-009-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-009-expected.txt index b010d45bb148..b9cbafca55f1 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-009-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-009-expected.txt @@ -18,21 +18,21 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x83 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 749x55 - text run at (0,27) width 749: "Deleting when a selection starts at the beginning of a paragraph preceded by a" - text run at (0,55) width 637: "text element and extends into the middle of a following paragraph." + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 742x55 + text run at (0,27) width 742: "Deleting when a selection starts at the beginning of a paragraph preceded by" + text run at (0,55) width 665: "a text element and extends into the middle of a following paragraph." RenderBlock {DIV} at (14,113) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 738x83 - text run at (0,27) width 738: "Should see the three lines in the red box. First line should be \"one\". Next one" - text run at (0,55) width 152: "should be \"ee\". " - text run at (152,55) width 585: "Next one should be \"four\". Insertion point should be blinking" - text run at (0,83) width 284: "at the start of the second line." + RenderText {#text} at (0,27) size 747x83 + text run at (0,27) width 747: "Should see the three lines in the red box. First line should be \"one\". Next one" + text run at (0,55) width 153: "should be \"ee\". " + text run at (153,55) width 593: "Next one should be \"four\". Insertion point should be blinking" + text run at (0,83) width 286: "at the start of the second line." RenderBlock {DIV} at (0,262) size 784x88 RenderBlock {DIV} at (0,0) size 784x88 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (2,2) size 780x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-010-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-010-expected.txt index 1a867ad6e39f..047b9e5d5efd 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-010-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-010-expected.txt @@ -19,28 +19,29 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x322 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x111 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 730x55 - text run at (0,27) width 730: "Deleting when a selection starts at the beginning of a text following a nested" - text run at (0,55) width 680: "block, and extends out of the enclosing block into the following block. " - RenderBR {BR} at (680,55) size 0x27 - RenderText {#text} at (0,83) size 547x27 - text run at (0,83) width 265: "FIXME: Currently broken! " - text run at (265,83) width 282: "See rdar://problem/4099839/." + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 743x55 + text run at (0,27) width 743: "Deleting when a selection starts at the beginning of a text following a nested" + text run at (0,55) width 691: "block, and extends out of the enclosing block into the following block. " + RenderBR {BR} at (691,55) size 0x27 + RenderText {#text} at (0,83) size 553x27 + text run at (0,83) width 267: "FIXME: Currently broken! " + text run at (267,83) width 286: "See rdar://problem/4099839/." RenderBlock {DIV} at (14,141) size 756x167 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 756x139 - text run at (0,27) width 714: "Should see a total of five lines in the red box, with the third line inside of a" - text run at (0,55) width 668: "nested red box. First line should be \"one\". Next line should be \"two\". " - text run at (668,55) width 88: "Next line" - text run at (0,83) width 740: "should be \"cha cha cha\", inside of a nested red box. Next line should be \"ur\"." - text run at (0,111) width 367: "The last line should be \"cha cha cha\". " - text run at (367,111) width 381: "Insertion point should be blinking at the" - text run at (0,139) width 278: "start of the fourth line (\"ur\")." + RenderText {#text} at (0,27) size 752x139 + text run at (0,27) width 727: "Should see a total of five lines in the red box, with the third line inside of a" + text run at (0,55) width 675: "nested red box. First line should be \"one\". Next line should be \"two\". " + text run at (675,55) width 47: "Next" + text run at (0,83) width 737: "line should be \"cha cha cha\", inside of a nested red box. Next line should be" + text run at (0,111) width 52: "\"ur\". " + text run at (52,111) width 372: "The last line should be \"cha cha cha\". " + text run at (424,111) width 328: "Insertion point should be blinking" + text run at (0,139) width 340: "at the start of the fourth line (\"ur\")." RenderBlock {DIV} at (0,346) size 784x148 RenderBlock {DIV} at (0,0) size 784x148 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (2,2) size 780x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-011-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-011-expected.txt index 2353b8a368fc..24086583fba2 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-011-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-at-paragraph-boundaries-011-expected.txt @@ -14,30 +14,30 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x238 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x83 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 625x27 - text run at (0,27) width 625: "Delete at the end of document when there is a BR following a P. " - RenderBR {BR} at (625,27) size 0x27 - RenderText {#text} at (0,55) size 436x27 - text run at (0,55) width 436: "This is a test case for rdar://problem/4110366" + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 629x27 + text run at (0,27) width 629: "Delete at the end of document when there is a BR following a P. " + RenderBR {BR} at (629,27) size 0x27 + RenderText {#text} at (0,55) size 441x27 + text run at (0,55) width 441: "This is a test case for rdar://problem/4110366" RenderBlock {DIV} at (14,113) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 712x55 - text run at (0,27) width 237: "Red box with four lines. " - text run at (237,27) width 475: "The second line is a nested red box with the word" - text run at (0,55) width 79: "\"hello\". " - text run at (79,55) width 312: "The other three lines are empty. " - RenderBR {BR} at (391,55) size 0x27 - RenderText {#text} at (0,83) size 462x27 - text run at (0,83) width 462: "Selection is a caret at the start of the fourth line." + RenderText {#text} at (0,27) size 720x55 + text run at (0,27) width 240: "Red box with four lines. " + text run at (240,27) width 480: "The second line is a nested red box with the word" + text run at (0,55) width 81: "\"hello\". " + text run at (81,55) width 314: "The other three lines are empty. " + RenderBR {BR} at (395,55) size 0x27 + RenderText {#text} at (0,83) size 468x27 + text run at (0,83) width 468: "Selection is a caret at the start of the fourth line." RenderBlock {DIV} at (0,262) size 784x140 [border: (2px solid #FF0000)] RenderBlock {P} at (2,26) size 780x32 [border: (2px solid #FF0000)] - RenderText {#text} at (2,2) size 47x27 - text run at (2,2) width 47: "hello" + RenderText {#text} at (2,2) size 49x27 + text run at (2,2) width 49: "hello" RenderBlock {P} at (2,82) size 780x32 [border: (2px solid #FF0000)] RenderBR {BR} at (2,2) size 0x27 caret: position 0 of child 0 {BR} of child 1 {P} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-contents-003-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-contents-003-expected.txt index c991e9de0845..76bdd52cfd0d 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-contents-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-contents-003-expected.txt @@ -22,11 +22,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 108x27 - RenderText {#text} at (14,14) size 108x27 + RenderInline {SPAN} at (0,0) size 109x27 + RenderText {#text} at (14,14) size 109x27 text run at (14,14) width 38: "foo " text run at (52,14) width 37: "bar " - text run at (89,14) width 33: "baz" + text run at (89,14) width 34: "baz" RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)] RenderBR {BR} at (14,14) size 0x27 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-001-expected.txt index 791c42d1deb9..b33498bdf285 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-001-expected.txt @@ -16,6 +16,6 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x28 - RenderText {#text} at (0,0) size 83x27 - text run at (0,0) width 83: "OneTwo" + RenderText {#text} at (0,0) size 82x27 + text run at (0,0) width 82: "OneTwo" caret: position 4 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-002-expected.txt index b74207c75c24..a1bfca12c33d 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-002-expected.txt @@ -16,9 +16,9 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x56 - RenderText {#text} at (0,0) size 83x27 - text run at (0,0) width 83: "OneTwo" - RenderBR {BR} at (83,0) size 0x27 - RenderText {#text} at (0,28) size 56x27 - text run at (0,28) width 56: "Three" + RenderText {#text} at (0,0) size 82x27 + text run at (0,0) width 82: "OneTwo" + RenderBR {BR} at (82,0) size 0x27 + RenderText {#text} at (0,28) size 57x27 + text run at (0,28) width 57: "Three" caret: position 4 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-003-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-003-expected.txt index b74207c75c24..a1bfca12c33d 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-003-expected.txt @@ -16,9 +16,9 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x56 - RenderText {#text} at (0,0) size 83x27 - text run at (0,0) width 83: "OneTwo" - RenderBR {BR} at (83,0) size 0x27 - RenderText {#text} at (0,28) size 56x27 - text run at (0,28) width 56: "Three" + RenderText {#text} at (0,0) size 82x27 + text run at (0,0) width 82: "OneTwo" + RenderBR {BR} at (82,0) size 0x27 + RenderText {#text} at (0,28) size 57x27 + text run at (0,28) width 57: "Three" caret: position 4 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-004-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-004-expected.txt index b74207c75c24..a1bfca12c33d 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-004-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-004-expected.txt @@ -16,9 +16,9 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x56 - RenderText {#text} at (0,0) size 83x27 - text run at (0,0) width 83: "OneTwo" - RenderBR {BR} at (83,0) size 0x27 - RenderText {#text} at (0,28) size 56x27 - text run at (0,28) width 56: "Three" + RenderText {#text} at (0,0) size 82x27 + text run at (0,0) width 82: "OneTwo" + RenderBR {BR} at (82,0) size 0x27 + RenderText {#text} at (0,28) size 57x27 + text run at (0,28) width 57: "Three" caret: position 4 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-005-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-005-expected.txt index 6ce13af95818..400ab97f4ad1 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-005-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-005-expected.txt @@ -17,12 +17,12 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x84 RenderBlock (anonymous) at (0,0) size 756x28 - RenderText {#text} at (0,0) size 83x27 - text run at (0,0) width 83: "OneTwo" + RenderText {#text} at (0,0) size 82x27 + text run at (0,0) width 82: "OneTwo" RenderBlock {DIV} at (0,28) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 56x27 - text run at (0,0) width 56: "Three" + RenderText {#text} at (0,0) size 57x27 + text run at (0,0) width 57: "Three" RenderBlock (anonymous) at (0,56) size 756x28 RenderText {#text} at (0,0) size 45x27 text run at (0,0) width 45: "Four" diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-006-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-006-expected.txt index 2e2ae2267b0c..fafe4adea8ff 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-006-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-006-expected.txt @@ -17,13 +17,13 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x84 RenderBlock (anonymous) at (0,0) size 756x28 - RenderText {#text} at (0,0) size 83x27 - text run at (0,0) width 83: "OneTwo" + RenderText {#text} at (0,0) size 82x27 + text run at (0,0) width 82: "OneTwo" RenderBlock {DIV} at (0,28) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 56x27 - text run at (0,0) width 56: "Three" - RenderBR {BR} at (56,0) size 0x27 + RenderText {#text} at (0,0) size 57x27 + text run at (0,0) width 57: "Three" + RenderBR {BR} at (57,0) size 0x27 RenderBlock (anonymous) at (0,56) size 756x28 RenderText {#text} at (0,0) size 45x27 text run at (0,0) width 45: "Four" diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-007-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-007-expected.txt index 2e2ae2267b0c..fafe4adea8ff 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-007-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-007-expected.txt @@ -17,13 +17,13 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x84 RenderBlock (anonymous) at (0,0) size 756x28 - RenderText {#text} at (0,0) size 83x27 - text run at (0,0) width 83: "OneTwo" + RenderText {#text} at (0,0) size 82x27 + text run at (0,0) width 82: "OneTwo" RenderBlock {DIV} at (0,28) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 56x27 - text run at (0,0) width 56: "Three" - RenderBR {BR} at (56,0) size 0x27 + RenderText {#text} at (0,0) size 57x27 + text run at (0,0) width 57: "Three" + RenderBR {BR} at (57,0) size 0x27 RenderBlock (anonymous) at (0,56) size 756x28 RenderText {#text} at (0,0) size 45x27 text run at (0,0) width 45: "Four" diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-008-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-008-expected.txt index 496591f02d6a..d2a37d7cd170 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-008-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-008-expected.txt @@ -17,13 +17,13 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x84 RenderBlock (anonymous) at (0,0) size 756x28 - RenderText {#text} at (0,0) size 83x27 - text run at (0,0) width 83: "OneTwo" + RenderText {#text} at (0,0) size 82x27 + text run at (0,0) width 82: "OneTwo" RenderBlock {DIV} at (0,28) size 756x56 RenderBlock {DIV} at (0,0) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 56x27 - text run at (0,0) width 56: "Three" + RenderText {#text} at (0,0) size 57x27 + text run at (0,0) width 57: "Three" RenderBlock (anonymous) at (0,28) size 756x28 RenderText {#text} at (0,0) size 45x27 text run at (0,0) width 45: "Four" diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-009-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-009-expected.txt index 0b834b702941..8c7ca18740d6 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-009-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-009-expected.txt @@ -30,6 +30,6 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,28) size 45x27 text run at (0,28) width 45: "Four" RenderBlock (anonymous) at (0,84) size 756x28 - RenderText {#text} at (0,0) size 42x27 - text run at (0,0) width 42: "Five" + RenderText {#text} at (0,0) size 43x27 + text run at (0,0) width 43: "Five" caret: position 3 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-011-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-011-expected.txt index ae00d2eacd90..67059811cdad 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-011-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-011-expected.txt @@ -12,11 +12,11 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 40x27 text run at (0,0) width 40: "One" RenderBlock {DIV} at (0,28) size 756x56 - RenderText {#text} at (0,0) size 43x27 - text run at (0,0) width 43: "Two" - RenderBR {BR} at (43,0) size 0x27 + RenderText {#text} at (0,0) size 42x27 + text run at (0,0) width 42: "Two" + RenderBR {BR} at (42,0) size 0x27 RenderBR {BR} at (0,28) size 0x27 RenderBlock (anonymous) at (0,84) size 756x28 - RenderText {#text} at (0,0) size 56x27 - text run at (0,0) width 56: "Three" + RenderText {#text} at (0,0) size 57x27 + text run at (0,0) width 57: "Three" caret: position 1 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-012-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-012-expected.txt index 3c647faab0f1..b465733e4826 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-012-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-012-expected.txt @@ -41,8 +41,8 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 173x27 - text run at (0,0) width 68: "This is " - text run at (68,0) width 6: " " - text run at (74,0) width 99: "some text." + RenderText {#text} at (0,0) size 177x27 + text run at (0,0) width 71: "This is " + text run at (71,0) width 6: " " + text run at (77,0) width 100: "some text." caret: position 8 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-013-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-013-expected.txt index aa540481438f..7f0547f33cdc 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-013-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-013-expected.txt @@ -42,6 +42,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 167x27 - text run at (0,0) width 167: "This is some text." + RenderText {#text} at (0,0) size 171x27 + text run at (0,0) width 171: "This is some text." caret: position 8 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-014-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-014-expected.txt index 1e4890737882..673ebc26f90d 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-014-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-014-expected.txt @@ -40,6 +40,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 167x27 - text run at (0,0) width 167: "This is some text." + RenderText {#text} at (0,0) size 171x27 + text run at (0,0) width 171: "This is some text." caret: position 7 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-015-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-015-expected.txt index 1e4890737882..673ebc26f90d 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-015-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-015-expected.txt @@ -40,6 +40,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 167x27 - text run at (0,0) width 167: "This is some text." + RenderText {#text} at (0,0) size 171x27 + text run at (0,0) width 171: "This is some text." caret: position 7 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-016-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-016-expected.txt index 1e4890737882..673ebc26f90d 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-016-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-016-expected.txt @@ -40,6 +40,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 167x27 - text run at (0,0) width 167: "This is some text." + RenderText {#text} at (0,0) size 171x27 + text run at (0,0) width 171: "This is some text." caret: position 7 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-017-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-017-expected.txt index 1a3710e032f1..77ad3c3760e5 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-017-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-017-expected.txt @@ -42,8 +42,8 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x28 RenderBlock {DIV} at (0,0) size 756x28 - RenderText {#text} at (0,0) size 173x27 - text run at (0,0) width 68: "This is " - text run at (68,0) width 6: " " - text run at (74,0) width 99: "some text." + RenderText {#text} at (0,0) size 177x27 + text run at (0,0) width 71: "This is " + text run at (71,0) width 6: " " + text run at (77,0) width 100: "some text." caret: position 8 of child 0 {#text} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-018-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-018-expected.txt index 3c9b5a62d12b..6b527e2a9039 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-018-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-018-expected.txt @@ -16,15 +16,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 760x55 - text run at (14,14) width 760: "Should see \"Test OK\" in top red box, followed by \"...more text\", in its own red " - text run at (14,42) width 42: "box." + RenderText {#text} at (14,14) size 730x55 + text run at (14,14) width 730: "Should see \"Test OK\" in top red box, followed by \"...more text\", in its own " + text run at (14,42) width 79: "red box." RenderBlock {DIV} at (0,108) size 784x112 RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x28 - RenderText {#text} at (0,0) size 81x27 - text run at (0,0) width 81: "Test OK" + RenderText {#text} at (0,0) size 80x27 + text run at (0,0) width 80: "Test OK" RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 110x27 - text run at (14,14) width 110: "...more text" + RenderText {#text} at (14,14) size 111x27 + text run at (14,14) width 111: "...more text" caret: position 2 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-019-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-019-expected.txt index c7517d25e156..0fbfaea36375 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-019-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-019-expected.txt @@ -15,8 +15,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 289x27 - text run at (14,14) width 289: "Should see \"XX\" in a red box." + RenderText {#text} at (14,14) size 292x27 + text run at (14,14) width 292: "Should see \"XX\" in a red box." RenderBlock {DIV} at (0,80) size 784x56 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderText {#text} at (14,14) size 34x27 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-020-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-020-expected.txt index ab0aa84b72e0..f2f28c2842b8 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-020-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-020-expected.txt @@ -17,8 +17,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 350x27 - text run at (14,14) width 350: "Should see \"XX\" in a single red box." + RenderText {#text} at (14,14) size 356x27 + text run at (14,14) width 356: "Should see \"XX\" in a single red box." RenderBlock {DIV} at (0,80) size 784x56 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderText {#text} at (14,14) size 34x27 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-021-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-021-expected.txt index f6ae4461ea5b..8acebc326601 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-021-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-021-expected.txt @@ -17,9 +17,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 730x55 - text run at (14,14) width 730: "Should see \"XX\" in a top red box, and another \"XX\" in a red box inside the " - text run at (14,42) width 44: "first." + RenderText {#text} at (14,14) size 736x55 + text run at (14,14) width 736: "Should see \"XX\" in a top red box, and another \"XX\" in a red box inside the " + text run at (14,42) width 45: "first." RenderBlock {DIV} at (0,108) size 784x112 RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-022-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-022-expected.txt index ec52d5090524..ab0923a67dd9 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-022-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-022-expected.txt @@ -17,9 +17,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 748x55 - text run at (14,14) width 748: "Should see \"XX\" in outer red box, and another \"XX\" in an orange box nested " - text run at (14,42) width 142: "in a green box." + RenderText {#text} at (14,14) size 753x55 + text run at (14,14) width 753: "Should see \"XX\" in outer red box, and another \"XX\" in an orange box nested " + text run at (14,42) width 144: "in a green box." RenderBlock {DIV} at (0,108) size 784x140 RenderBlock {DIV} at (0,0) size 784x140 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x28 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-023-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-023-expected.txt index a10d83eb46a0..b03ba1f6a9be 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-023-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-023-expected.txt @@ -13,8 +13,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 510x27 - text run at (14,14) width 510: "Should see \"XX\" in a yellow box nested in a red box." + RenderText {#text} at (14,14) size 516x27 + text run at (14,14) width 516: "Should see \"XX\" in a yellow box nested in a red box." RenderBlock {DIV} at (0,80) size 784x62 RenderBlock {DIV} at (0,0) size 784x62 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x34 [border: (3px solid #FFFF00)] diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-024-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-024-expected.txt index 6b2f273f16f5..1fce4cf19462 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-024-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-block-merge-contents-024-expected.txt @@ -15,8 +15,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 493x27 - text run at (14,14) width 493: "Should see \"X\" in a yellow box nested in a red box." + RenderText {#text} at (14,14) size 499x27 + text run at (14,14) width 499: "Should see \"X\" in a yellow box nested in a red box." RenderBlock {DIV} at (0,80) size 784x62 RenderBlock {DIV} at (0,0) size 784x62 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x34 [border: (3px solid #FFFF00)] diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-001-expected.txt index 682c1103a2f1..89deec30a20f 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-001-expected.txt @@ -32,12 +32,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 295x27 + RenderInline {SPAN} at (0,0) size 296x27 RenderText {#text} at (14,14) size 204x27 text run at (14,14) width 102: "Fourscore " text run at (116,14) width 41: "and " text run at (157,14) width 61: "seven " - RenderText {#text} at (218,14) size 91x27 - text run at (218,14) width 91: "years ago" + RenderText {#text} at (218,14) size 92x27 + text run at (218,14) width 92: "years ago" RenderText {#text} at (0,0) size 0x0 caret: position 23 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-002-expected.txt index 766ebb49b5b8..1c53c85ef713 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-002-expected.txt @@ -39,7 +39,7 @@ layer at (0,0) size 800x600 text run at (157,14) width 61: "seven " RenderBR {BR} at (218,14) size 0x27 RenderBR {BR} at (14,42) size 0x27 - RenderText {#text} at (14,70) size 91x27 - text run at (14,70) width 91: "years ago" + RenderText {#text} at (14,70) size 92x27 + text run at (14,70) width 92: "years ago" RenderText {#text} at (0,0) size 0x0 caret: position 0 of child 2 {BR} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-003-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-003-expected.txt index 396e1a42b8d3..b14b282b52bd 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-003-expected.txt @@ -39,7 +39,7 @@ layer at (0,0) size 800x600 text run at (157,14) width 61: "seven " RenderBR {BR} at (218,14) size 0x27 RenderBR {BR} at (14,42) size 0x27 - RenderText {#text} at (14,70) size 91x27 - text run at (14,70) width 91: "years ago" + RenderText {#text} at (14,70) size 92x27 + text run at (14,70) width 92: "years ago" RenderText {#text} at (0,0) size 0x0 caret: position 23 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-004-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-004-expected.txt index c6365ef7a336..7a0419bc813b 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-004-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-004-expected.txt @@ -40,7 +40,7 @@ layer at (0,0) size 800x600 text run at (157,14) width 61: "seven " RenderBR {BR} at (218,14) size 0x27 RenderBR {BR} at (14,42) size 0x27 - RenderText {#text} at (14,70) size 91x27 - text run at (14,70) width 91: "years ago" + RenderText {#text} at (14,70) size 92x27 + text run at (14,70) width 92: "years ago" RenderText {#text} at (0,0) size 0x0 caret: position 0 of child 3 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-005-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-005-expected.txt index 1b1533639a78..be3c0898308c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-005-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-005-expected.txt @@ -42,7 +42,7 @@ layer at (0,0) size 800x600 text run at (116,14) width 41: "and " text run at (157,14) width 61: "seven " RenderBR {BR} at (218,14) size 0x27 - RenderText {#text} at (14,42) size 91x27 - text run at (14,42) width 91: "years ago" + RenderText {#text} at (14,42) size 92x27 + text run at (14,42) width 92: "years ago" RenderText {#text} at (0,0) size 0x0 caret: position 0 of child 2 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-006-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-006-expected.txt index acf580fadb5c..5f356d3630d5 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-006-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-006-expected.txt @@ -40,12 +40,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 628x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 295x27 + RenderInline {SPAN} at (0,0) size 296x27 RenderText {#text} at (14,14) size 204x27 text run at (14,14) width 102: "Fourscore " text run at (116,14) width 41: "and " text run at (157,14) width 61: "seven " - RenderText {#text} at (218,14) size 91x27 - text run at (218,14) width 91: "years ago" + RenderText {#text} at (218,14) size 92x27 + text run at (218,14) width 92: "years ago" RenderText {#text} at (0,0) size 0x0 caret: position 23 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-007-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-007-expected.txt index b24f4a15e3fa..0d3ea18c481c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-007-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-007-expected.txt @@ -36,12 +36,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 289x27 + RenderInline {SPAN} at (0,0) size 290x27 RenderText {#text} at (14,14) size 198x27 text run at (14,14) width 102: "Fourscore " text run at (116,14) width 41: "and " text run at (157,14) width 55: "seven" - RenderText {#text} at (212,14) size 91x27 - text run at (212,14) width 91: "years ago" + RenderText {#text} at (212,14) size 92x27 + text run at (212,14) width 92: "years ago" RenderText {#text} at (0,0) size 0x0 caret: position 22 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-008-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-008-expected.txt index bcd3b345e145..b32b4d3b48ed 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-008-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-008-expected.txt @@ -18,6 +18,6 @@ layer at (0,0) size 800x600 RenderText {#text} at (14,14) size 40x27 text run at (14,14) width 40: "One" RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 43x27 - text run at (14,14) width 43: "Two" + RenderText {#text} at (14,14) size 42x27 + text run at (14,14) width 42: "Two" caret: position 3 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-009-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-009-expected.txt index 782153b7d1a2..97f4ae1c9c70 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-009-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-009-expected.txt @@ -18,6 +18,6 @@ layer at (0,0) size 800x600 RenderText {#text} at (14,14) size 40x27 text run at (14,14) width 40: "One" RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 43x27 - text run at (14,14) width 43: "Two" + RenderText {#text} at (14,14) size 42x27 + text run at (14,14) width 42: "Two" caret: position 0 of child 0 {#text} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-010-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-010-expected.txt index c259046b19ed..50be5e23d95e 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-010-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-010-expected.txt @@ -19,6 +19,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 83x27 - text run at (14,14) width 83: "OneTwo" + RenderText {#text} at (14,14) size 82x27 + text run at (14,14) width 82: "OneTwo" caret: position 3 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-br-013-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-br-013-expected.txt index bc483b8a16d3..dc4d06ef355f 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-br-013-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-br-013-expected.txt @@ -5,15 +5,15 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x40 RenderText {#text} at (0,0) size 751x39 - text run at (0,0) width 751: "This tests that we only preserve an empty paragraph's style when moving paragraphs around if the selection is still in an empty" - text run at (0,20) width 199: "paragraph after the move occurs." + text run at (0,0) width 751: "This tests that we only preserve an empty paragraph's style when moving paragraphs around if the selection is still in an" + text run at (0,20) width 249: "empty paragraph after the move occurs." RenderBlock {DIV} at (0,40) size 784x20 - RenderText {#text} at (0,0) size 298x19 - text run at (0,0) width 298: "The test passes if the text below is still underlined." + RenderText {#text} at (0,0) size 315x19 + text run at (0,0) width 315: "The test passes if the text below is still underlined." RenderBlock (anonymous) at (0,60) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderBlock {DIV} at (0,80) size 784x20 - RenderInline {SPAN} at (0,0) size 179x19 - RenderText {#text} at (0,0) size 179x19 - text run at (0,0) width 179: "This text should be underlined" + RenderInline {SPAN} at (0,0) size 191x19 + RenderText {#text} at (0,0) size 191x19 + text run at (0,0) width 191: "This text should be underlined" caret: position 30 of child 0 {#text} of child 0 {SPAN} of child 6 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-character-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-character-001-expected.txt index 9faf1b745415..c0d3cbd10565 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-character-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-character-001-expected.txt @@ -13,10 +13,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 96x27 - RenderText {#text} at (14,14) size 96x27 + RenderInline {SPAN} at (0,0) size 97x27 + RenderText {#text} at (14,14) size 97x27 text run at (14,14) width 26: "fo " text run at (40,14) width 37: "bar " - text run at (77,14) width 33: "baz" + text run at (77,14) width 34: "baz" RenderText {#text} at (0,0) size 0x0 caret: position 1 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-contiguous-ws-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-contiguous-ws-001-expected.txt index 3c5f196f5198..c1feca6b3f05 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-contiguous-ws-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-contiguous-ws-001-expected.txt @@ -18,10 +18,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 77x27 - RenderText {#text} at (14,14) size 77x27 + RenderInline {SPAN} at (0,0) size 78x27 + RenderText {#text} at (14,14) size 78x27 text run at (14,14) width 38: "foo " text run at (52,14) width 6: " " - text run at (58,14) width 33: "baz" + text run at (58,14) width 34: "baz" RenderText {#text} at (0,0) size 0x0 caret: position 4 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-first-list-item-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-first-list-item-expected.txt index 7ee7d7d0c51e..dc366f3e7206 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-first-list-item-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-first-list-item-expected.txt @@ -13,15 +13,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 766x39 - text run at (0,0) width 766: "This tests deletion when the caret is in an empty list item at the beginning of the document. It also makes sure that the style inside" - text run at (0,20) width 181: "the empty list item is retained. " - text run at (181,20) width 100: "You should see '" + RenderText {#text} at (0,0) size 768x39 + text run at (0,0) width 768: "This tests deletion when the caret is in an empty list item at the beginning of the document. It also makes sure that the style" + text run at (0,20) width 232: "inside the empty list item is retained. " + text run at (232,20) width 103: "You should see '" RenderInline {B} at (0,0) size 21x19 - RenderText {#text} at (281,20) size 21x19 - text run at (281,20) width 21: "foo" - RenderText {#text} at (302,20) size 236x19 - text run at (302,20) width 236: "' followed by a list item containing 'bar'." + RenderText {#text} at (335,20) size 21x19 + text run at (335,20) width 21: "foo" + RenderText {#text} at (356,20) size 251x19 + text run at (356,20) width 251: "' followed by a list item containing 'bar'." RenderBlock {DIV} at (0,56) size 784x56 RenderBlock {DIV} at (0,0) size 784x20 RenderInline {B} at (0,0) size 21x19 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-hr-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-hr-expected.txt index 2ded67810fa6..b8e40198b755 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-hr-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-hr-expected.txt @@ -17,11 +17,11 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x40 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 41x19 - text run at (0,0) width 41: "Before" + RenderText {#text} at (0,0) size 43x19 + text run at (0,0) width 43: "Before" RenderBlock (anonymous) at (0,20) size 784x20 - RenderInline {SPAN} at (0,0) size 20x19 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "fter" + RenderInline {SPAN} at (0,0) size 21x19 + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "fter" RenderText {#text} at (0,0) size 0x0 caret: position 0 of child 0 {#text} of child 3 {SPAN} of child 0 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-image-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-image-001-expected.txt index 43da49cf6e5f..9a97e3e2e766 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-image-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-image-001-expected.txt @@ -15,18 +15,18 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x248 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 203x137 + RenderInline {SPAN} at (0,0) size 204x137 RenderText {#text} at (14,96) size 11x27 text run at (14,96) width 11: "a" RenderImage {IMG} at (25,14) size 76x103 RenderText {#text} at (101,96) size 6x27 text run at (101,96) width 6: " " - RenderText {#text} at (107,96) size 110x27 + RenderText {#text} at (107,96) size 111x27 text run at (107,96) width 6: " " - text run at (113,96) width 104: "conceived " - RenderBR {BR} at (217,96) size 0x27 - RenderText {#text} at (14,206) size 60x27 - text run at (14,206) width 60: "nation" - RenderImage {IMG} at (74,124) size 76x103 + text run at (113,96) width 105: "conceived " + RenderBR {BR} at (218,96) size 0x27 + RenderText {#text} at (14,206) size 61x27 + text run at (14,206) width 61: "nation" + RenderImage {IMG} at (75,124) size 76x103 RenderText {#text} at (0,0) size 0x0 caret: position 1 of child 2 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-image-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-image-002-expected.txt index 97ad6746287b..092ea43f7be2 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-image-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-image-002-expected.txt @@ -13,23 +13,23 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x276 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 252x247 + RenderInline {SPAN} at (0,0) size 254x247 RenderText {#text} at (14,14) size 11x27 text run at (14,14) width 11: "a" RenderText {#text} at (25,14) size 46x27 text run at (25,14) width 46: "new " RenderBR {BR} at (71,14) size 0x27 - RenderText {#text} at (14,124) size 66x27 - text run at (14,124) width 66: "nation " + RenderText {#text} at (14,124) size 67x27 + text run at (14,124) width 67: "nation " RenderInline {I} at (0,0) size 0x27 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 - RenderImage {IMG} at (80,42) size 76x103 - RenderText {#text} at (156,124) size 110x27 - text run at (156,124) width 110: " conceived " - RenderBR {BR} at (266,124) size 0x27 - RenderText {#text} at (14,234) size 60x27 - text run at (14,234) width 60: "nation" - RenderImage {IMG} at (74,152) size 76x103 + RenderImage {IMG} at (81,42) size 76x103 + RenderText {#text} at (157,124) size 111x27 + text run at (157,124) width 111: " conceived " + RenderBR {BR} at (268,124) size 0x27 + RenderText {#text} at (14,234) size 61x27 + text run at (14,234) width 61: "nation" + RenderImage {IMG} at (75,152) size 76x103 RenderText {#text} at (0,0) size 0x0 caret: position 1 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-image-003-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-image-003-expected.txt index 1127fd6eff7f..f2af73a5c945 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-image-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-image-003-expected.txt @@ -14,11 +14,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 82x27 + RenderInline {SPAN} at (0,0) size 85x27 RenderText {#text} at (14,14) size 11x27 text run at (14,14) width 11: "a" - RenderText {#text} at (25,14) size 71x27 + RenderText {#text} at (25,14) size 74x27 text run at (25,14) width 6: " " - text run at (31,14) width 65: "lincoln" + text run at (31,14) width 68: "lincoln" RenderText {#text} at (0,0) size 0x0 caret: position 1 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-001-expected.txt index 65f19aba2b51..85fa166b2e08 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-001-expected.txt @@ -12,6 +12,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x28 - RenderText {#text} at (0,0) size 194x27 - text run at (0,0) width 194: "in the affairs of men" + RenderText {#text} at (0,0) size 197x27 + text run at (0,0) width 197: "in the affairs of men" caret: position 0 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-002-expected.txt index 9753a262de55..fe6ba1ab8161 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-002-expected.txt @@ -12,6 +12,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x28 - RenderText {#text} at (0,0) size 194x27 - text run at (0,0) width 194: "in the affairs of men" + RenderText {#text} at (0,0) size 197x27 + text run at (0,0) width 197: "in the affairs of men" caret: position 0 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-003-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-003-expected.txt index 93b98fbfe082..a56f3f1fd17f 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-003-expected.txt @@ -13,9 +13,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x56 - RenderText {#text} at (0,0) size 136x27 - text run at (0,0) width 136: "There is a tide" - RenderBR {BR} at (136,0) size 0x27 - RenderText {#text} at (0,28) size 239x27 - text run at (0,28) width 239: "Which taken at the flood" + RenderText {#text} at (0,0) size 139x27 + text run at (0,0) width 139: "There is a tide" + RenderBR {BR} at (139,0) size 0x27 + RenderText {#text} at (0,28) size 241x27 + text run at (0,28) width 241: "Which taken at the flood" caret: position 0 of child 2 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-004-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-004-expected.txt index 537ba6922796..0437587520b6 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-004-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-004-expected.txt @@ -13,9 +13,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x28 - RenderText {#text} at (0,0) size 136x27 - text run at (0,0) width 136: "There is a tide" + RenderText {#text} at (0,0) size 139x27 + text run at (0,0) width 139: "There is a tide" RenderBlock {DIV} at (0,28) size 600x28 - RenderText {#text} at (0,0) size 239x27 - text run at (0,0) width 239: "Which taken at the flood" + RenderText {#text} at (0,0) size 241x27 + text run at (0,0) width 241: "Which taken at the flood" caret: position 0 of child 0 {#text} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-005-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-005-expected.txt index f29fb2cb00f6..4d2943b9f2ea 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-005-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-005-expected.txt @@ -13,6 +13,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x28 - RenderText {#text} at (0,0) size 239x27 - text run at (0,0) width 239: "Which taken at the flood" + RenderText {#text} at (0,0) size 241x27 + text run at (0,0) width 241: "Which taken at the flood" caret: position 0 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-006-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-006-expected.txt index 17d085815a8f..4d9f42cc7c9c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-006-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-006-expected.txt @@ -13,6 +13,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x28 - RenderText {#text} at (0,0) size 239x27 - text run at (0,0) width 239: "Which taken at the flood" + RenderText {#text} at (0,0) size 241x27 + text run at (0,0) width 241: "Which taken at the flood" caret: position 0 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-007-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-007-expected.txt index 482e6c613ece..f22647ce9de4 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-007-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-007-expected.txt @@ -13,6 +13,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x28 - RenderText {#text} at (0,0) size 239x27 - text run at (0,0) width 239: "Which taken at the flood" + RenderText {#text} at (0,0) size 241x27 + text run at (0,0) width 241: "Which taken at the flood" caret: position 0 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-008-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-008-expected.txt index d9c99fab1bf6..59f958d4e51a 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-008-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-008-expected.txt @@ -13,6 +13,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x28 - RenderText {#text} at (0,0) size 239x27 - text run at (0,0) width 239: "Which taken at the flood" + RenderText {#text} at (0,0) size 241x27 + text run at (0,0) width 241: "Which taken at the flood" caret: position 0 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-009-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-009-expected.txt index 010d829edc7d..ae9ab5d5a746 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-009-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-009-expected.txt @@ -16,6 +16,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 600x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (0,28) size 600x28 - RenderText {#text} at (0,0) size 239x27 - text run at (0,0) width 239: "Which taken at the flood" + RenderText {#text} at (0,0) size 241x27 + text run at (0,0) width 241: "Which taken at the flood" caret: position 0 of child 0 {BR} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-010-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-010-expected.txt index 010d829edc7d..ae9ab5d5a746 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-010-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-010-expected.txt @@ -16,6 +16,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 600x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (0,28) size 600x28 - RenderText {#text} at (0,0) size 239x27 - text run at (0,0) width 239: "Which taken at the flood" + RenderText {#text} at (0,0) size 241x27 + text run at (0,0) width 241: "Which taken at the flood" caret: position 0 of child 0 {BR} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-011-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-011-expected.txt index 74a1a9308228..695b4e6add34 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-011-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-011-expected.txt @@ -33,6 +33,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x28 - RenderText {#text} at (0,0) size 333x27 - text run at (0,0) width 333: "There is aWhich taken at the flood" + RenderText {#text} at (0,0) size 337x27 + text run at (0,0) width 337: "There is aWhich taken at the flood" caret: position 10 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-012-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-012-expected.txt index a6ed0465b219..b1e8f0466134 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-012-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-012-expected.txt @@ -33,6 +33,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 600x28 - RenderText {#text} at (0,0) size 333x27 - text run at (0,0) width 333: "There is aWhich taken at the flood" + RenderText {#text} at (0,0) size 337x27 + text run at (0,0) width 337: "There is aWhich taken at the flood" caret: position 10 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-013-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-013-expected.txt index 9d7f83450f25..7bb5b332b05c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-013-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-013-expected.txt @@ -27,11 +27,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x28 - RenderText {#text} at (0,0) size 136x27 - text run at (0,0) width 136: "There is a tide" + RenderText {#text} at (0,0) size 139x27 + text run at (0,0) width 139: "There is a tide" RenderBlock (anonymous) at (0,28) size 784x28 - RenderText {#text} at (0,0) size 194x27 - text run at (0,0) width 194: "in the affairs of men" + RenderText {#text} at (0,0) size 197x27 + text run at (0,0) width 197: "in the affairs of men" RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 caret: position 15 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-014-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-014-expected.txt index acb3c2e5bed4..0f743500c51a 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-014-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-014-expected.txt @@ -30,8 +30,8 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 14x27 text run at (0,0) width 14: "T" RenderBlock (anonymous) at (0,28) size 784x28 - RenderText {#text} at (0,0) size 194x27 - text run at (0,0) width 194: "in the affairs of men" + RenderText {#text} at (0,0) size 197x27 + text run at (0,0) width 197: "in the affairs of men" RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 caret: position 1 of child 0 {#text} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-015-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-015-expected.txt index 997b44e1b6a6..da84d1837944 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-015-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-015-expected.txt @@ -12,10 +12,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x60 - RenderText {#text} at (0,0) size 748x59 - text run at (0,0) width 748: "This tests deletion of an empty line starting inside a
element, but ending outside that element (just before a
). If the" - text run at (0,20) width 737: "deletion is successful, the result should have two lines, and the insertion point should be on the second line, at the end of the" - text run at (0,40) width 81: "editable area." + RenderText {#text} at (0,0) size 778x59 + text run at (0,0) width 764: "This tests deletion of an empty line starting inside a
element, but ending outside that element (just before a
). If" + text run at (0,20) width 778: "the deletion is successful, the result should have two lines, and the insertion point should be on the second line, at the end of" + text run at (0,40) width 106: "the editable area." RenderBlock {DIV} at (0,76) size 784x40 RenderBlock {DIV} at (0,0) size 784x20 RenderText {#text} at (0,0) size 7x19 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-016-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-016-expected.txt index 98371b5ef35e..d0d2fdbccd88 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-016-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-016-expected.txt @@ -12,10 +12,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x60 - RenderText {#text} at (0,0) size 758x59 - text run at (0,0) width 753: "This tests deletion of an empty line starting inside a
element, but ending outside that element (just before a
). In this" - text run at (0,20) width 758: "case, the
has no content inside it, but a min-height style prevents it from collapsing. If the deletion is successful, the result" - text run at (0,40) width 632: "should have two lines, and the insertion point should be on the second line, at the end of the editable area." + RenderText {#text} at (0,0) size 767x59 + text run at (0,0) width 767: "This tests deletion of an empty line starting inside a
element, but ending outside that element (just before a
). In" + text run at (0,20) width 766: "this case, the
has no content inside it, but a min-height style prevents it from collapsing. If the deletion is successful," + text run at (0,40) width 725: "the result should have two lines, and the insertion point should be on the second line, at the end of the editable area." RenderBlock {DIV} at (0,76) size 784x70 RenderBlock {DIV} at (0,0) size 784x20 RenderText {#text} at (0,0) size 7x19 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-017-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-017-expected.txt index 08460284deef..5fcb1078e7fc 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-017-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-017-expected.txt @@ -13,9 +13,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 783x39 - text run at (0,0) width 783: "This tests deletion of an empty line which is a
element just after a
element. If the deletion is successful, the result should" - text run at (0,20) width 617: "have two lines, and the insertion point should be at the start of the second line, just before the letter \"b\"." + RenderText {#text} at (0,0) size 781x39 + text run at (0,0) width 781: "This tests deletion of an empty line which is a
element just after a
element. If the deletion is successful, the result" + text run at (0,20) width 695: "should have two lines, and the insertion point should be at the start of the second line, just before the letter \"b\"." RenderBlock {DIV} at (0,56) size 784x40 RenderBlock {DIV} at (0,0) size 784x20 RenderText {#text} at (0,0) size 7x19 diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-end-ws-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-end-ws-001-expected.txt index 74210f37c67c..7de159c47b18 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-end-ws-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-end-ws-001-expected.txt @@ -70,9 +70,9 @@ layer at (0,0) size 800x585 RenderBlock {HTML} at (0,0) size 800x585 RenderBody {BODY} at (8,64) size 784x457 RenderBlock {DIV} at (64,0) size 748x244 [border: (50px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 544x75 - RenderText {#text} at (74,84) size 544x75 - text run at (74,84) width 544: "Fourscore and seven years ago our fathers brought forth " - text run at (74,132) width 301: "onthis continent a new nation..." + RenderInline {SPAN} at (0,0) size 546x75 + RenderText {#text} at (74,84) size 546x75 + text run at (74,84) width 546: "Fourscore and seven years ago our fathers brought forth " + text run at (74,132) width 304: "onthis continent a new nation..." RenderText {#text} at (0,0) size 0x0 caret: position 58 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-line-end-ws-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-line-end-ws-002-expected.txt index 74210f37c67c..7de159c47b18 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-line-end-ws-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-line-end-ws-002-expected.txt @@ -70,9 +70,9 @@ layer at (0,0) size 800x585 RenderBlock {HTML} at (0,0) size 800x585 RenderBody {BODY} at (8,64) size 784x457 RenderBlock {DIV} at (64,0) size 748x244 [border: (50px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 544x75 - RenderText {#text} at (74,84) size 544x75 - text run at (74,84) width 544: "Fourscore and seven years ago our fathers brought forth " - text run at (74,132) width 301: "onthis continent a new nation..." + RenderInline {SPAN} at (0,0) size 546x75 + RenderText {#text} at (74,84) size 546x75 + text run at (74,84) width 546: "Fourscore and seven years ago our fathers brought forth " + text run at (74,132) width 304: "onthis continent a new nation..." RenderText {#text} at (0,0) size 0x0 caret: position 58 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-listitem-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-listitem-001-expected.txt index 081336d2681e..31549dc1ed94 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-listitem-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-listitem-001-expected.txt @@ -37,6 +37,6 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 40x27 text run at (0,0) width 40: "four" RenderListItem {LI} at (40,56) size 716x28 - RenderText {#text} at (0,0) size 37x27 - text run at (0,0) width 37: "five" + RenderText {#text} at (0,0) size 38x27 + text run at (0,0) width 38: "five" caret: position 3 of child 0 {#text} of child 1 {LI} of child 1 {UL} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-listitem-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-listitem-002-expected.txt index f4b4a0eebf61..3e6b83f52bc3 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-listitem-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-listitem-002-expected.txt @@ -53,6 +53,6 @@ layer at (0,0) size 800x600 text run at (0,0) width 40: "four" RenderListItem {LI} at (40,112) size 716x28 RenderListMarker at (-22,0) size 9x27: bullet - RenderText {#text} at (0,0) size 37x27 - text run at (0,0) width 37: "five" + RenderText {#text} at (0,0) size 38x27 + text run at (0,0) width 38: "five" caret: position 0 of child 0 {BR} of child 5 {LI} of child 1 {UL} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-selection-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-selection-001-expected.txt index 7848a308c9d9..fcba5e3acece 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-selection-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-selection-001-expected.txt @@ -14,10 +14,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 76x27 - RenderText {#text} at (14,14) size 76x27 + RenderInline {SPAN} at (0,0) size 77x27 + RenderText {#text} at (14,14) size 77x27 text run at (14,14) width 6: " " text run at (20,14) width 37: "bar " - text run at (57,14) width 33: "baz" + text run at (57,14) width 34: "baz" RenderText {#text} at (0,0) size 0x0 caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-to-select-table-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-to-select-table-expected.txt index f1c625948484..0c7d1b154c8d 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-to-select-table-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-to-select-table-expected.txt @@ -31,21 +31,21 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 - RenderTable {TABLE} at (0,0) size 90x56 [border: (3px solid #AAAAAA)] - RenderTableSection {TBODY} at (3,3) size 84x50 - RenderTableRow {TR} at (0,2) size 84x22 + RenderTable {TABLE} at (0,0) size 94x56 [border: (3px solid #AAAAAA)] + RenderTableSection {TBODY} at (3,3) size 88x50 + RenderTableRow {TR} at (0,2) size 88x22 RenderTableCell {TD} at (2,2) size 31x22 [r=0 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 25x19 text run at (1,1) width 25: "Foo" - RenderTableCell {TD} at (35,2) size 47x22 [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 21x19 - text run at (1,1) width 21: "baz" - RenderTableRow {TR} at (0,26) size 84x22 + RenderTableCell {TD} at (35,2) size 51x22 [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 22x19 + text run at (1,1) width 22: "baz" + RenderTableRow {TR} at (0,26) size 88x22 RenderTableCell {TD} at (2,26) size 31x22 [r=1 c=0 rs=1 cs=1] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "bar" - RenderTableCell {TD} at (35,26) size 47x22 [r=1 c=1 rs=1 cs=1] - RenderText {#text} at (1,1) size 41x19 - text run at (1,1) width 41: "buffalo" + RenderTableCell {TD} at (35,26) size 51x22 [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (1,1) size 45x19 + text run at (1,1) width 45: "buffalo" selection start: position 0 of child 1 {TABLE} of child 0 {DIV} of body selection end: position 2 of child 1 {TABLE} of child 0 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-trailing-ws-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-trailing-ws-001-expected.txt index 7848a308c9d9..fcba5e3acece 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-trailing-ws-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-trailing-ws-001-expected.txt @@ -14,10 +14,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 76x27 - RenderText {#text} at (14,14) size 76x27 + RenderInline {SPAN} at (0,0) size 77x27 + RenderText {#text} at (14,14) size 77x27 text run at (14,14) width 6: " " text run at (20,14) width 37: "bar " - text run at (57,14) width 33: "baz" + text run at (57,14) width 34: "baz" RenderText {#text} at (0,0) size 0x0 caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-trailing-ws-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-trailing-ws-002-expected.txt index 7616e64d8f21..54490c94118f 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-trailing-ws-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-trailing-ws-002-expected.txt @@ -26,12 +26,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 39x55 + RenderInline {SPAN} at (0,0) size 40x55 RenderText {#text} at (14,14) size 32x27 text run at (14,14) width 32: "foo" RenderBR {BR} at (46,14) size 0x27 - RenderText {#text} at (14,42) size 39x27 + RenderText {#text} at (14,42) size 40x27 text run at (14,42) width 6: " " - text run at (20,42) width 33: "baz" + text run at (20,42) width 34: "baz" RenderText {#text} at (0,0) size 0x0 caret: position 0 of child 2 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-ws-fixup-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-ws-fixup-001-expected.txt index 450a85d8c8ff..ab84a991cfcf 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-ws-fixup-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-ws-fixup-001-expected.txt @@ -41,25 +41,25 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 745x55 - RenderText {#text} at (14,14) size 95x27 - text run at (14,14) width 95: "in Liberty" + RenderInline {SPAN} at (0,0) size 750x55 + RenderText {#text} at (14,14) size 97x27 + text run at (14,14) width 97: "in Liberty" RenderInline {I} at (0,0) size 117x27 - RenderText {#text} at (109,14) size 117x27 - text run at (109,14) width 21: "F " - text run at (130,14) width 96: "and seven" - RenderText {#text} at (226,14) size 63x27 - text run at (226,14) width 63: " years " + RenderText {#text} at (111,14) size 117x27 + text run at (111,14) width 21: "F " + text run at (132,14) width 96: "and seven" + RenderText {#text} at (228,14) size 63x27 + text run at (228,14) width 63: " years " RenderInline {B} at (0,0) size 15x26 - RenderText {#text} at (289,14) size 15x26 - text run at (289,14) width 15: "s " - RenderText {#text} at (304,14) size 745x55 - text run at (304,14) width 110: "our fathers " - text run at (414,14) width 345: "f upon this continent, a new nation, " - text run at (14,42) width 104: "conceived " - text run at (118,42) width 6: " " - text run at (124,42) width 6: " " - text run at (130,42) width 113: " in Liberty, " - text run at (243,42) width 381: "and dedicated to the proposition that all" + RenderText {#text} at (291,14) size 15x26 + text run at (291,14) width 15: "s " + RenderText {#text} at (306,14) size 750x55 + text run at (306,14) width 110: "our fathers " + text run at (416,14) width 348: "f upon this continent, a new nation, " + text run at (14,42) width 105: "conceived " + text run at (119,42) width 6: " " + text run at (125,42) width 6: " " + text run at (131,42) width 113: " in Liberty, " + text run at (244,42) width 386: "and dedicated to the proposition that all" RenderText {#text} at (0,0) size 0x0 caret: position 7 of child 2 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/delete-ws-fixup-002-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/delete-ws-fixup-002-expected.txt index e48bb9ea23ab..17e3ec00d385 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/delete-ws-fixup-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/delete-ws-fixup-002-expected.txt @@ -42,31 +42,31 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 727x39 - text run at (0,0) width 252: "This testcase demonstrates a bug (9441). " - text run at (252,0) width 434: "When 'as' is deleted, there should be a space before and after the caret. " - text run at (686,0) width 41: "Editing" - text run at (0,20) width 513: "produces a tree that should result in two spaces, but for some reason it isn't rendered." + RenderText {#text} at (0,0) size 751x39 + text run at (0,0) width 259: "This testcase demonstrates a bug (9441). " + text run at (259,0) width 446: "When 'as' is deleted, there should be a space before and after the caret. " + text run at (705,0) width 46: "Editing" + text run at (0,20) width 531: "produces a tree that should result in two spaces, but for some reason it isn't rendered." RenderBlock {DIV} at (0,56) size 784x84 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 736x55 - RenderText {#text} at (14,14) size 95x27 - text run at (14,14) width 95: "in Liberty" + RenderInline {SPAN} at (0,0) size 741x55 + RenderText {#text} at (14,14) size 97x27 + text run at (14,14) width 97: "in Liberty" RenderInline {I} at (0,0) size 117x27 - RenderText {#text} at (109,14) size 117x27 - text run at (109,14) width 21: "F " - text run at (130,14) width 96: "and seven" - RenderText {#text} at (226,14) size 63x27 - text run at (226,14) width 63: " years " + RenderText {#text} at (111,14) size 117x27 + text run at (111,14) width 21: "F " + text run at (132,14) width 96: "and seven" + RenderText {#text} at (228,14) size 63x27 + text run at (228,14) width 63: " years " RenderInline {B} at (0,0) size 6x26 - RenderText {#text} at (289,14) size 6x26 - text run at (289,14) width 6: " " - RenderText {#text} at (295,14) size 736x55 - text run at (295,14) width 110: "our fathers " - text run at (405,14) width 345: "f upon this continent, a new nation, " - text run at (14,42) width 104: "conceived " - text run at (118,42) width 6: " " - text run at (124,42) width 6: " " - text run at (130,42) width 113: " in Liberty, " - text run at (243,42) width 381: "and dedicated to the proposition that all" + RenderText {#text} at (291,14) size 6x26 + text run at (291,14) width 6: " " + RenderText {#text} at (297,14) size 741x55 + text run at (297,14) width 110: "our fathers " + text run at (407,14) width 348: "f upon this continent, a new nation, " + text run at (14,42) width 105: "conceived " + text run at (119,42) width 6: " " + text run at (125,42) width 6: " " + text run at (131,42) width 113: " in Liberty, " + text run at (244,42) width 386: "and dedicated to the proposition that all" RenderText {#text} at (0,0) size 0x0 caret: position 7 of child 2 {#text} of child 1 {SPAN} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/forward-delete-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/forward-delete-expected.txt index 25ac0e21d3ff..946b7461dc27 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/forward-delete-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/forward-delete-expected.txt @@ -19,9 +19,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 725x55 - text run at (14,14) width 725: "Should see \"bar\" in the red box. Insertion point should be at the start of the " - text run at (14,42) width 101: "document." + RenderText {#text} at (14,14) size 731x55 + text run at (14,14) width 731: "Should see \"bar\" in the red box. Insertion point should be at the start of the " + text run at (14,42) width 102: "document." RenderBlock {DIV} at (0,108) size 784x56 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderText {#text} at (14,14) size 31x27 diff --git a/LayoutTests/platform/wincairo/editing/deleting/list-item-1-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/list-item-1-expected.txt index 50e7df9bd970..a045db00a5e3 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/list-item-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/list-item-1-expected.txt @@ -16,9 +16,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 676x19 - text run at (0,0) width 254: "This test deletes the contents of a sub-list. " - text run at (254,0) width 422: "Then it deletes the empty list item. The list item below it should remain." + RenderText {#text} at (0,0) size 713x19 + text run at (0,0) width 264: "This test deletes the contents of a sub-list. " + text run at (264,0) width 449: "Then it deletes the empty list item. The list item below it should remain." RenderBlock {DIV} at (0,36) size 784x40 RenderBlock {UL} at (0,0) size 784x40 RenderListItem {LI} at (40,0) size 744x20 diff --git a/LayoutTests/platform/wincairo/editing/deleting/merge-different-styles-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/merge-different-styles-expected.txt index 541dd21d032e..0a23d717231b 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/merge-different-styles-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/merge-different-styles-expected.txt @@ -11,15 +11,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 763x39 - text run at (0,0) width 333: "This places the caret before the 'b' in 'bar' and Deletes. " - text run at (333,0) width 430: "'foo' and 'bar' should end up on the same line, but neither should change" - text run at (0,20) width 31: "style." + RenderText {#text} at (0,0) size 749x39 + text run at (0,0) width 345: "This places the caret before the 'b' in 'bar' and Deletes. " + text run at (345,0) width 404: "'foo' and 'bar' should end up on the same line, but neither should" + text run at (0,20) width 82: "change style." RenderBlock {DIV} at (0,56) size 784x20 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderInline {SPAN} at (0,0) size 22x19 - RenderText {#text} at (20,0) size 22x19 - text run at (20,0) width 22: "bar" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" + RenderInline {SPAN} at (0,0) size 24x19 + RenderText {#text} at (21,0) size 24x19 + text run at (21,0) width 24: "bar" caret: position 3 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/merge-endOfParagraph-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/merge-endOfParagraph-expected.txt index 26f6b82b43a2..76b4822d3d49 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/merge-endOfParagraph-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/merge-endOfParagraph-expected.txt @@ -13,20 +13,20 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 761x39 - text run at (0,0) width 761: "When the selection to delete ends at the end of a paragraph, that paragraph will be completely deleted, but a
or an empty" - text run at (0,20) width 489: "block will remain. Merging must happen to remove that
or prune that block." + RenderText {#text} at (0,0) size 747x39 + text run at (0,0) width 747: "When the selection to delete ends at the end of a paragraph, that paragraph will be completely deleted, but a
or an" + text run at (0,20) width 555: "empty block will remain. Merging must happen to remove that
or prune that block." RenderBlock {P} at (0,56) size 784x40 - RenderText {#text} at (0,0) size 757x39 - text run at (0,0) width 757: "This test illustrates a case where merging wasn't allowed to happen just because the end of the selection to delete was in a fully" - text run at (0,20) width 192: "selected line, which is nonsense." + RenderText {#text} at (0,0) size 763x39 + text run at (0,0) width 763: "This test illustrates a case where merging wasn't allowed to happen just because the end of the selection to delete was in a" + text run at (0,20) width 237: "fully selected line, which is nonsense." RenderBlock {P} at (0,112) size 784x60 - RenderText {#text} at (0,0) size 783x59 - text run at (0,0) width 296: "Fixing that bug exposed a problem with merging. " - text run at (296,0) width 487: "If deletion empties out the block that contained the start of the selection to delete," - text run at (0,20) width 410: "that block can collapse away and become impossible to merge into. " - text run at (410,20) width 361: "So we insert a placeholder to prop it open so that the merge" - text run at (0,40) width 73: "can happen." + RenderText {#text} at (0,0) size 779x59 + text run at (0,0) width 315: "Fixing that bug exposed a problem with merging. " + text run at (315,0) width 462: "If deletion empties out the block that contained the start of the selection to" + text run at (0,20) width 472: "delete, that block can collapse away and become impossible to merge into. " + text run at (472,20) width 307: "So we insert a placeholder to prop it open so that" + text run at (0,40) width 142: "the merge can happen." RenderBlock {DIV} at (5,188) size 774x34 [border: (1px solid #000000)] RenderBlock {DIV} at (6,6) size 762x22 [border: (1px solid #FF0000)] RenderBR {BR} at (1,1) size 0x19 diff --git a/LayoutTests/platform/wincairo/editing/deleting/merge-no-br-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/merge-no-br-expected.txt index 019ac090ba8e..15076d241b7c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/merge-no-br-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/merge-no-br-expected.txt @@ -11,18 +11,18 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 773x39 - text run at (0,0) width 773: "This places the caret before the 'T' in 'Two' and Deletes. 'One' and 'Two' should be merged but the blocks containing 'Three' and" - text run at (0,20) width 192: "'Four' should remain untouched." + RenderText {#text} at (0,0) size 780x39 + text run at (0,0) width 780: "This places the caret before the 'T' in 'Two' and Deletes. 'One' and 'Two' should be merged but the blocks containing 'Three'" + text run at (0,20) width 230: "and 'Four' should remain untouched." RenderBlock {DIV} at (8,56) size 768x182 RenderBlock {DIV} at (16,16) size 736x42 [border: (3px solid #FF0000)] - RenderText {#text} at (11,11) size 54x19 - text run at (11,11) width 54: "OneTwo" + RenderText {#text} at (11,11) size 56x19 + text run at (11,11) width 56: "OneTwo" RenderBlock {DIV} at (16,66) size 736x100 [border: (3px solid #008000)] RenderBlock {DIV} at (19,19) size 698x42 [border: (3px solid #000000)] - RenderText {#text} at (11,11) size 35x19 - text run at (11,11) width 35: "Three" + RenderText {#text} at (11,11) size 37x19 + text run at (11,11) width 37: "Three" RenderBlock (anonymous) at (11,69) size 714x20 - RenderText {#text} at (0,0) size 29x19 - text run at (0,0) width 29: "Four" + RenderText {#text} at (0,0) size 30x19 + text run at (0,0) width 30: "Four" caret: position 3 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/merge-unrendered-space-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/merge-unrendered-space-expected.txt index d2eb8a00a826..31911a25e337 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/merge-unrendered-space-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/merge-unrendered-space-expected.txt @@ -12,15 +12,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 512x19 - text run at (0,0) width 512: "This tests deleting the line break before a paragraph that ends with unrendered space." + RenderText {#text} at (0,0) size 534x19 + text run at (0,0) width 534: "This tests deleting the line break before a paragraph that ends with unrendered space." RenderBlock {DIV} at (0,36) size 784x40 RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderText {#text} at (20,0) size 20x19 - text run at (20,0) width 20: "bar" - RenderBlock {DIV} at (0,20) size 784x20 RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "baz" + text run at (0,0) width 21: "foo" + RenderText {#text} at (21,0) size 20x19 + text run at (21,0) width 20: "bar" + RenderBlock {DIV} at (0,20) size 784x20 + RenderText {#text} at (0,0) size 22x19 + text run at (0,0) width 22: "baz" caret: position 3 of child 0 {#text} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/merge-whitespace-pre-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/merge-whitespace-pre-expected.txt index 676ed6b2909c..ff5e9b9d6d26 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/merge-whitespace-pre-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/merge-whitespace-pre-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x579 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 777x39 - text run at (0,0) width 352: "This test places the caret before the 'b' in 'bar' and Delete. " - text run at (352,0) width 425: "Afterword, 'foobar' should be in the first paragraph and 'baz' should be" - text run at (0,20) width 83: "in the second." + RenderText {#text} at (0,0) size 743x39 + text run at (0,0) width 364: "This test places the caret before the 'b' in 'bar' and Delete. " + text run at (364,0) width 379: "Afterword, 'foobar' should be in the first paragraph and 'baz'" + text run at (0,20) width 152: "should be in the second." RenderBlock {DIV} at (0,56) size 784x49 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 40x19 - text run at (0,0) width 40: "foobar" + RenderText {#text} at (0,0) size 41x19 + text run at (0,0) width 41: "foobar" RenderBlock {PRE} at (0,33) size 784x16 RenderText {#text} at (0,0) size 24x16 text run at (0,0) width 24: "baz" diff --git a/LayoutTests/platform/wincairo/editing/deleting/move-nodes-001-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/move-nodes-001-expected.txt index d8bbda0b2284..e21e6754af0c 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/move-nodes-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/move-nodes-001-expected.txt @@ -5,14 +5,14 @@ layer at (0,0) size 800x156 RenderBody {BODY} at (8,8) size 784x140 RenderBlock {DIV} at (0,0) size 784x114 [border: (3px solid #FF0000)] RenderBlock (anonymous) at (3,3) size 778x20 - RenderText {#text} at (0,0) size 126x19 - text run at (0,0) width 126: "Destination container" + RenderText {#text} at (0,0) size 134x19 + text run at (0,0) width 134: "Destination container" RenderBlock {P} at (3,39) size 778x20 - RenderText {#text} at (0,0) size 22x19 - text run at (0,0) width 22: "one" - RenderBlock {P} at (3,75) size 778x20 RenderText {#text} at (0,0) size 23x19 - text run at (0,0) width 23: "two" + text run at (0,0) width 23: "one" + RenderBlock {P} at (3,75) size 778x20 + RenderText {#text} at (0,0) size 24x19 + text run at (0,0) width 24: "two" RenderBlock {DIV} at (0,114) size 784x26 [border: (3px solid #0000FF)] - RenderText {#text} at (3,3) size 102x19 - text run at (3,3) width 102: "Source container" + RenderText {#text} at (3,3) size 106x19 + text run at (3,3) width 106: "Source container" diff --git a/LayoutTests/platform/wincairo/editing/deleting/non-smart-delete-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/non-smart-delete-expected.txt index 0f02cd04b673..0a1657aa1a64 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/non-smart-delete-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/non-smart-delete-expected.txt @@ -14,24 +14,24 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x210 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x55 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 635x27 - text run at (0,27) width 635: "Non-smart delete when deleting a word selected via the keyboard." + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 642x27 + text run at (0,27) width 642: "Non-smart delete when deleting a word selected via the keyboard." RenderBlock {DIV} at (14,85) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 702x55 - text run at (0,27) width 702: "The first word should be deleted. The space following it should remain. It" - text run at (0,55) width 204: "should look like this: " - RenderBR {BR} at (204,55) size 0x27 - RenderText {#text} at (0,83) size 96x27 - text run at (0,83) width 96: "\" bar baz\"" + RenderText {#text} at (0,27) size 715x55 + text run at (0,27) width 715: "The first word should be deleted. The space following it should remain. It" + text run at (0,55) width 210: "should look like this: " + RenderBR {BR} at (210,55) size 0x27 + RenderText {#text} at (0,83) size 97x27 + text run at (0,83) width 97: "\" bar baz\"" RenderBlock {DIV} at (0,234) size 784x32 RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] - RenderText {#text} at (2,2) size 76x27 + RenderText {#text} at (2,2) size 77x27 text run at (2,2) width 6: " " - text run at (8,2) width 70: "bar baz" + text run at (8,2) width 71: "bar baz" caret: position 0 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/pruning-after-merge-2-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/pruning-after-merge-2-expected.txt index 0b521944a5f8..b3cef7dc8bdc 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/pruning-after-merge-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/pruning-after-merge-2-expected.txt @@ -12,20 +12,20 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 751x19 - text run at (0,0) width 631: "This tests to see if deletion correctly prunes the containers of the paragraph being moved during a merge. " - text run at (631,0) width 120: "You should see 'foo" - RenderInline {B} at (0,0) size 22x19 - RenderText {#text} at (751,0) size 22x19 - text run at (751,0) width 22: "bar" - RenderText {#text} at (773,0) size 776x39 - text run at (773,0) width 3: "'" - text run at (0,20) width 41: "below." + RenderText {#text} at (0,0) size 758x39 + text run at (0,0) width 662: "This tests to see if deletion correctly prunes the containers of the paragraph being moved during a merge. " + text run at (662,0) width 96: "You should see" + text run at (0,20) width 24: "'foo" + RenderInline {B} at (0,0) size 24x19 + RenderText {#text} at (24,20) size 24x19 + text run at (24,20) width 24: "bar" + RenderText {#text} at (48,20) size 49x19 + text run at (48,20) width 49: "' below." RenderBlock {DIV} at (0,56) size 784x20 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderInline {SPAN} at (0,0) size 22x19 - RenderText {#text} at (20,0) size 22x19 - text run at (20,0) width 22: "bar" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" + RenderInline {SPAN} at (0,0) size 24x19 + RenderText {#text} at (21,0) size 24x19 + text run at (21,0) width 24: "bar" caret: position 3 of child 0 {#text} of child 0 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/table-cells-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/table-cells-expected.txt index f9bcc8e7697b..8d36d4e186ac 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/table-cells-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/table-cells-expected.txt @@ -11,20 +11,20 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 685x19 - text run at (0,0) width 342: "This tests deletion of a selection that spans multiple cells. " - text run at (342,0) width 343: "Just table content should be removed, not table structure." + RenderText {#text} at (0,0) size 717x19 + text run at (0,0) width 361: "This tests deletion of a selection that spans multiple cells. " + text run at (361,0) width 356: "Just table content should be removed, not table structure." RenderBlock {DIV} at (0,36) size 784x30 - RenderTable {TABLE} at (0,0) size 326x30 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 324x28 - RenderTableRow {TR} at (0,2) size 324x24 - RenderTableCell {TD} at (2,2) size 151x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderBlock {DIV} at (2,2) size 147x20 - RenderText {#text} at (0,0) size 147x19 - text run at (0,0) width 147: "These two pieces of text" - RenderTableCell {TD} at (155,2) size 167x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] - RenderBlock {DIV} at (2,2) size 163x20 - RenderText {#text} at (0,0) size 163x19 + RenderTable {TABLE} at (0,0) size 343x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 341x28 + RenderTableRow {TR} at (0,2) size 341x24 + RenderTableCell {TD} at (2,2) size 157x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderBlock {DIV} at (2,2) size 153x20 + RenderText {#text} at (0,0) size 153x19 + text run at (0,0) width 153: "These two pieces of text" + RenderTableCell {TD} at (161,2) size 178x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderBlock {DIV} at (2,2) size 174x20 + RenderText {#text} at (0,0) size 174x19 text run at (0,0) width 4: " " - text run at (4,0) width 159: "should be in different cells." + text run at (4,0) width 170: "should be in different cells." caret: position 24 of child 0 {#text} of child 0 {DIV} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/deleting/type-delete-after-quote-expected.txt b/LayoutTests/platform/wincairo/editing/deleting/type-delete-after-quote-expected.txt index 88944d759f0f..e13c214b5790 100644 --- a/LayoutTests/platform/wincairo/editing/deleting/type-delete-after-quote-expected.txt +++ b/LayoutTests/platform/wincairo/editing/deleting/type-delete-after-quote-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {DIV} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 770x39 - text run at (0,0) width 770: "When your cursor is after an empty blockquote, hitting delete should bring the cursor (and the content following the cursor) back" - text run at (0,20) width 371: "into the blockquote, instead of deleting the empty blockquote." + RenderText {#text} at (0,0) size 775x39 + text run at (0,0) width 775: "When your cursor is after an empty blockquote, hitting delete should bring the cursor (and the content following the cursor)" + text run at (0,20) width 422: "back into the blockquote, instead of deleting the empty blockquote." RenderBlock {DIV} at (0,56) size 784x20 RenderBlock {BLOCKQUOTE} at (0,0) size 744x20 [color=#0000FF] [border: none (2px solid #0000FF)] - RenderText {#text} at (12,0) size 133x19 - text run at (12,0) width 133: "This should be quoted" + RenderText {#text} at (12,0) size 140x19 + text run at (12,0) width 140: "This should be quoted" caret: position 0 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/4580583-1-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/4580583-1-expected.txt index fbcb5d5aac54..74f8d3ded92b 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/4580583-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/4580583-1-expected.txt @@ -4,31 +4,31 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 754x39 - text run at (0,0) width 455: "This tests to make sure that breaking a quoted list doesn't renumber the list. " - text run at (455,0) width 299: "You should see a list broken in two below, the list" - text run at (0,20) width 159: "items numbered 1, 2, 3, 4." + RenderText {#text} at (0,0) size 764x39 + text run at (0,0) width 474: "This tests to make sure that breaking a quoted list doesn't renumber the list. " + text run at (474,0) width 290: "You should see a list broken in two below, the" + text run at (0,20) width 186: "list items numbered 1, 2, 3, 4." RenderBlock {DIV} at (0,56) size 784x132 RenderBlock {BLOCKQUOTE} at (2,0) size 742x40 [color=#0000FF] [border: none (2px solid #0000FF)] RenderBlock {OL} at (2,0) size 740x40 RenderListItem {LI} at (40,0) size 700x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 26x19 - text run at (0,0) width 26: "One" + RenderText {#text} at (0,0) size 27x19 + text run at (0,0) width 27: "One" RenderListItem {LI} at (40,20) size 700x20 RenderListMarker at (-21,0) size 16x19: "2" - RenderText {#text} at (0,0) size 28x19 - text run at (0,0) width 28: "Two" + RenderText {#text} at (0,0) size 29x19 + text run at (0,0) width 29: "Two" RenderBlock (anonymous) at (0,56) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderBlock {BLOCKQUOTE} at (2,92) size 742x40 [color=#0000FF] [border: none (2px solid #0000FF)] RenderBlock {OL} at (2,0) size 740x40 RenderListItem {LI} at (40,0) size 700x20 RenderListMarker at (-21,0) size 16x19: "3" - RenderText {#text} at (0,0) size 35x19 - text run at (0,0) width 35: "Three" + RenderText {#text} at (0,0) size 37x19 + text run at (0,0) width 37: "Three" RenderListItem {LI} at (40,20) size 700x20 RenderListMarker at (-21,0) size 16x19: "4" - RenderText {#text} at (0,0) size 29x19 - text run at (0,0) width 29: "Four" + RenderText {#text} at (0,0) size 30x19 + text run at (0,0) width 30: "Four" caret: position 0 of child 2 {BR} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/4580583-2-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/4580583-2-expected.txt index 08a28616a2d2..b45fdd3f5888 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/4580583-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/4580583-2-expected.txt @@ -4,35 +4,35 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 754x39 - text run at (0,0) width 455: "This tests to make sure that breaking a quoted list doesn't renumber the list. " - text run at (455,0) width 299: "You should see a list broken in two below, the list" - text run at (0,20) width 616: "items numbered 1, 2, 2, 3, 4. Two list items will be numbered '2' because the original item '2' was split." + RenderText {#text} at (0,0) size 764x39 + text run at (0,0) width 474: "This tests to make sure that breaking a quoted list doesn't renumber the list. " + text run at (474,0) width 290: "You should see a list broken in two below, the" + text run at (0,20) width 667: "list items numbered 1, 2, 2, 3, 4. Two list items will be numbered '2' because the original item '2' was split." RenderBlock {DIV} at (0,56) size 784x152 RenderBlock {BLOCKQUOTE} at (2,0) size 742x40 [color=#0000FF] [border: none (2px solid #0000FF)] RenderBlock {OL} at (2,0) size 740x40 RenderListItem {LI} at (40,0) size 700x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 26x19 - text run at (0,0) width 26: "One" + RenderText {#text} at (0,0) size 27x19 + text run at (0,0) width 27: "One" RenderListItem {LI} at (40,20) size 700x20 RenderListMarker at (-21,0) size 16x19: "2" - RenderText {#text} at (0,0) size 28x19 - text run at (0,0) width 28: "Two" + RenderText {#text} at (0,0) size 29x19 + text run at (0,0) width 29: "Two" RenderBlock (anonymous) at (0,56) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderBlock {BLOCKQUOTE} at (2,92) size 742x60 [color=#0000FF] [border: none (2px solid #0000FF)] RenderBlock {OL} at (2,0) size 740x60 RenderListItem {LI} at (40,0) size 700x20 RenderListMarker at (-21,0) size 16x19: "2" - RenderText {#text} at (0,0) size 28x19 - text run at (0,0) width 28: "Two" + RenderText {#text} at (0,0) size 29x19 + text run at (0,0) width 29: "Two" RenderListItem {LI} at (40,20) size 700x20 RenderListMarker at (-21,0) size 16x19: "3" - RenderText {#text} at (0,0) size 35x19 - text run at (0,0) width 35: "Three" + RenderText {#text} at (0,0) size 37x19 + text run at (0,0) width 37: "Three" RenderListItem {LI} at (40,40) size 700x20 RenderListMarker at (-21,0) size 16x19: "4" - RenderText {#text} at (0,0) size 29x19 - text run at (0,0) width 29: "Four" + RenderText {#text} at (0,0) size 30x19 + text run at (0,0) width 30: "Four" caret: position 0 of child 2 {BR} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/4641880-1-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/4641880-1-expected.txt index a6ea9d7389e3..8cf0970ec3f9 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/4641880-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/4641880-1-expected.txt @@ -12,19 +12,19 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 728x39 - text run at (0,0) width 493: "This tests InsertUnorderedList on a selection that ends at the start of a paragraph. " - text run at (493,0) width 235: "Since we don't paint the gap before the" - text run at (0,20) width 724: "paragraph for most selections like this, we don't perform InsertUnorderedList on the paragraph that the selection ends in." + RenderText {#text} at (0,0) size 756x39 + text run at (0,0) width 511: "This tests InsertUnorderedList on a selection that ends at the start of a paragraph. " + text run at (511,0) width 245: "Since we don't paint the gap before the" + text run at (0,20) width 756: "paragraph for most selections like this, we don't perform InsertUnorderedList on the paragraph that the selection ends in." RenderBlock {DIV} at (0,56) size 784x56 RenderBlock {UL} at (0,0) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 201x19 - text run at (0,0) width 201: "This paragraph should be in a list." + RenderText {#text} at (0,0) size 213x19 + text run at (0,0) width 213: "This paragraph should be in a list." RenderBlock (anonymous) at (0,36) size 784x20 - RenderText {#text} at (0,0) size 224x19 - text run at (0,0) width 224: "This paragraph should not be in a list." - RenderBR {BR} at (224,0) size 0x19 + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "This paragraph should not be in a list." + RenderBR {BR} at (237,0) size 0x19 selection start: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of body selection end: position 35 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/4641880-2-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/4641880-2-expected.txt index b48b7517410c..1702ff33fd74 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/4641880-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/4641880-2-expected.txt @@ -12,17 +12,17 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 763x39 - text run at (0,0) width 409: "This tests Indent on a selection that ends at the start of a paragraph. " - text run at (409,0) width 354: "Since we don't paint the gap before the paragraph for most" - text run at (0,20) width 521: "selections like this, we don't perform Indent on the paragraph that the selection ends in." + RenderText {#text} at (0,0) size 758x39 + text run at (0,0) width 424: "This tests Indent on a selection that ends at the start of a paragraph. " + text run at (424,0) width 334: "Since we don't paint the gap before the paragraph for" + text run at (0,20) width 580: "most selections like this, we don't perform Indent on the paragraph that the selection ends in." RenderBlock {DIV} at (0,56) size 784x40 RenderBlock {BLOCKQUOTE} at (40,0) size 744x20 - RenderText {#text} at (0,0) size 211x19 - text run at (0,0) width 211: "This paragraph should be indented." + RenderText {#text} at (0,0) size 222x19 + text run at (0,0) width 222: "This paragraph should be indented." RenderBlock (anonymous) at (0,20) size 784x20 - RenderText {#text} at (0,0) size 234x19 - text run at (0,0) width 234: "This paragraph should not be indented." - RenderBR {BR} at (234,0) size 0x19 + RenderText {#text} at (0,0) size 246x19 + text run at (0,0) width 246: "This paragraph should not be indented." + RenderBR {BR} at (246,0) size 0x19 selection start: position 1 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of body selection end: position 35 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/4747450-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/4747450-expected.txt index 8bf8fab0cdab..0942293dfd81 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/4747450-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/4747450-expected.txt @@ -4,16 +4,16 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 783x39 - text run at (0,0) width 275: "This test for a bug in Insert{Un}OrderedList. " - text run at (275,0) width 485: "Inside an empty editable region, a new paragraph is added, then a list is created. " - text run at (760,0) width 23: "The" - text run at (0,20) width 96: "caret should be " + RenderText {#text} at (0,0) size 737x39 + text run at (0,0) width 289: "This test for a bug in Insert{Un}OrderedList. " + text run at (289,0) width 448: "Inside an empty editable region, a new paragraph is added, then a list is" + text run at (0,20) width 53: "created. " + text run at (53,20) width 128: "The caret should be " RenderInline {B} at (0,0) size 39x19 - RenderText {#text} at (96,20) size 39x19 - text run at (96,20) width 39: "inside" - RenderText {#text} at (135,20) size 116x19 - text run at (135,20) width 116: " the empty list item." + RenderText {#text} at (181,20) size 39x19 + text run at (181,20) width 39: "inside" + RenderText {#text} at (220,20) size 123x19 + text run at (220,20) width 123: " the empty list item." RenderBlock {DIV} at (0,56) size 784x56 RenderBlock {DIV} at (0,0) size 784x20 RenderBR {BR} at (0,0) size 0x19 diff --git a/LayoutTests/platform/wincairo/editing/execCommand/4916402-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/4916402-expected.txt index 68458e542e25..bb07a91a7270 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/4916402-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/4916402-expected.txt @@ -4,15 +4,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 774x39 - text run at (0,0) width 774: "This tests to see that creating an ordered list item from the last list item in an unordered list creates a new list that is not a sublist of" - text run at (0,20) width 95: "the original one." + RenderText {#text} at (0,0) size 751x39 + text run at (0,0) width 751: "This tests to see that creating an ordered list item from the last list item in an unordered list creates a new list that is not a" + text run at (0,20) width 163: "sublist of the original one." RenderBlock {DIV} at (0,56) size 784x56 RenderBlock {UL} at (0,0) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" RenderBlock {OL} at (0,36) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-21,0) size 16x19: "1" diff --git a/LayoutTests/platform/wincairo/editing/execCommand/4916541-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/4916541-expected.txt index 701c9e725c88..935a135457ad 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/4916541-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/4916541-expected.txt @@ -4,16 +4,16 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 777x39 - text run at (0,0) width 358: "This tests selection preservation during an indent operation. " - text run at (358,0) width 419: "The selection should start and end in the same parts of the words 'foo'" - text run at (0,20) width 279: "and 'bar' before and after the indent operation." + RenderText {#text} at (0,0) size 783x39 + text run at (0,0) width 377: "This tests selection preservation during an indent operation. " + text run at (377,0) width 406: "The selection should start and end in the same parts of the words" + text run at (0,20) width 320: "'foo' and 'bar' before and after the indent operation." RenderBlock {DIV} at (0,56) size 784x40 RenderBlock {BLOCKQUOTE} at (40,0) size 744x40 - RenderInline {SPAN} at (0,0) size 20x19 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderBR {BR} at (20,0) size 0x19 + RenderInline {SPAN} at (0,0) size 21x19 + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" + RenderBR {BR} at (21,0) size 0x19 RenderInline {SPAN} at (0,0) size 20x19 RenderText {#text} at (0,20) size 20x19 text run at (0,20) width 20: "bar" diff --git a/LayoutTests/platform/wincairo/editing/execCommand/4924441-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/4924441-expected.txt index 25d55fc3c953..e62fefabf44b 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/4924441-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/4924441-expected.txt @@ -4,15 +4,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 782x39 - text run at (0,0) width 589: "This tests for a bug where changing the list type of an indented list would create unwanted nesting. " - text run at (589,0) width 193: "You should see a single ordered" - text run at (0,20) width 156: "list item in an indented list." + RenderText {#text} at (0,0) size 773x39 + text run at (0,0) width 625: "This tests for a bug where changing the list type of an indented list would create unwanted nesting. " + text run at (625,0) width 148: "You should see a single" + text run at (0,20) width 220: "ordered list item in an indented list." RenderBlock {DIV} at (0,56) size 784x20 RenderBlock {UL} at (0,0) size 784x20 RenderBlock {OL} at (40,0) size 744x20 RenderListItem {LI} at (40,0) size 704x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" caret: position 3 of child 0 {#text} of child 0 {LI} of child 0 {OL} of child 0 {UL} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5080333-1-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5080333-1-expected.txt index 17fc183b4931..42c269db4978 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5080333-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5080333-1-expected.txt @@ -3,19 +3,20 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 - RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 743x39 - text run at (0,0) width 742: "This tests for a bug where changing the alignment of an image would result in a selection that wasn't the one that was present" - text run at (0,20) width 175: "before the alignment change. " - text run at (175,20) width 568: "The image should be centered and the caret should be the same before and after the operation." - RenderBlock {DIV} at (0,56) size 784x143 + RenderBlock {P} at (0,0) size 784x60 + RenderText {#text} at (0,0) size 758x59 + text run at (0,0) width 737: "This tests for a bug where changing the alignment of an image would result in a selection that wasn't the one that was" + text run at (0,20) width 235: "present before the alignment change. " + text run at (235,20) width 523: "The image should be centered and the caret should be the same before and after the" + text run at (0,40) width 63: "operation." + RenderBlock {DIV} at (0,76) size 784x143 RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderBR {BR} at (20,0) size 0x19 + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" + RenderBR {BR} at (21,0) size 0x19 RenderBlock {DIV} at (0,20) size 784x103 RenderImage {IMG} at (354,0) size 76x103 RenderBlock (anonymous) at (0,123) size 784x20 - RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "baz" + RenderText {#text} at (0,0) size 22x19 + text run at (0,0) width 22: "baz" caret: position 0 of child 0 {IMG} of child 2 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5080333-2-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5080333-2-expected.txt index b4436e98c872..2c209c26d5a3 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5080333-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5080333-2-expected.txt @@ -3,20 +3,21 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 - RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 765x39 - text run at (0,0) width 742: "This tests for a bug where changing the alignment of an image would result in a selection that wasn't the one that was present" - text run at (0,20) width 175: "before the alignment change. " - text run at (175,20) width 590: "The image should be centered and the selection should be the same before and after the operation." - RenderBlock {DIV} at (0,56) size 784x143 + RenderBlock {P} at (0,0) size 784x60 + RenderText {#text} at (0,0) size 783x59 + text run at (0,0) width 737: "This tests for a bug where changing the alignment of an image would result in a selection that wasn't the one that was" + text run at (0,20) width 235: "present before the alignment change. " + text run at (235,20) width 548: "The image should be centered and the selection should be the same before and after the" + text run at (0,40) width 63: "operation." + RenderBlock {DIV} at (0,76) size 784x143 RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderBR {BR} at (20,0) size 0x19 + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" + RenderBR {BR} at (21,0) size 0x19 RenderBlock {DIV} at (0,20) size 784x103 RenderImage {IMG} at (354,0) size 76x103 RenderBlock (anonymous) at (0,123) size 784x20 - RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "baz" + RenderText {#text} at (0,0) size 22x19 + text run at (0,0) width 22: "baz" selection start: position 0 of child 0 {IMG} of child 2 {DIV} of child 2 {DIV} of body selection end: position 1 of child 0 {IMG} of child 2 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5136770-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5136770-expected.txt index d65d4f157b8f..9f304d99ba37 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5136770-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5136770-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "This tests for a hang when performing InsertUnorderedList." + RenderText {#text} at (0,0) size 375x19 + text run at (0,0) width 375: "This tests for a hang when performing InsertUnorderedList." RenderBlock {DIV} at (0,36) size 784x96 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 331x19 - text run at (0,0) width 331: "There should be two empty unordered list items below." + RenderText {#text} at (0,0) size 346x19 + text run at (0,0) width 346: "There should be two empty unordered list items below." RenderBlock {DIV} at (0,36) size 784x60 RenderBlock {UL} at (0,0) size 784x60 RenderListItem {LI} at (40,0) size 744x20 @@ -20,7 +20,7 @@ layer at (0,0) size 800x600 RenderBR {BR} at (0,0) size 0x19 RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 224x19 - text run at (0,0) width 224: "This should be an unordered list item." + RenderText {#text} at (0,0) size 237x19 + text run at (0,0) width 237: "This should be an unordered list item." selection start: position 0 of child 0 {BR} of child 0 {LI} of child 0 {UL} of child 3 {DIV} of child 2 {DIV} of body selection end: position 38 of child 0 {#text} of child 2 {LI} of child 0 {UL} of child 3 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5138441-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5138441-expected.txt index 59aaaa8161b6..bca08fdc1d04 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5138441-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5138441-expected.txt @@ -4,17 +4,17 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x60 - RenderText {#text} at (0,0) size 782x59 - text run at (0,0) width 471: "This tests for a bug where indented text would appear quoted in GoogleDocs. " - text run at (471,0) width 311: "Google docs uses blockquotes and FormatBlock to" - text run at (0,20) width 725: "implement a \"Quote Text\" feature, and style rules for blockquotes appeared on the blockquotes that we use to implement" - text run at (0,40) width 57: "indenting." + RenderText {#text} at (0,0) size 775x59 + text run at (0,0) width 493: "This tests for a bug where indented text would appear quoted in GoogleDocs. " + text run at (493,0) width 218: "Google docs uses blockquotes and" + text run at (0,20) width 775: "FormatBlock to implement a \"Quote Text\" feature, and style rules for blockquotes appeared on the blockquotes that we use" + text run at (0,40) width 149: "to implement indenting." RenderBlock {DIV} at (0,76) size 784x66 RenderBlock {BLOCKQUOTE} at (40,0) size 744x20 RenderBlock {DIV} at (0,0) size 744x20 - RenderText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "This should be indented, not quoted." + RenderText {#text} at (0,0) size 230x19 + text run at (0,0) width 230: "This should be indented, not quoted." RenderBlock {BLOCKQUOTE} at (8,28) size 768x38 [border: (1px dashed #AAAAAA)] - RenderText {#text} at (9,9) size 167x19 - text run at (9,9) width 167: "This text should be Quoted." + RenderText {#text} at (9,9) size 175x19 + text run at (9,9) width 175: "This text should be Quoted." caret: position 0 of child 0 {#text} of child 0 {DIV} of child 1 {BLOCKQUOTE} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5142012-1-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5142012-1-expected.txt index 27af7483635e..2961ab0cb429 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5142012-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5142012-1-expected.txt @@ -3,24 +3,25 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 763x19 - text run at (0,0) width 419: "This tests for a bug when removing links from a selection with Unlink. " - text run at (419,0) width 344: "There shouldn't be any links *inside the selection* below." - RenderBlock {DIV} at (0,36) size 784x40 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 766x39 + text run at (0,0) width 449: "This tests for a bug when removing links from a selection with Unlink. " + text run at (449,0) width 317: "There shouldn't be any links *inside the selection*" + text run at (0,20) width 42: "below." + RenderBlock {DIV} at (0,56) size 784x40 RenderBlock (anonymous) at (0,0) size 784x0 RenderBlock {DIV} at (0,0) size 784x20 - RenderInline {A} at (0,0) size 21x19 [color=#0000EE] - RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "Hel" - RenderInline {SPAN} at (0,0) size 11x19 - RenderText {#text} at (21,0) size 11x19 - text run at (21,0) width 11: "lo" + RenderInline {A} at (0,0) size 23x19 [color=#0000EE] + RenderText {#text} at (0,0) size 23x19 + text run at (0,0) width 23: "Hel" + RenderInline {SPAN} at (0,0) size 12x19 + RenderText {#text} at (23,0) size 12x19 + text run at (23,0) width 12: "lo" RenderBlock {DIV} at (0,20) size 784x20 RenderInline {SPAN} at (0,0) size 15x19 RenderText {#text} at (0,0) size 15x19 text run at (0,0) width 15: "W" - RenderText {#text} at (15,0) size 29x19 - text run at (15,0) width 29: "orld!" + RenderText {#text} at (15,0) size 30x19 + text run at (15,0) width 30: "orld!" selection start: position 0 of child 0 {#text} of child 1 {SPAN} of child 0 {DIV} of child 2 {DIV} of body selection end: position 1 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5142012-2-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5142012-2-expected.txt index 62d2a01cbb02..3e296f9acbb0 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5142012-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5142012-2-expected.txt @@ -6,10 +6,10 @@ layer at (0,0) size 800x600 RenderBlock {UL} at (0,0) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderInline {A} at (0,0) size 696x19 [color=#0000EE] - RenderText {#text} at (0,0) size 696x19 - text run at (0,0) width 318: "This tests for a crash when creating a list from a link. " - text run at (318,0) width 378: "This paragraph should be a link and should be inside a list item." + RenderInline {A} at (0,0) size 736x19 [color=#0000EE] + RenderText {#text} at (0,0) size 736x19 + text run at (0,0) width 336: "This tests for a crash when creating a list from a link. " + text run at (336,0) width 400: "This paragraph should be a link and should be inside a list item." RenderText {#text} at (0,0) size 0x0 selection start: position 0 of child 0 {#text} of child 0 {A} of child 0 {LI} of child 0 {UL} of body selection end: position 123 of child 0 {#text} of child 0 {A} of child 0 {LI} of child 0 {UL} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5190926-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5190926-expected.txt index 28cb145f0748..e1b0773c3119 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5190926-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5190926-expected.txt @@ -6,18 +6,18 @@ layer at (0,0) size 800x600 RenderBlock {OL} at (0,0) size 784x60 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderInline {U} at (0,0) size 468x19 - RenderText {#text} at (0,0) size 468x19 - text run at (0,0) width 468: "This tests for a crash when making and removing lists from underlined content." + RenderInline {U} at (0,0) size 497x19 + RenderText {#text} at (0,0) size 497x19 + text run at (0,0) width 497: "This tests for a crash when making and removing lists from underlined content." RenderListItem {LI} at (40,20) size 744x20 RenderListMarker at (-21,0) size 16x19: "2" - RenderInline {U} at (0,0) size 257x19 - RenderText {#text} at (0,0) size 257x19 - text run at (0,0) width 257: "All three paragraphs should be in list items." + RenderInline {U} at (0,0) size 272x19 + RenderText {#text} at (0,0) size 272x19 + text run at (0,0) width 272: "All three paragraphs should be in list items." RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-21,0) size 16x19: "3" - RenderInline {U} at (0,0) size 209x19 - RenderText {#text} at (0,0) size 209x19 - text run at (0,0) width 209: "And all three should be underlined." + RenderInline {U} at (0,0) size 222x19 + RenderText {#text} at (0,0) size 222x19 + text run at (0,0) width 222: "And all three should be underlined." selection start: position 0 of child 0 {#text} of child 0 {U} of child 0 {LI} of child 0 {OL} of body selection end: position 35 of child 0 {#text} of child 0 {U} of child 2 {LI} of child 0 {OL} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5481523-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5481523-expected.txt index 31b85db7ffea..b13e2476521a 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5481523-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5481523-expected.txt @@ -3,28 +3,29 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 750x19 - text run at (0,0) width 382: "This tests for a hang when indenting a fully selected table twice. " - text run at (382,0) width 368: "You should see a twice indented table, with four cells, below." - RenderBlock {DIV} at (0,36) size 784x56 + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 746x39 + text run at (0,0) width 407: "This tests for a hang when indenting a fully selected table twice. " + text run at (407,0) width 339: "You should see a twice indented table, with four cells," + text run at (0,20) width 42: "below." + RenderBlock {DIV} at (0,56) size 784x56 RenderBlock {BLOCKQUOTE} at (40,0) size 744x56 RenderBlock {BLOCKQUOTE} at (40,0) size 704x56 - RenderTable {TABLE} at (0,0) size 80x56 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 78x54 - RenderTableRow {TR} at (0,2) size 78x24 - RenderTableCell {TD} at (2,2) size 39x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 26x19 - text run at (2,2) width 26: "One" - RenderTableCell {TD} at (43,2) size 33x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (2,2) size 28x19 - text run at (2,2) width 28: "Two" - RenderTableRow {TR} at (0,28) size 78x24 - RenderTableCell {TD} at (2,28) size 39x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 35x19 - text run at (2,2) width 35: "Three" - RenderTableCell {TD} at (43,28) size 33x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderTable {TABLE} at (0,0) size 83x56 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 81x54 + RenderTableRow {TR} at (0,2) size 81x24 + RenderTableCell {TD} at (2,2) size 41x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 27x19 + text run at (2,2) width 27: "One" + RenderTableCell {TD} at (45,2) size 34x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] RenderText {#text} at (2,2) size 29x19 - text run at (2,2) width 29: "Four" + text run at (2,2) width 29: "Two" + RenderTableRow {TR} at (0,28) size 81x24 + RenderTableCell {TD} at (2,28) size 41x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 37x19 + text run at (2,2) width 37: "Three" + RenderTableCell {TD} at (45,28) size 34x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] + RenderText {#text} at (2,2) size 30x19 + text run at (2,2) width 30: "Four" selection start: position 0 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of body selection end: position 2 of child 0 {TABLE} of child 0 {BLOCKQUOTE} of child 1 {BLOCKQUOTE} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5482023-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5482023-expected.txt index 91bf3626fd0b..0a827510e7e3 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5482023-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5482023-expected.txt @@ -4,9 +4,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x571 RenderBlock {H1} at (0,0) size 784x111 - RenderText {#text} at (0,0) size 778x110 - text run at (0,0) width 731: "This tests for a bug when performing a FormatBlock " - text run at (0,37) width 511: "inside a body with no visible content. " - text run at (511,37) width 267: "This text should be " + RenderText {#text} at (0,0) size 779x110 + text run at (0,0) width 729: "This tests for a bug when performing a FormatBlock " + text run at (0,37) width 512: "inside a body with no visible content. " + text run at (512,37) width 267: "This text should be " text run at (0,74) width 287: "inside an h1 element." caret: position 132 of child 0 {#text} of child 0 {H1} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/5569741-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/5569741-expected.txt index 574e47b44015..63da684a9c97 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/5569741-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/5569741-expected.txt @@ -4,15 +4,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 643x19 - text run at (0,0) width 643: "This tests for a bug where hitting return inside an empty paragraph in a non-empty list item would remove it." + RenderText {#text} at (0,0) size 681x19 + text run at (0,0) width 681: "This tests for a bug where hitting return inside an empty paragraph in a non-empty list item would remove it." RenderBlock {DIV} at (0,36) size 784x60 RenderBlock {UL} at (0,0) size 784x60 RenderListItem {LI} at (40,0) size 744x40 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderBR {BR} at (20,0) size 0x19 + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" + RenderBR {BR} at (21,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet diff --git a/LayoutTests/platform/wincairo/editing/execCommand/create-list-with-hr-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/create-list-with-hr-expected.txt index 11312f1bdb3d..076673bee053 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/create-list-with-hr-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/create-list-with-hr-expected.txt @@ -10,14 +10,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 487x19 - text run at (0,0) width 487: "This test pushes a horizontal rule into an unordered list with InsertUnorderedList. " - RenderInline {B} at (0,0) size 264x19 - RenderText {#text} at (487,0) size 264x19 - text run at (487,0) width 264: "This demonstrates what might be a bug:" - RenderText {#text} at (751,0) size 773x39 - text run at (751,0) width 22: " the" - text run at (0,20) width 378: "horizontal rule appears before the list marker in the render tree." + RenderText {#text} at (0,0) size 514x19 + text run at (0,0) width 514: "This test pushes a horizontal rule into an unordered list with InsertUnorderedList. " + RenderInline {B} at (0,0) size 751x39 + RenderText {#text} at (514,0) size 751x39 + text run at (514,0) width 237: "This demonstrates what might be a" + text run at (0,20) width 31: "bug:" + RenderText {#text} at (31,20) size 421x19 + text run at (31,20) width 421: " the horizontal rule appears before the list marker in the render tree." RenderBlock {DIV} at (0,56) size 784x30 RenderBlock {UL} at (0,0) size 784x30 RenderListItem {LI} at (40,0) size 744x30 diff --git a/LayoutTests/platform/wincairo/editing/execCommand/findString-2-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/findString-2-expected.txt index 2ca41bd4404f..4ef51f4d5800 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/findString-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/findString-2-expected.txt @@ -8,16 +8,17 @@ layer at (0,0) size 800x600 layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 - RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 764x19 - text run at (0,0) width 764: "This tests to see if Find will get stuck when searching for a word that is currently selected, and was selected with a double click." - RenderBlock {DIV} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 24x19 - text run at (0,0) width 24: "foo " + RenderBlock {P} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 765x39 + text run at (0,0) width 765: "This tests to see if Find will get stuck when searching for a word that is currently selected, and was selected with a double" + text run at (0,20) width 34: "click." + RenderBlock {DIV} at (0,56) size 784x20 + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "foo " RenderInline {SPAN} at (0,0) size 20x19 - RenderText {#text} at (24,0) size 20x19 - text run at (24,0) width 20: "bar" - RenderText {#text} at (44,0) size 98x19 - text run at (44,0) width 98: " baz foo bar baz" + RenderText {#text} at (25,0) size 20x19 + text run at (25,0) width 20: "bar" + RenderText {#text} at (45,0) size 101x19 + text run at (45,0) width 101: " baz foo bar baz" selection start: position 9 of child 2 {#text} of child 2 {DIV} of body selection end: position 12 of child 2 {#text} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/findString-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/findString-expected.txt index e245f885700b..80d821eacd48 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/findString-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/findString-expected.txt @@ -7,15 +7,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 339x19 - text run at (0,0) width 339: "In the block below, the second 'bar ' should be selected." + RenderText {#text} at (0,0) size 349x19 + text run at (0,0) width 349: "In the block below, the second 'bar ' should be selected." RenderBlock {DIV} at (0,36) size 52x42 [border: (1px solid #000000)] - RenderText {#text} at (1,1) size 44x19 - text run at (1,1) width 44: "foo bar" + RenderText {#text} at (1,1) size 45x19 + text run at (1,1) width 45: "foo bar" RenderInline {SPAN} at (0,0) size 20x19 RenderText {#text} at (1,21) size 20x19 text run at (1,21) width 20: "bar" - RenderText {#text} at (21,21) size 25x19 - text run at (21,21) width 25: " baz" + RenderText {#text} at (21,21) size 26x19 + text run at (21,21) width 26: " baz" selection start: position 0 of child 0 {#text} of child 1 {SPAN} of child 2 {DIV} of body selection end: position 1 of child 2 {#text} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/indent-empty-root-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/indent-empty-root-expected.txt index 7821ec2a31c4..d2757ac8891c 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/indent-empty-root-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/indent-empty-root-expected.txt @@ -10,8 +10,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 276x19 - text run at (0,0) width 276: "This tests Indent in an empty editable element." + RenderText {#text} at (0,0) size 291x19 + text run at (0,0) width 291: "This tests Indent in an empty editable element." RenderBlock {DIV} at (0,36) size 784x20 RenderBlock {BLOCKQUOTE} at (40,0) size 744x20 RenderBR {BR} at (0,0) size 0x19 diff --git a/LayoutTests/platform/wincairo/editing/execCommand/indent-list-item-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/indent-list-item-expected.txt index 3bdb78343177..15c8d321d745 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/indent-list-item-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/indent-list-item-expected.txt @@ -10,8 +10,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 359x19 - text run at (0,0) width 359: "This test uses the execCommand to Outdent the text below." + RenderText {#text} at (0,0) size 373x19 + text run at (0,0) width 373: "This test uses the execCommand to Outdent the text below." RenderBlock (anonymous) at (0,20) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderBlock {DIV} at (0,56) size 784x60 @@ -23,10 +23,10 @@ layer at (0,0) size 800x600 RenderBlock {UL} at (40,20) size 744x20 RenderListItem {LI} at (40,0) size 704x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 22x19 - text run at (0,0) width 22: "Bar" + RenderText {#text} at (0,0) size 23x19 + text run at (0,0) width 23: "Bar" RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 23x19 - text run at (0,0) width 23: "Baz" + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "Baz" caret: position 0 of child 0 {#text} of child 0 {LI} of child 3 {UL} of child 1 {UL} of child 4 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/indent-selection-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/indent-selection-expected.txt index 4c61ff995c6b..308415fa4ee1 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/indent-selection-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/indent-selection-expected.txt @@ -11,22 +11,22 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 346x19 - text run at (0,0) width 346: "This test uses the execCommand to indent the text below." + RenderText {#text} at (0,0) size 361x19 + text run at (0,0) width 361: "This test uses the execCommand to indent the text below." RenderBlock (anonymous) at (0,20) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderBlock {DIV} at (0,40) size 784x212 RenderBlock {BLOCKQUOTE} at (40,0) size 744x60 RenderBlock (anonymous) at (0,0) size 744x40 - RenderInline {SPAN} at (0,0) size 40x19 - RenderText {#text} at (0,0) size 40x19 - text run at (0,0) width 40: "Lorem" - RenderBR {BR} at (40,0) size 0x19 - RenderText {#text} at (0,20) size 80x19 - text run at (0,20) width 80: "more Lorem!" + RenderInline {SPAN} at (0,0) size 42x19 + RenderText {#text} at (0,0) size 42x19 + text run at (0,0) width 42: "Lorem" + RenderBR {BR} at (42,0) size 0x19 + RenderText {#text} at (0,20) size 83x19 + text run at (0,20) width 83: "more Lorem!" RenderBlock {BLOCKQUOTE} at (40,40) size 704x20 - RenderText {#text} at (0,0) size 35x19 - text run at (0,0) width 35: "ipsum" + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "ipsum" RenderBlock {BLOCKQUOTE} at (40,76) size 744x60 RenderBlock {UL} at (0,0) size 744x60 RenderBlock {UL} at (40,0) size 704x60 @@ -36,22 +36,22 @@ layer at (0,0) size 800x600 text run at (0,0) width 25: "Foo" RenderListItem {LI} at (40,20) size 664x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 22x19 - text run at (0,0) width 22: "Bar" + RenderText {#text} at (0,0) size 23x19 + text run at (0,0) width 23: "Bar" RenderListItem {LI} at (40,40) size 664x20 RenderListMarker at (-18,0) size 7x19: white bullet - RenderText {#text} at (0,0) size 23x19 - text run at (0,0) width 23: "Baz" + RenderText {#text} at (0,0) size 25x19 + text run at (0,0) width 25: "Baz" RenderBlock {BLOCKQUOTE} at (40,152) size 744x60 RenderBlock {BLOCKQUOTE} at (40,0) size 704x20 - RenderText {#text} at (0,0) size 35x19 - text run at (0,0) width 35: "Dolor" + RenderText {#text} at (0,0) size 37x19 + text run at (0,0) width 37: "Dolor" RenderBlock (anonymous) at (0,20) size 744x40 - RenderText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "Sum!" - RenderBR {BR} at (32,0) size 0x19 - RenderInline {SPAN} at (0,0) size 33x19 - RenderText {#text} at (0,20) size 33x19 - text run at (0,20) width 33: "Thing" + RenderText {#text} at (0,0) size 34x19 + text run at (0,0) width 34: "Sum!" + RenderBR {BR} at (34,0) size 0x19 + RenderInline {SPAN} at (0,0) size 38x19 + RenderText {#text} at (0,20) size 38x19 + text run at (0,20) width 38: "Thing" selection start: position 0 of child 0 {#text} of child 0 {SPAN} of child 1 {BLOCKQUOTE} of child 4 {DIV} of body selection end: position 5 of child 0 {#text} of child 3 {SPAN} of child 3 {BLOCKQUOTE} of child 4 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/insert-list-and-stitch-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/insert-list-and-stitch-expected.txt index 3e8d0786c7c4..28eb71acd034 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/insert-list-and-stitch-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/insert-list-and-stitch-expected.txt @@ -18,21 +18,21 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 584x19 - text run at (0,0) width 584: "The three items below should be stitched together into one ordered list when you click the button." + RenderText {#text} at (0,0) size 613x19 + text run at (0,0) width 613: "The three items below should be stitched together into one ordered list when you click the button." RenderBlock {DIV} at (0,36) size 784x60 RenderBlock {DIV} at (0,0) size 784x60 RenderBlock {OL} at (0,0) size 784x60 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" RenderListItem {LI} at (40,20) size 744x20 RenderListMarker at (-21,0) size 16x19: "2" RenderText {#text} at (0,0) size 20x19 text run at (0,0) width 20: "bar" RenderListItem {LI} at (40,40) size 744x20 RenderListMarker at (-21,0) size 16x19: "3" - RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "baz" + RenderText {#text} at (0,0) size 22x19 + text run at (0,0) width 22: "baz" caret: position 0 of child 0 {#text} of child 2 {LI} of child 0 {OL} of child 1 {DIV} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/insertImage-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/insertImage-expected.txt index 31a3b822d259..52ce2e5cb79e 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/insertImage-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/insertImage-expected.txt @@ -13,10 +13,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 763x39 - text run at (0,0) width 294: "This is a test of execCommand(InsertImage, ...). " - text run at (294,0) width 469: "The first test passes execCommand a path to a valid image, the second passes" - text run at (0,20) width 309: "execCommand a path where no image should exist." + RenderText {#text} at (0,0) size 748x39 + text run at (0,0) width 306: "This is a test of execCommand(InsertImage, ...). " + text run at (306,0) width 442: "The first test passes execCommand a path to a valid image, the second" + text run at (0,20) width 369: "passes execCommand a path where no image should exist." RenderBlock {DIV} at (0,56) size 784x103 RenderImage {IMG} at (0,0) size 76x103 RenderImage {IMG} at (76,99) size 4x4 diff --git a/LayoutTests/platform/wincairo/editing/execCommand/nsresponder-indent-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/nsresponder-indent-expected.txt index 256fdcf1d4ab..34ebbc5c09a3 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/nsresponder-indent-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/nsresponder-indent-expected.txt @@ -10,11 +10,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 510x19 - text run at (0,0) width 269: "This tests the NSResponder method indent:. " - text run at (269,0) width 241: "You should see an indented 'foo' below." + RenderText {#text} at (0,0) size 531x19 + text run at (0,0) width 281: "This tests the NSResponder method indent:. " + text run at (281,0) width 250: "You should see an indented 'foo' below." RenderBlock {DIV} at (0,36) size 784x20 RenderBlock {BLOCKQUOTE} at (40,0) size 744x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" caret: position 0 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/nsresponder-outdent-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/nsresponder-outdent-expected.txt index d176357b6ab5..b32fe61fa03f 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/nsresponder-outdent-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/nsresponder-outdent-expected.txt @@ -10,11 +10,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 432x19 - text run at (0,0) width 187: "This tests the outdent: method. " - text run at (187,0) width 245: "You should see an undented 'foo' below." + RenderText {#text} at (0,0) size 450x19 + text run at (0,0) width 196: "This tests the outdent: method. " + text run at (196,0) width 254: "You should see an undented 'foo' below." RenderBlock {DIV} at (0,36) size 784x20 RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" caret: position 0 of child 0 {#text} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/paste-1-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/paste-1-expected.txt index 69e8f4bc17da..9d34d612a2cf 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/paste-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/paste-1-expected.txt @@ -20,9 +20,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 487x19 - text run at (0,0) width 270: "This tests cut/paste inside an editable iframe. " - text run at (270,0) width 217: "You should see 'foo bar baz' below." + RenderText {#text} at (0,0) size 506x19 + text run at (0,0) width 283: "This tests cut/paste inside an editable iframe. " + text run at (283,0) width 223: "You should see 'foo bar baz' below." RenderBlock (anonymous) at (0,36) size 784x154 RenderIFrame {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)] layer at (0,0) size 300x150 @@ -30,6 +30,6 @@ layer at (0,0) size 800x600 layer at (0,0) size 300x150 RenderBlock {HTML} at (0,0) size 300x150 RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0] - RenderText {#text} at (0,0) size 69x19 - text run at (0,0) width 69: "foo bar baz" + RenderText {#text} at (0,0) size 71x19 + text run at (0,0) width 71: "foo bar baz" RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/editing/execCommand/print-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/print-expected.txt index b984fa7e9f25..fa365cd6fb9a 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/print-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/print-expected.txt @@ -8,32 +8,32 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x356 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x56 - RenderInline {SPAN} at (0,0) size 757x55 - RenderText {#text} at (0,0) size 757x55 - text run at (0,0) width 757: "\"The quick brown fox jumps over the lazy dog\" uses every letter in the english " - text run at (0,28) width 91: "language." + RenderInline {SPAN} at (0,0) size 693x55 + RenderText {#text} at (0,0) size 693x55 + text run at (0,0) width 693: "\"The quick brown fox jumps over the lazy dog\" uses every letter in the " + text run at (0,28) width 170: "english language." RenderBlock (anonymous) at (14,94) size 756x224 RenderBlock {P} at (0,0) size 756x224 RenderText {#text} at (0,0) size 761x223 - text run at (0,0) width 457: "Here's to the crazy ones, the misfits, the rebels, " - text run at (457,0) width 191: "the trouble makers, " - text run at (648,0) width 98: "the round " - text run at (0,28) width 240: "pegs in the square holes, " - text run at (240,28) width 346: "the ones who see things differently. " - text run at (586,28) width 175: "There not fond of " - text run at (0,56) width 483: "rules, and they have no respect for the status quo, " - text run at (483,56) width 196: "you can quote then, " - text run at (0,84) width 193: "disagree with them, " - text run at (193,84) width 211: "glorify or vilify them, " - text run at (404,84) width 342: "about the only thing you can't do is " - text run at (0,112) width 126: "ignore them. " - text run at (126,112) width 278: "Because they change things. " - text run at (404,112) width 348: "They push the human race forward. " - text run at (0,140) width 475: "And while some may see them as the crazy ones, " - text run at (475,140) width 144: "we see genius. " - text run at (619,140) width 123: "Because the " - text run at (0,168) width 626: "people who are crazy enough to think they can change the world " - text run at (626,168) width 122: "are the ones " + text run at (0,0) width 462: "Here's to the crazy ones, the misfits, the rebels, " + text run at (462,0) width 193: "the trouble makers, " + text run at (655,0) width 98: "the round " + text run at (0,28) width 243: "pegs in the square holes, " + text run at (243,28) width 348: "the ones who see things differently. " + text run at (591,28) width 150: "There not fond " + text run at (0,56) width 510: "of rules, and they have no respect for the status quo, " + text run at (510,56) width 196: "you can quote then, " + text run at (0,84) width 197: "disagree with them, " + text run at (197,84) width 218: "glorify or vilify them, " + text run at (415,84) width 346: "about the only thing you can't do is " + text run at (0,112) width 129: "ignore them. " + text run at (129,112) width 281: "Because they change things. " + text run at (410,112) width 350: "They push the human race forward. " + text run at (0,140) width 481: "And while some may see them as the crazy ones, " + text run at (481,140) width 146: "we see genius. " + text run at (627,140) width 123: "Because the " + text run at (0,168) width 632: "people who are crazy enough to think they can change the world " + text run at (632,168) width 122: "are the ones " text run at (0,196) width 77: "who do." RenderBlock (anonymous) at (14,342) size 756x0 RenderInline {SPAN} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/editing/execCommand/remove-list-from-range-selection-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/remove-list-from-range-selection-expected.txt index 67716d179635..dbd85d9211e2 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/remove-list-from-range-selection-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/remove-list-from-range-selection-expected.txt @@ -10,26 +10,26 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 499x19 - text run at (0,0) width 499: "This tests Insert{Un}OrderedList on a range selection that is entirely within one list." + RenderText {#text} at (0,0) size 528x19 + text run at (0,0) width 528: "This tests Insert{Un}OrderedList on a range selection that is entirely within one list." RenderBlock {DIV} at (0,36) size 784x116 RenderBlock (anonymous) at (0,0) size 784x80 - RenderText {#text} at (0,0) size 72x19 - text run at (0,0) width 72: "None of the" - RenderBR {BR} at (72,0) size 0x19 - RenderText {#text} at (0,20) size 97x19 - text run at (0,20) width 97: "selected content" - RenderBR {BR} at (97,20) size 0x19 - RenderText {#text} at (0,40) size 58x19 - text run at (0,40) width 58: "should be" - RenderBR {BR} at (58,40) size 0x19 - RenderText {#text} at (0,60) size 45x19 - text run at (0,60) width 45: "in a list." - RenderBR {BR} at (45,60) size 0x19 + RenderText {#text} at (0,0) size 75x19 + text run at (0,0) width 75: "None of the" + RenderBR {BR} at (75,0) size 0x19 + RenderText {#text} at (0,20) size 100x19 + text run at (0,20) width 100: "selected content" + RenderBR {BR} at (100,20) size 0x19 + RenderText {#text} at (0,40) size 61x19 + text run at (0,40) width 61: "should be" + RenderBR {BR} at (61,40) size 0x19 + RenderText {#text} at (0,60) size 49x19 + text run at (0,60) width 49: "in a list." + RenderBR {BR} at (49,60) size 0x19 RenderBlock {OL} at (0,96) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-21,0) size 16x19: "1" - RenderText {#text} at (0,0) size 300x19 - text run at (0,0) width 300: "This should be in a list and should not be selected." + RenderText {#text} at (0,0) size 316x19 + text run at (0,0) width 316: "This should be in a list and should not be selected." selection start: position 2 of child 0 {#text} of child 2 {DIV} of body selection end: position 2 of child 6 {#text} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/remove-list-item-1-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/remove-list-item-1-expected.txt index 3323e9ad1af1..b825729ba19c 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/remove-list-item-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/remove-list-item-1-expected.txt @@ -10,12 +10,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "Outdenting a sublist should remove one level." + RenderText {#text} at (0,0) size 288x19 + text run at (0,0) width 288: "Outdenting a sublist should remove one level." RenderBlock {DIV} at (0,36) size 784x20 RenderBlock {UL} at (0,0) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" caret: position 0 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/execCommand/selectAll-expected.txt b/LayoutTests/platform/wincairo/editing/execCommand/selectAll-expected.txt index 7f35105aaa10..aef8dee05902 100644 --- a/LayoutTests/platform/wincairo/editing/execCommand/selectAll-expected.txt +++ b/LayoutTests/platform/wincairo/editing/execCommand/selectAll-expected.txt @@ -10,32 +10,32 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x356 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x56 - RenderInline {SPAN} at (0,0) size 757x55 - RenderText {#text} at (0,0) size 757x55 - text run at (0,0) width 757: "\"The quick brown fox jumps over the lazy dog\" uses every letter in the english " - text run at (0,28) width 91: "language." + RenderInline {SPAN} at (0,0) size 693x55 + RenderText {#text} at (0,0) size 693x55 + text run at (0,0) width 693: "\"The quick brown fox jumps over the lazy dog\" uses every letter in the " + text run at (0,28) width 170: "english language." RenderBlock (anonymous) at (14,94) size 756x224 RenderBlock {P} at (0,0) size 756x224 RenderText {#text} at (0,0) size 761x223 - text run at (0,0) width 457: "Here's to the crazy ones, the misfits, the rebels, " - text run at (457,0) width 191: "the trouble makers, " - text run at (648,0) width 98: "the round " - text run at (0,28) width 240: "pegs in the square holes, " - text run at (240,28) width 346: "the ones who see things differently. " - text run at (586,28) width 175: "There not fond of " - text run at (0,56) width 483: "rules, and they have no respect for the status quo, " - text run at (483,56) width 196: "you can quote then, " - text run at (0,84) width 193: "disagree with them, " - text run at (193,84) width 211: "glorify or vilify them, " - text run at (404,84) width 342: "about the only thing you can't do is " - text run at (0,112) width 126: "ignore them. " - text run at (126,112) width 278: "Because they change things. " - text run at (404,112) width 348: "They push the human race forward. " - text run at (0,140) width 475: "And while some may see them as the crazy ones, " - text run at (475,140) width 144: "we see genius. " - text run at (619,140) width 123: "Because the " - text run at (0,168) width 626: "people who are crazy enough to think they can change the world " - text run at (626,168) width 122: "are the ones " + text run at (0,0) width 462: "Here's to the crazy ones, the misfits, the rebels, " + text run at (462,0) width 193: "the trouble makers, " + text run at (655,0) width 98: "the round " + text run at (0,28) width 243: "pegs in the square holes, " + text run at (243,28) width 348: "the ones who see things differently. " + text run at (591,28) width 150: "There not fond " + text run at (0,56) width 510: "of rules, and they have no respect for the status quo, " + text run at (510,56) width 196: "you can quote then, " + text run at (0,84) width 197: "disagree with them, " + text run at (197,84) width 218: "glorify or vilify them, " + text run at (415,84) width 346: "about the only thing you can't do is " + text run at (0,112) width 129: "ignore them. " + text run at (129,112) width 281: "Because they change things. " + text run at (410,112) width 350: "They push the human race forward. " + text run at (0,140) width 481: "And while some may see them as the crazy ones, " + text run at (481,140) width 146: "we see genius. " + text run at (627,140) width 123: "Because the " + text run at (0,168) width 632: "people who are crazy enough to think they can change the world " + text run at (632,168) width 122: "are the ones " text run at (0,196) width 77: "who do." RenderBlock (anonymous) at (14,342) size 756x0 RenderInline {SPAN} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/editing/input/caret-at-the-edge-of-contenteditable-expected.txt b/LayoutTests/platform/wincairo/editing/input/caret-at-the-edge-of-contenteditable-expected.txt index b5ffb225a750..851f82ba907e 100644 --- a/LayoutTests/platform/wincairo/editing/input/caret-at-the-edge-of-contenteditable-expected.txt +++ b/LayoutTests/platform/wincairo/editing/input/caret-at-the-edge-of-contenteditable-expected.txt @@ -1,13 +1,14 @@ layer at (0,0) size 800x600 RenderView at (0,0) size 800x600 -layer at (0,0) size 800x58 - RenderBlock {HTML} at (0,0) size 800x58 - RenderBody {BODY} at (8,8) size 784x42 - RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 784x19 - text run at (0,0) width 784: "When the caret reaches the edge of the input box or content editable div, on the next input if must jump to the center of the control." -layer at (8,28) size 82x22 clip at (9,29) size 80x20 scrollX 41 scrollWidth 337 - RenderBlock {DIV} at (0,20) size 82x22 [border: (1px solid #000000)] +layer at (0,0) size 800x78 + RenderBlock {HTML} at (0,0) size 800x78 + RenderBody {BODY} at (8,8) size 784x62 + RenderBlock {DIV} at (0,0) size 784x40 + RenderText {#text} at (0,0) size 768x39 + text run at (0,0) width 768: "When the caret reaches the edge of the input box or content editable div, on the next input if must jump to the center of the" + text run at (0,20) width 48: "control." +layer at (8,48) size 82x22 clip at (9,49) size 80x20 scrollX 41 scrollWidth 337 + RenderBlock {DIV} at (0,40) size 82x22 [border: (1px solid #000000)] RenderText {#text} at (1,1) size 336x19 text run at (1,1) width 336: "012345678901012345678901234567890123456789" caret: position 12 of child 0 {#text} of child 5 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/input/emacs-ctrl-o-expected.txt b/LayoutTests/platform/wincairo/editing/input/emacs-ctrl-o-expected.txt index 876990705dcb..de4366bfd13d 100644 --- a/LayoutTests/platform/wincairo/editing/input/emacs-ctrl-o-expected.txt +++ b/LayoutTests/platform/wincairo/editing/input/emacs-ctrl-o-expected.txt @@ -11,22 +11,22 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x154 RenderBlock {DIV} at (0,0) size 784x55 - RenderText {#text} at (0,0) size 60x26 - text run at (0,0) width 60: "Tests:" - RenderBR {BR} at (60,0) size 0x26 - RenderText {#text} at (0,27) size 250x27 - text run at (0,27) width 250: "Key binding for control-O" + RenderText {#text} at (0,0) size 59x26 + text run at (0,0) width 59: "Tests:" + RenderBR {BR} at (59,0) size 0x26 + RenderText {#text} at (0,27) size 254x27 + text run at (0,27) width 254: "Key binding for control-O" RenderBlock {DIV} at (0,71) size 784x83 - RenderText {#text} at (0,0) size 177x26 - text run at (0,0) width 177: "Expected results:" - RenderBR {BR} at (177,0) size 0x26 - RenderText {#text} at (0,27) size 89x27 - text run at (0,27) width 89: "one five |" - RenderBR {BR} at (89,27) size 0x27 + RenderText {#text} at (0,0) size 176x26 + text run at (0,0) width 176: "Expected results:" + RenderBR {BR} at (176,0) size 0x26 + RenderText {#text} at (0,27) size 90x27 + text run at (0,27) width 90: "one five |" + RenderBR {BR} at (90,27) size 0x27 RenderText {#text} at (0,55) size 137x27 text run at (0,55) width 137: "two three four" RenderBlock {DIV} at (0,178) size 784x28 RenderBlock {DIV} at (0,0) size 784x28 - RenderText {#text} at (0,0) size 221x27 - text run at (0,0) width 221: "one five two three four" + RenderText {#text} at (0,0) size 222x27 + text run at (0,0) width 222: "one five two three four" caret: position 10 of child 0 {#text} of child 1 {DIV} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/input/reveal-caret-of-multiline-input-expected.txt b/LayoutTests/platform/wincairo/editing/input/reveal-caret-of-multiline-input-expected.txt index d7567bdcc8ad..3f79bae5b3f1 100644 --- a/LayoutTests/platform/wincairo/editing/input/reveal-caret-of-multiline-input-expected.txt +++ b/LayoutTests/platform/wincairo/editing/input/reveal-caret-of-multiline-input-expected.txt @@ -4,15 +4,15 @@ layer at (0,0) size 800x207 RenderBlock {HTML} at (0,0) size 800x207 RenderBody {BODY} at (8,8) size 784x191 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 568x19 - text run at (0,0) width 568: "When the caret is scrolled out, on starting typing it must be brought to the center of the control." + RenderText {#text} at (0,0) size 595x19 + text run at (0,0) width 595: "When the caret is scrolled out, on starting typing it must be brought to the center of the control." RenderBlock (anonymous) at (0,20) size 784x171 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 layer at (8,28) size 91x166 clip at (9,29) size 74x164 scrollY 120 scrollHeight 516 RenderTextControl {TEXTAREA} at (0,0) size 91x166 [bgcolor=#FFFFFF] [border: (1px solid #000000)] RenderBlock {DIV} at (3,3) size 70x512 - RenderText {#text} at (0,0) size 21x496 + RenderText {#text} at (0,0) size 22x496 text run at (0,0) width 14: "00" text run at (14,0) width 0: " " text run at (0,16) width 14: "01" @@ -37,8 +37,8 @@ layer at (8,28) size 91x166 clip at (9,29) size 74x164 scrollY 120 scrollHeight text run at (14,160) width 0: " " text run at (0,176) width 14: "11" text run at (14,176) width 0: " " - text run at (0,192) width 21: ">12" - text run at (21,192) width 0: " " + text run at (0,192) width 22: ">12" + text run at (22,192) width 0: " " text run at (0,208) width 14: "13" text run at (14,208) width 0: " " text run at (0,224) width 14: "14" diff --git a/LayoutTests/platform/wincairo/editing/inserting/12882-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/12882-expected.txt index 21cf9c6cc3f0..a485fcafb02d 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/12882-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/12882-expected.txt @@ -4,20 +4,20 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x60 - RenderText {#text} at (0,0) size 750x39 - text run at (0,0) width 523: "This tests for a bug where images with align right/left would fail to be inserted on paste. " - text run at (523,0) width 227: "You should see a picture of abe in the" - text run at (0,20) width 255: "editable region below, aligned to the right. " - RenderInline {B} at (0,0) size 774x39 - RenderText {#text} at (255,20) size 774x39 - text run at (255,20) width 519: "This demonstrates a bug: the focus halo for the editable region doesn't expand" - text run at (0,40) width 214: "to fit an image with align='right'." + RenderText {#text} at (0,0) size 768x39 + text run at (0,0) width 555: "This tests for a bug where images with align right/left would fail to be inserted on paste. " + text run at (555,0) width 213: "You should see a picture of abe in" + text run at (0,20) width 292: "the editable region below, aligned to the right. " + RenderInline {B} at (0,0) size 765x39 + RenderText {#text} at (292,20) size 765x39 + text run at (292,20) width 473: "This demonstrates a bug: the focus halo for the editable region doesn't" + text run at (0,40) width 275: "expand to fit an image with align='right'." RenderBlock {DIV} at (0,76) size 784x40 - RenderText {#text} at (0,0) size 192x19 - text run at (0,0) width 192: "Four score and seven years ago" + RenderText {#text} at (0,0) size 198x19 + text run at (0,0) width 198: "Four score and seven years ago" RenderImage {IMG} at (708,0) size 76x103 - RenderText {#text} at (192,0) size 677x39 - text run at (192,0) width 4: " " - text run at (196,0) width 481: "our fathers brought forth on this continent a new nation, conceived in liberty and " - text run at (0,20) width 353: "dedicated to the proposition that all men are created equal." + RenderText {#text} at (198,0) size 685x39 + text run at (198,0) width 4: " " + text run at (202,0) width 483: "our fathers brought forth on this continent a new nation, conceived in liberty " + text run at (0,20) width 392: "and dedicated to the proposition that all men are created equal." caret: position 1 of child 1 {IMG} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/4278698-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/4278698-expected.txt index 3238ef628245..44eb55a34504 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/4278698-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/4278698-expected.txt @@ -12,12 +12,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 730x39 - text run at (0,0) width 730: "This tests to see if inserting a space inside normal whitespace inside of a whitespace:pre element will collapse other spaces" - text run at (0,20) width 85: "surrounding it." + RenderText {#text} at (0,0) size 767x39 + text run at (0,0) width 767: "This tests to see if inserting a space inside normal whitespace inside of a whitespace:pre element will collapse other spaces" + text run at (0,20) width 92: "surrounding it." RenderBlock {P} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 424x19 - text run at (0,0) width 424: "If successful, you should see 'a' followed by 10 spaces followed by 'b'." + RenderText {#text} at (0,0) size 444x19 + text run at (0,0) width 444: "If successful, you should see 'a' followed by 10 spaces followed by 'b'." RenderBlock {DIV} at (0,102) size 784x24 [border: (2px solid #FFAAAA)] RenderBlock {PRE} at (2,2) size 780x20 [border: (2px solid #AAAAFF)] RenderText {#text} at (2,2) size 96x16 diff --git a/LayoutTests/platform/wincairo/editing/inserting/4840662-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/4840662-expected.txt index a10c75aae42c..4c930243c17a 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/4840662-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/4840662-expected.txt @@ -4,12 +4,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 776x39 - text run at (0,0) width 383: "This tests insertion before/after links that are also display:block. " - text run at (383,0) width 393: "Insertion before/after display:block links should go inside the links" - text run at (0,20) width 294: "so that text is inserted in the expected paragraph." + RenderText {#text} at (0,0) size 762x39 + text run at (0,0) width 402: "This tests insertion before/after links that are also display:block. " + text run at (402,0) width 360: "Insertion before/after display:block links should go inside" + text run at (0,20) width 362: "the links so that text is inserted in the expected paragraph." RenderBlock {DIV} at (0,56) size 784x20 RenderBlock {A} at (0,0) size 784x20 [color=#0000EE] - RenderText {#text} at (0,0) size 233x19 - text run at (0,0) width 233: "This sentence should all be on one line." + RenderText {#text} at (0,0) size 248x19 + text run at (0,0) width 248: "This sentence should all be on one line." caret: position 40 of child 0 {#text} of child 0 {A} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/4875189-1-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/4875189-1-expected.txt index 2cee841f3813..2efce4ec3eff 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/4875189-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/4875189-1-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 619x19 - text run at (0,0) width 339: "This tests for a bug when replacing the contents of a list. " - text run at (339,0) width 280: "The list shouldn't be removed, just its contents." + RenderText {#text} at (0,0) size 652x19 + text run at (0,0) width 358: "This tests for a bug when replacing the contents of a list. " + text run at (358,0) width 294: "The list shouldn't be removed, just its contents." RenderBlock {DIV} at (0,36) size 784x20 RenderBlock {UL} at (0,0) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "This should be in a list item." + RenderText {#text} at (0,0) size 177x19 + text run at (0,0) width 177: "This should be in a list item." caret: position 30 of child 0 {#text} of child 0 {LI} of child 0 {UL} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/4875189-2-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/4875189-2-expected.txt index 49d545da0bfb..ea155ecbecbd 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/4875189-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/4875189-2-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 744x19 - text run at (0,0) width 416: "This tests for a bug when replacing the contents of a floating element. " - text run at (416,0) width 328: "Just its contents should be removed during the replace." + RenderText {#text} at (0,0) size 784x19 + text run at (0,0) width 441: "This tests for a bug when replacing the contents of a floating element. " + text run at (441,0) width 343: "Just its contents should be removed during the replace." RenderBlock {DIV} at (0,36) size 784x20 - RenderText {#text} at (276,0) size 223x19 - text run at (276,0) width 223: "This shouldn't be in the bordered div." - RenderBlock (floating) {DIV} at (0,0) size 276x22 [border: (1px solid #0000FF)] - RenderText {#text} at (1,1) size 274x19 - text run at (1,1) width 274: "This should be in a floating blue bordered div." + RenderText {#text} at (292,0) size 234x19 + text run at (292,0) width 234: "This shouldn't be in the bordered div." + RenderBlock (floating) {DIV} at (0,0) size 292x22 [border: (1px solid #0000FF)] + RenderText {#text} at (1,1) size 290x19 + text run at (1,1) width 290: "This should be in a floating blue bordered div." caret: position 47 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/4959067-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/4959067-expected.txt index 67442474301a..160157a26f23 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/4959067-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/4959067-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 571x19 - text run at (0,0) width 571: "This tests to make sure that insertion over a fully selected special element doesn't do expansion." + RenderText {#text} at (0,0) size 598x19 + text run at (0,0) width 598: "This tests to make sure that insertion over a fully selected special element doesn't do expansion." RenderBlock {DIV} at (0,36) size 784x20 RenderBlock {UL} at (0,0) size 784x20 RenderListItem {LI} at (40,0) size 744x20 RenderListMarker at (-18,0) size 7x19: bullet - RenderInline {A} at (0,0) size 20x19 [color=#0000EE] - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderInline {A} at (0,0) size 21x19 [color=#0000EE] + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" RenderBlock {UL} at (0,72) size 784x0 caret: position 3 of child 0 {#text} of child 0 {A} of child 0 {LI} of child 1 {UL} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/4960120-1-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/4960120-1-expected.txt index 989130f22640..feaaba0b141b 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/4960120-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/4960120-1-expected.txt @@ -4,8 +4,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 483x19 - text run at (0,0) width 483: "This tests for a bug where the first newline entered into a text area would be lost." + RenderText {#text} at (0,0) size 507x19 + text run at (0,0) width 507: "This tests for a bug where the first newline entered into a text area would be lost." RenderBlock (anonymous) at (0,36) size 784x38 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/editing/inserting/4960120-2-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/4960120-2-expected.txt index 7b8401aa1d94..1f439d964eba 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/4960120-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/4960120-2-expected.txt @@ -4,13 +4,13 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 562x19 - text run at (0,0) width 562: "This tests for a bug where a newline inserted at the end of an anonymous block would be lost." + RenderText {#text} at (0,0) size 591x19 + text run at (0,0) width 591: "This tests for a bug where a newline inserted at the end of an anonymous block would be lost." RenderBlock {DIV} at (0,36) size 784x60 RenderBlock (anonymous) at (0,0) size 784x40 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderBR {BR} at (20,0) size 0x19 + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" + RenderBR {BR} at (21,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock {DIV} at (0,40) size 784x20 RenderText {#text} at (0,0) size 20x19 diff --git a/LayoutTests/platform/wincairo/editing/inserting/5002441-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/5002441-expected.txt index 92f1ec9ebe87..1621e1f1eed3 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/5002441-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/5002441-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 500x19 - text run at (0,0) width 500: "This tests for a bug where spaces couldn't be inserted before signatures and replies." + RenderText {#text} at (0,0) size 521x19 + text run at (0,0) width 521: "This tests for a bug where spaces couldn't be inserted before signatures and replies." RenderBlock {DIV} at (0,36) size 784x40 RenderBlock (anonymous) at (0,0) size 784x20 RenderText {#text} at (0,0) size 4x19 text run at (0,0) width 4: " " RenderBR {BR} at (4,0) size 0x19 RenderBlock {DIV} at (0,20) size 784x20 - RenderText {#text} at (0,0) size 330x19 - text run at (0,0) width 330: "There should be a single space in the paragraph above." + RenderText {#text} at (0,0) size 345x19 + text run at (0,0) width 345: "There should be a single space in the paragraph above." caret: position 1 of child 0 {#text} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/5058163-1-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/5058163-1-expected.txt index 5b752a993b69..5c21d998f5f3 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/5058163-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/5058163-1-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 724x19 - text run at (0,0) width 724: "This tests for a bug where hitting return between two tables would add a new paragraph at the end of the editable region." + RenderText {#text} at (0,0) size 759x19 + text run at (0,0) width 759: "This tests for a bug where hitting return between two tables would add a new paragraph at the end of the editable region." RenderBlock {DIV} at (0,36) size 784x96 - RenderTable {TABLE} at (0,0) size 456x28 [border: (1px solid #AAAAAA)] - RenderTableSection {TBODY} at (1,1) size 454x26 - RenderTableRow {TR} at (0,2) size 454x22 - RenderTableCell {TD} at (2,2) size 450x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 448x19 - text run at (1,1) width 448: "There should be two empty paragraphs after this table and before the next." + RenderTable {TABLE} at (0,0) size 475x28 [border: (1px solid #AAAAAA)] + RenderTableSection {TBODY} at (1,1) size 473x26 + RenderTableRow {TR} at (0,2) size 473x22 + RenderTableCell {TD} at (2,2) size 469x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 467x19 + text run at (1,1) width 467: "There should be two empty paragraphs after this table and before the next." RenderBlock {DIV} at (0,28) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderBlock (anonymous) at (0,48) size 784x20 RenderBR {BR} at (0,0) size 0x19 - RenderTable {TABLE} at (0,68) size 265x28 [border: (1px solid #AAAAAA)] - RenderTableSection {TBODY} at (1,1) size 263x26 - RenderTableRow {TR} at (0,2) size 263x22 - RenderTableCell {TD} at (2,2) size 259x22 [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (1,1) size 257x19 - text run at (1,1) width 257: "And the caret should be in the second one." + RenderTable {TABLE} at (0,68) size 276x28 [border: (1px solid #AAAAAA)] + RenderTableSection {TBODY} at (1,1) size 274x26 + RenderTableRow {TR} at (0,2) size 274x22 + RenderTableCell {TD} at (2,2) size 270x22 [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (1,1) size 268x19 + text run at (1,1) width 268: "And the caret should be in the second one." caret: position 0 of child 2 {BR} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/5058163-2-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/5058163-2-expected.txt index 322a35029d5e..2d764ac40b48 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/5058163-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/5058163-2-expected.txt @@ -4,15 +4,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 653x19 - text run at (0,0) width 653: "This tests for a bug where hitting return after a line break in text that preserves newlines wouldn't do anything." + RenderText {#text} at (0,0) size 692x19 + text run at (0,0) width 692: "This tests for a bug where hitting return after a line break in text that preserves newlines wouldn't do anything." RenderBlock {DIV} at (0,36) size 784x60 RenderBlock (anonymous) at (0,0) size 784x40 - RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "xxx" - text run at (21,0) width 0: " " + RenderText {#text} at (0,0) size 24x19 + text run at (0,0) width 24: "xxx" + text run at (24,0) width 0: " " RenderBR {BR} at (0,20) size 0x19 RenderBlock {DIV} at (0,40) size 784x20 - RenderText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "There should be an empty paragraph before this one, and the caret should be at the start of this paragraph." + RenderText {#text} at (0,0) size 663x19 + text run at (0,0) width 663: "There should be an empty paragraph before this one, and the caret should be at the start of this paragraph." caret: position 0 of child 0 {#text} of child 2 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/5156401-2-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/5156401-2-expected.txt index 49c93efd8498..adc8fb75f0bc 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/5156401-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/5156401-2-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 595x19 - text run at (0,0) width 595: "This tests for a bug where inserting at the end of a link would place content in the wrong paragraph." + RenderText {#text} at (0,0) size 628x19 + text run at (0,0) width 628: "This tests for a bug where inserting at the end of a link would place content in the wrong paragraph." RenderBlock {DIV} at (0,36) size 784x20 - RenderInline {A} at (0,0) size 395x19 [color=#0000EE] - RenderText {#text} at (0,0) size 395x19 - text run at (0,0) width 395: "Everything in this editable region should be in the same paragraph." - RenderBR {BR} at (395,0) size 0x19 + RenderInline {A} at (0,0) size 420x19 [color=#0000EE] + RenderText {#text} at (0,0) size 420x19 + text run at (0,0) width 420: "Everything in this editable region should be in the same paragraph." + RenderBR {BR} at (420,0) size 0x19 caret: position 67 of child 0 {#text} of child 0 {A} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/5418891-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/5418891-expected.txt index 540b7b7d1e93..127bbf80cdc2 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/5418891-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/5418891-expected.txt @@ -4,15 +4,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 781x39 - text run at (0,0) width 516: "This tests for a crash when attempting to break a blockquote at the end of its content. " - text run at (516,0) width 265: "The caret should be in the first of two empty" - text run at (0,20) width 305: "paragraphs between two pieces of quoted content." + RenderText {#text} at (0,0) size 772x39 + text run at (0,0) width 536: "This tests for a crash when attempting to break a blockquote at the end of its content. " + text run at (536,0) width 236: "The caret should be in the first of two" + text run at (0,20) width 358: "empty paragraphs between two pieces of quoted content." RenderBlock {DIV} at (0,56) size 784x80 RenderBlock {BLOCKQUOTE} at (0,0) size 784x20 [color=#0000FF] [border: none (2px solid #0000FF)] RenderBlock {DIV} at (7,0) size 777x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" RenderBlock (anonymous) at (0,20) size 784x40 RenderBR {BR} at (0,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 diff --git a/LayoutTests/platform/wincairo/editing/inserting/5549929-2-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/5549929-2-expected.txt index 677e07da9118..711be100c241 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/5549929-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/5549929-2-expected.txt @@ -4,10 +4,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 764x39 - text run at (0,0) width 591: "This tests to make sure that a br isn't inserted into a tab span during an InsertLineBreak operation. " - text run at (591,0) width 173: "You can test for its existence" - text run at (0,20) width 357: "with the DOM inspector or you can look at the render tree." + RenderText {#text} at (0,0) size 733x39 + text run at (0,0) width 616: "This tests to make sure that a br isn't inserted into a tab span during an InsertLineBreak operation. " + text run at (616,0) width 117: "You can test for its" + text run at (0,20) width 432: "existence with the DOM inspector or you can look at the render tree." RenderBlock {DIV} at (0,56) size 784x40 RenderBlock {DIV} at (0,0) size 784x40 RenderBR {BR} at (0,0) size 0x19 diff --git a/LayoutTests/platform/wincairo/editing/inserting/5549929-3-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/5549929-3-expected.txt index 1a9d8117adbc..68508a0e8443 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/5549929-3-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/5549929-3-expected.txt @@ -4,16 +4,16 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 752x39 - text run at (0,0) width 336: "This tests inserting a line break at the end of a tab span. " - text run at (336,0) width 416: "Below you should see 'foo' followed by an empty paragraph, with the" - text run at (0,20) width 59: "caret in it." + RenderText {#text} at (0,0) size 767x39 + text run at (0,0) width 351: "This tests inserting a line break at the end of a tab span. " + text run at (351,0) width 416: "Below you should see 'foo' followed by an empty paragraph, with" + text run at (0,20) width 85: "the caret in it." RenderBlock {DIV} at (0,56) size 784x40 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderInline {SPAN} at (0,0) size 12x19 - RenderText {#text} at (20,0) size 12x19 - text run at (20,0) width 12: "\x{9}" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" + RenderInline {SPAN} at (0,0) size 11x19 + RenderText {#text} at (21,0) size 11x19 + text run at (21,0) width 11: "\x{9}" RenderBR {BR} at (32,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 caret: position 0 of child 3 {BR} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/6703873-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/6703873-expected.txt index 14acd3aa4135..df067d8bc5ea 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/6703873-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/6703873-expected.txt @@ -4,23 +4,23 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x579 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 760x39 - text run at (0,0) width 631: "This tests that inserting a newline in place of a full line of quoted content doesn't add an extra quoted line. " - text run at (631,0) width 129: "The test has passed if" - text run at (0,20) width 384: "there are no empty lines (quoted or unquoted) in the box below." + RenderText {#text} at (0,0) size 742x39 + text run at (0,0) width 667: "This tests that inserting a newline in place of a full line of quoted content doesn't add an extra quoted line. " + text run at (667,0) width 75: "The test has" + text run at (0,20) width 459: "passed if there are no empty lines (quoted or unquoted) in the box below." RenderBlock {DIV} at (0,56) size 784x60 RenderBlock {BLOCKQUOTE} at (0,0) size 784x20 [color=#0000FF] [border: none (2px solid #0000FF)] RenderBlock {DIV} at (12,0) size 772x20 - RenderText {#text} at (0,0) size 42x19 - text run at (0,0) width 42: "quoted" + RenderText {#text} at (0,0) size 43x19 + text run at (0,0) width 43: "quoted" RenderBlock {DIV} at (12,20) size 772x0 RenderBlock (anonymous) at (0,20) size 784x20 - RenderText {#text} at (0,0) size 56x19 - text run at (0,0) width 56: "unquoted" - RenderBR {BR} at (56,0) size 0x19 + RenderText {#text} at (0,0) size 59x19 + text run at (0,0) width 59: "unquoted" + RenderBR {BR} at (59,0) size 0x19 RenderBlock {BLOCKQUOTE} at (0,40) size 784x20 [color=#0000FF] [border: none (2px solid #0000FF)] RenderBlock {DIV} at (12,0) size 772x20 - RenderText {#text} at (0,0) size 42x19 - text run at (0,0) width 42: "quoted" + RenderText {#text} at (0,0) size 43x19 + text run at (0,0) width 43: "quoted" RenderBlock {PRE} at (0,129) size 784x0 caret: position 8 of child 2 {#text} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/before-after-input-element-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/before-after-input-element-expected.txt index e86424ae837c..a14943c780bf 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/before-after-input-element-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/before-after-input-element-expected.txt @@ -14,14 +14,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 315x19 - text run at (0,0) width 315: "This tests text insertion before/after an input element." + RenderText {#text} at (0,0) size 332x19 + text run at (0,0) width 332: "This tests text insertion before/after an input element." RenderBlock {DIV} at (0,36) size 784x22 - RenderText {#text} at (0,1) size 32x19 - text run at (0,1) width 32: "Hello" - RenderTextControl {INPUT} at (32,0) size 153x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] - RenderText {#text} at (185,1) size 39x19 - text run at (185,1) width 39: "World" -layer at (43,47) size 147x16 + RenderText {#text} at (0,1) size 35x19 + text run at (0,1) width 35: "Hello" + RenderTextControl {INPUT} at (35,0) size 153x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)] + RenderText {#text} at (188,1) size 39x19 + text run at (188,1) width 39: "World" +layer at (46,47) size 147x16 RenderBlock {DIV} at (3,3) size 147x16 caret: position 5 of child 2 {#text} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/editable-inline-element-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/editable-inline-element-expected.txt index f75721c08e91..0f9dfa9c1250 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/editable-inline-element-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/editable-inline-element-expected.txt @@ -4,11 +4,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 351x19 - text run at (0,0) width 351: "This tests InsertParagraph inside an editable inline element." + RenderText {#text} at (0,0) size 371x19 + text run at (0,0) width 371: "This tests InsertParagraph inside an editable inline element." RenderBlock {DIV} at (0,36) size 784x42 [border: (1px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 20x39 + RenderInline {SPAN} at (0,0) size 21x39 RenderBR {BR} at (1,1) size 0x19 - RenderText {#text} at (1,21) size 20x19 - text run at (1,21) width 20: "foo" + RenderText {#text} at (1,21) size 21x19 + text run at (1,21) width 21: "foo" caret: position 0 of child 1 {#text} of child 0 {SPAN} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/edited-whitespace-1-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/edited-whitespace-1-expected.txt index 9d2e7c72e822..698f6c63c3c2 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/edited-whitespace-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/edited-whitespace-1-expected.txt @@ -4,14 +4,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x576 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 750x39 - text run at (0,0) width 301: "This tests that edited whitespaces aren't all nbsps. " - text run at (301,0) width 449: "When the region becomes non-editable, Hello and World should still be on" - text run at (0,20) width 87: "different lines. " - text run at (87,20) width 557: "This demonstrates a bug: the div's focus halo doesn't go away when it becomes non-editable." + RenderText {#text} at (0,0) size 783x39 + text run at (0,0) width 313: "This tests that edited whitespaces aren't all nbsps. " + text run at (313,0) width 470: "When the region becomes non-editable, Hello and World should still be on" + text run at (0,20) width 94: "different lines. " + text run at (94,20) width 584: "This demonstrates a bug: the div's focus halo doesn't go away when it becomes non-editable." RenderBlock {DIV} at (0,56) size 62x42 [border: (1px solid #000000)] - RenderText {#text} at (1,1) size 52x39 - text run at (1,1) width 52: " Hello " + RenderText {#text} at (1,1) size 55x39 + text run at (1,1) width 55: " Hello " text run at (1,21) width 43: "World " RenderBlock {OL} at (0,114) size 784x0 caret: position 17 of child 0 {#text} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-3800346-fix-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-3800346-fix-expected.txt index 542a50e7536f..b6fbe83cbe06 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-3800346-fix-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-3800346-fix-expected.txt @@ -25,11 +25,11 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,0) size 784x244 [border: (2px solid #FF0000)] RenderBlock {DIV} at (14,14) size 756x216 RenderBlock (anonymous) at (0,0) size 756x28 - RenderText {#text} at (0,0) size 41x27 - text run at (0,0) width 41: "Test" + RenderText {#text} at (0,0) size 40x27 + text run at (0,0) width 40: "Test" RenderBlock {BLOCKQUOTE} at (40,52) size 676x28 - RenderText {#text} at (0,0) size 41x27 - text run at (0,0) width 41: "Test" + RenderText {#text} at (0,0) size 40x27 + text run at (0,0) width 40: "Test" RenderBlock (anonymous) at (0,104) size 756x112 RenderBR {BR} at (0,0) size 0x27 RenderBR {BR} at (0,28) size 0x27 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-br-009-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-br-009-expected.txt index 2e338385cf2c..8097a422bf83 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-br-009-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-br-009-expected.txt @@ -11,14 +11,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 780x39 - text run at (0,0) width 300: "This tests for a bug in InsertLineBreakCommand. " - text run at (300,0) width 480: "Only one line break should be inserted and the caret should end up at the end of" - text run at (0,20) width 145: "the bordered div below." + RenderText {#text} at (0,0) size 774x39 + text run at (0,0) width 316: "This tests for a bug in InsertLineBreakCommand. " + text run at (316,0) width 458: "Only one line break should be inserted and the caret should end up at the" + text run at (0,20) width 193: "end of the bordered div below." RenderBlock {DIV} at (0,56) size 784x62 [border: (1px solid #000000)] - RenderText {#text} at (1,1) size 75x19 - text run at (1,1) width 75: "Hello world." - text run at (76,1) width 0: " " + RenderText {#text} at (1,1) size 80x19 + text run at (1,1) width 80: "Hello world." + text run at (81,1) width 0: " " RenderText {#text} at (1,21) size 0x19 text run at (1,21) width 0: " " RenderText {#text} at (1,41) size 0x19 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-br-at-tabspan-003-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-br-at-tabspan-003-expected.txt index ccacd3fb73e6..fec1baf0f27f 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-br-at-tabspan-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-br-at-tabspan-003-expected.txt @@ -24,7 +24,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (25,14) size 133x27 text run at (25,14) width 133: "\x{9}\x{9}\x{9}" RenderBR {BR} at (158,14) size 0x27 - RenderText {#text} at (14,42) size 22x27 - text run at (14,42) width 22: "xz" + RenderText {#text} at (14,42) size 23x27 + text run at (14,42) width 23: "xz" RenderText {#text} at (0,0) size 0x0 caret: position 1 of child 3 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-001-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-001-expected.txt index 79169387ebde..359e3774b012 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-001-expected.txt @@ -21,18 +21,18 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 351x19 - text run at (0,27) width 351: "Two blockquotes, with an unquoted blank line in between." - RenderBR {BR} at (351,27) size 0x19 - RenderText {#text} at (0,47) size 384x19 - text run at (0,47) width 384: "The first blockquote contains two lines, the second one is blank." - RenderBR {BR} at (384,47) size 0x19 - RenderText {#text} at (0,67) size 296x19 - text run at (0,67) width 296: "The second blockquote is a single non-blank line." + RenderText {#text} at (0,27) size 370x19 + text run at (0,27) width 370: "Two blockquotes, with an unquoted blank line in between." + RenderBR {BR} at (370,27) size 0x19 + RenderText {#text} at (0,47) size 403x19 + text run at (0,47) width 403: "The first blockquote contains two lines, the second one is blank." + RenderBR {BR} at (403,47) size 0x19 + RenderText {#text} at (0,67) size 312x19 + text run at (0,67) width 312: "The second blockquote is a single non-blank line." RenderBlock {DIV} at (0,114) size 784x224 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x28 - RenderText {#text} at (0,0) size 117x27 - text run at (0,0) width 117: "My citation:" + RenderText {#text} at (0,0) size 120x27 + text run at (0,0) width 120: "My citation:" RenderBlock {DIV} at (14,66) size 756x144 RenderBlock {BLOCKQUOTE} at (40,0) size 676x60 [border: (2px solid #0000FF)] RenderBlock {DIV} at (2,2) size 672x28 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-002-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-002-expected.txt index e97f656d216c..6f606338862d 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-002-expected.txt @@ -21,18 +21,18 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 351x19 - text run at (0,27) width 351: "Two blockquotes, with an unquoted blank line in between." - RenderBR {BR} at (351,27) size 0x19 - RenderText {#text} at (0,47) size 384x19 - text run at (0,47) width 384: "The first blockquote contains two lines, the second one is blank." - RenderBR {BR} at (384,47) size 0x19 - RenderText {#text} at (0,67) size 296x19 - text run at (0,67) width 296: "The second blockquote is a single non-blank line." + RenderText {#text} at (0,27) size 370x19 + text run at (0,27) width 370: "Two blockquotes, with an unquoted blank line in between." + RenderBR {BR} at (370,27) size 0x19 + RenderText {#text} at (0,47) size 403x19 + text run at (0,47) width 403: "The first blockquote contains two lines, the second one is blank." + RenderBR {BR} at (403,47) size 0x19 + RenderText {#text} at (0,67) size 312x19 + text run at (0,67) width 312: "The second blockquote is a single non-blank line." RenderBlock {DIV} at (0,114) size 784x224 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x28 - RenderText {#text} at (0,0) size 117x27 - text run at (0,0) width 117: "My citation:" + RenderText {#text} at (0,0) size 120x27 + text run at (0,0) width 120: "My citation:" RenderBlock {DIV} at (14,66) size 756x144 RenderBlock {BLOCKQUOTE} at (40,0) size 676x60 [border: (2px solid #0000FF)] RenderBlock {DIV} at (2,2) size 672x28 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-003-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-003-expected.txt index 7ef87d6ee97e..90c1b2b27f8e 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-003-expected.txt @@ -21,18 +21,18 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 351x19 - text run at (0,27) width 351: "Two blockquotes, with an unquoted blank line in between." - RenderBR {BR} at (351,27) size 0x19 - RenderText {#text} at (0,47) size 384x19 - text run at (0,47) width 384: "The first blockquote contains two lines, the second one is blank." - RenderBR {BR} at (384,47) size 0x19 - RenderText {#text} at (0,67) size 321x19 - text run at (0,67) width 321: "The second blockquote contains two non-blank lines." + RenderText {#text} at (0,27) size 370x19 + text run at (0,27) width 370: "Two blockquotes, with an unquoted blank line in between." + RenderBR {BR} at (370,27) size 0x19 + RenderText {#text} at (0,47) size 403x19 + text run at (0,47) width 403: "The first blockquote contains two lines, the second one is blank." + RenderBR {BR} at (403,47) size 0x19 + RenderText {#text} at (0,67) size 336x19 + text run at (0,67) width 336: "The second blockquote contains two non-blank lines." RenderBlock {DIV} at (0,114) size 784x252 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x28 - RenderText {#text} at (0,0) size 117x27 - text run at (0,0) width 117: "My citation:" + RenderText {#text} at (0,0) size 120x27 + text run at (0,0) width 120: "My citation:" RenderBlock {DIV} at (14,66) size 756x172 RenderBlock {BLOCKQUOTE} at (40,0) size 676x60 [border: (2px solid #0000FF)] RenderBlock {DIV} at (2,2) size 672x28 @@ -48,8 +48,8 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (2,2) size 672x28 RenderBlock {DIV} at (0,0) size 672x28 RenderBlock {DIV} at (0,0) size 672x28 - RenderText {#text} at (0,0) size 136x27 - text run at (0,0) width 136: "one and a half" + RenderText {#text} at (0,0) size 137x27 + text run at (0,0) width 137: "one and a half" RenderBlock {DIV} at (2,30) size 672x28 RenderText {#text} at (0,0) size 36x27 text run at (0,0) width 36: "two" diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-004-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-004-expected.txt index 2272ad89cd8b..4e33fff5b93a 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-004-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-004-expected.txt @@ -21,18 +21,18 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 351x19 - text run at (0,27) width 351: "Two blockquotes, with an unquoted blank line in between." - RenderBR {BR} at (351,27) size 0x19 - RenderText {#text} at (0,47) size 384x19 - text run at (0,47) width 384: "The first blockquote contains two lines, the second one is blank." - RenderBR {BR} at (384,47) size 0x19 - RenderText {#text} at (0,67) size 321x19 - text run at (0,67) width 321: "The second blockquote contains two non-blank lines." + RenderText {#text} at (0,27) size 370x19 + text run at (0,27) width 370: "Two blockquotes, with an unquoted blank line in between." + RenderBR {BR} at (370,27) size 0x19 + RenderText {#text} at (0,47) size 403x19 + text run at (0,47) width 403: "The first blockquote contains two lines, the second one is blank." + RenderBR {BR} at (403,47) size 0x19 + RenderText {#text} at (0,67) size 336x19 + text run at (0,67) width 336: "The second blockquote contains two non-blank lines." RenderBlock {DIV} at (0,114) size 784x252 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x28 - RenderText {#text} at (0,0) size 117x27 - text run at (0,0) width 117: "My citation:" + RenderText {#text} at (0,0) size 120x27 + text run at (0,0) width 120: "My citation:" RenderBlock {DIV} at (14,66) size 756x172 RenderBlock {BLOCKQUOTE} at (40,0) size 676x60 [border: (2px solid #0000FF)] RenderBlock {DIV} at (2,2) size 672x28 @@ -47,8 +47,8 @@ layer at (0,0) size 800x600 RenderBlock {BLOCKQUOTE} at (40,112) size 676x60 [border: (2px solid #0000FF)] RenderBlock {DIV} at (2,2) size 672x28 RenderBlock {DIV} at (0,0) size 672x28 - RenderText {#text} at (0,0) size 136x27 - text run at (0,0) width 136: "one and a half" + RenderText {#text} at (0,0) size 137x27 + text run at (0,0) width 137: "one and a half" RenderBlock {DIV} at (2,30) size 672x28 RenderText {#text} at (0,0) size 36x27 text run at (0,0) width 36: "two" diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-005-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-005-expected.txt index e97f656d216c..6f606338862d 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-005-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-005-expected.txt @@ -21,18 +21,18 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 351x19 - text run at (0,27) width 351: "Two blockquotes, with an unquoted blank line in between." - RenderBR {BR} at (351,27) size 0x19 - RenderText {#text} at (0,47) size 384x19 - text run at (0,47) width 384: "The first blockquote contains two lines, the second one is blank." - RenderBR {BR} at (384,47) size 0x19 - RenderText {#text} at (0,67) size 296x19 - text run at (0,67) width 296: "The second blockquote is a single non-blank line." + RenderText {#text} at (0,27) size 370x19 + text run at (0,27) width 370: "Two blockquotes, with an unquoted blank line in between." + RenderBR {BR} at (370,27) size 0x19 + RenderText {#text} at (0,47) size 403x19 + text run at (0,47) width 403: "The first blockquote contains two lines, the second one is blank." + RenderBR {BR} at (403,47) size 0x19 + RenderText {#text} at (0,67) size 312x19 + text run at (0,67) width 312: "The second blockquote is a single non-blank line." RenderBlock {DIV} at (0,114) size 784x224 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x28 - RenderText {#text} at (0,0) size 117x27 - text run at (0,0) width 117: "My citation:" + RenderText {#text} at (0,0) size 120x27 + text run at (0,0) width 120: "My citation:" RenderBlock {DIV} at (14,66) size 756x144 RenderBlock {BLOCKQUOTE} at (40,0) size 676x60 [border: (2px solid #0000FF)] RenderBlock {DIV} at (2,2) size 672x28 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-006-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-006-expected.txt index 779df400aaa6..b3bb0237d474 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-006-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-br-quoted-006-expected.txt @@ -21,19 +21,19 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 351x19 - text run at (0,27) width 351: "Two blockquotes, with an unquoted blank line in between." - RenderBR {BR} at (351,27) size 0x19 - RenderText {#text} at (0,47) size 384x19 - text run at (0,47) width 384: "The first blockquote contains two lines, the second one is blank." - RenderBR {BR} at (384,47) size 0x19 - RenderText {#text} at (0,67) size 384x19 - text run at (0,67) width 384: "The second blockquote contains two lines, the first one is blank." - RenderBR {BR} at (384,67) size 0x19 + RenderText {#text} at (0,27) size 370x19 + text run at (0,27) width 370: "Two blockquotes, with an unquoted blank line in between." + RenderBR {BR} at (370,27) size 0x19 + RenderText {#text} at (0,47) size 403x19 + text run at (0,47) width 403: "The first blockquote contains two lines, the second one is blank." + RenderBR {BR} at (403,47) size 0x19 + RenderText {#text} at (0,67) size 403x19 + text run at (0,67) width 403: "The second blockquote contains two lines, the first one is blank." + RenderBR {BR} at (403,67) size 0x19 RenderBlock {DIV} at (0,114) size 784x300 [border: (2px solid #FF0000)] RenderBlock (anonymous) at (14,14) size 756x28 - RenderText {#text} at (0,0) size 117x27 - text run at (0,0) width 117: "My citation:" + RenderText {#text} at (0,0) size 120x27 + text run at (0,0) width 120: "My citation:" RenderBlock {DIV} at (14,66) size 756x196 RenderBlock {BLOCKQUOTE} at (40,0) size 676x60 [border: (2px solid #0000FF)] RenderBlock {DIV} at (2,2) size 672x28 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-011-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-011-expected.txt index 07798886da32..626edbb7df07 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-011-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-011-expected.txt @@ -9,14 +9,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x28 - RenderText {#text} at (0,0) size 620x27 - text run at (0,0) width 620: "Test inserting paragraphs: should see empty red box above \"baz\"" + RenderText {#text} at (0,0) size 627x27 + text run at (0,0) width 627: "Test inserting paragraphs: should see empty red box above \"baz\"" RenderBlock {DIV} at (0,28) size 784x12 RenderBlock {DIV} at (0,40) size 784x56 [border: (2px solid #FF0000)] RenderBR {BR} at (14,14) size 0x27 RenderBlock {DIV} at (0,96) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 33x27 - text run at (14,14) width 33: "baz" + RenderText {#text} at (14,14) size 34x27 + text run at (14,14) width 34: "baz" RenderBlock (anonymous) at (0,152) size 784x28 RenderText {#text} at (0,0) size 31x27 text run at (0,0) width 31: "bar" diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-012-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-012-expected.txt index aae891e5a7c5..153bfc17ff47 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-012-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-012-expected.txt @@ -13,12 +13,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x28 - RenderText {#text} at (0,0) size 620x27 - text run at (0,0) width 620: "Test inserting paragraphs: should see empty red box below \"baz\"" + RenderText {#text} at (0,0) size 628x27 + text run at (0,0) width 628: "Test inserting paragraphs: should see empty red box below \"baz\"" RenderBlock {DIV} at (0,28) size 784x12 RenderBlock {DIV} at (0,40) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 33x27 - text run at (14,14) width 33: "baz" + RenderText {#text} at (14,14) size 34x27 + text run at (14,14) width 34: "baz" RenderBlock {DIV} at (0,96) size 784x56 [border: (2px solid #FF0000)] RenderBR {BR} at (14,14) size 0x27 RenderBlock (anonymous) at (0,152) size 784x28 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-013-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-013-expected.txt index 82dbf186314e..2167314ba958 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-013-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-013-expected.txt @@ -13,12 +13,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x28 - RenderText {#text} at (0,0) size 628x27 - text run at (0,0) width 628: "Test inserting paragraphs: should see empty blue box above \"bar\"" + RenderText {#text} at (0,0) size 635x27 + text run at (0,0) width 635: "Test inserting paragraphs: should see empty blue box above \"bar\"" RenderBlock {DIV} at (0,28) size 784x36 RenderBlock {DIV} at (0,64) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 33x27 - text run at (14,14) width 33: "baz" + RenderText {#text} at (14,14) size 34x27 + text run at (14,14) width 34: "baz" RenderBlock {DIV} at (0,120) size 784x56 [border: (2px solid #0000FF)] RenderBR {BR} at (14,14) size 0x27 RenderBlock (anonymous) at (0,176) size 784x28 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-014-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-014-expected.txt index edee0481a59e..4f24ac4849df 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-014-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-014-expected.txt @@ -17,12 +17,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x28 - RenderText {#text} at (0,0) size 628x27 - text run at (0,0) width 628: "Test inserting paragraphs: should see empty blue box below \"bar\"" + RenderText {#text} at (0,0) size 636x27 + text run at (0,0) width 636: "Test inserting paragraphs: should see empty blue box below \"bar\"" RenderBlock {DIV} at (0,28) size 784x36 RenderBlock {DIV} at (0,64) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 33x27 - text run at (14,14) width 33: "baz" + RenderText {#text} at (14,14) size 34x27 + text run at (14,14) width 34: "baz" RenderBlock (anonymous) at (0,120) size 784x28 RenderText {#text} at (0,0) size 31x27 text run at (0,0) width 31: "bar" diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-015-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-015-expected.txt index e7800fe3f5d4..698a0db16ed8 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-015-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-015-expected.txt @@ -17,12 +17,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x28 - RenderText {#text} at (0,0) size 619x27 - text run at (0,0) width 619: "Test inserting paragraphs: should see empty red box above \"foo\"" + RenderText {#text} at (0,0) size 625x27 + text run at (0,0) width 625: "Test inserting paragraphs: should see empty red box above \"foo\"" RenderBlock {DIV} at (0,28) size 784x12 RenderBlock {DIV} at (0,40) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 33x27 - text run at (14,14) width 33: "baz" + RenderText {#text} at (14,14) size 34x27 + text run at (14,14) width 34: "baz" RenderBlock (anonymous) at (0,96) size 784x28 RenderText {#text} at (0,0) size 31x27 text run at (0,0) width 31: "bar" diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-016-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-016-expected.txt index d11b8a53ed70..0828838d5301 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-016-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-016-expected.txt @@ -21,12 +21,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x28 - RenderText {#text} at (0,0) size 681x27 - text run at (0,0) width 681: "Test inserting paragraphs: should see two empty red boxes below \"foo\"" + RenderText {#text} at (0,0) size 688x27 + text run at (0,0) width 688: "Test inserting paragraphs: should see two empty red boxes below \"foo\"" RenderBlock {DIV} at (0,28) size 784x12 RenderBlock {DIV} at (0,40) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 33x27 - text run at (14,14) width 33: "baz" + RenderText {#text} at (14,14) size 34x27 + text run at (14,14) width 34: "baz" RenderBlock (anonymous) at (0,96) size 784x28 RenderText {#text} at (0,0) size 31x27 text run at (0,0) width 31: "bar" diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-017-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-017-expected.txt index 02dce2be1b07..969a0d305956 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-017-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-017-expected.txt @@ -22,12 +22,12 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x28 - RenderText {#text} at (0,0) size 681x27 - text run at (0,0) width 681: "Test inserting paragraphs: should see two empty red boxes below \"foo\"" + RenderText {#text} at (0,0) size 688x27 + text run at (0,0) width 688: "Test inserting paragraphs: should see two empty red boxes below \"foo\"" RenderBlock {DIV} at (0,28) size 784x12 RenderBlock {DIV} at (0,40) size 784x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 33x27 - text run at (14,14) width 33: "baz" + RenderText {#text} at (14,14) size 34x27 + text run at (14,14) width 34: "baz" RenderBlock (anonymous) at (0,96) size 784x28 RenderText {#text} at (0,0) size 31x27 text run at (0,0) width 31: "bar" diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-018-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-018-expected.txt index 05550dd17d90..8d72ee0a669b 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-018-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-018-expected.txt @@ -11,8 +11,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x28 - RenderText {#text} at (0,0) size 657x27 - text run at (0,0) width 657: "Test inserting paragraphs: should see an empty blue box below \"bar\"" + RenderText {#text} at (0,0) size 665x27 + text run at (0,0) width 665: "Test inserting paragraphs: should see an empty blue box below \"bar\"" RenderBlock {DIV} at (0,28) size 784x36 RenderBlock (anonymous) at (0,64) size 784x28 RenderText {#text} at (0,0) size 31x27 @@ -21,6 +21,6 @@ layer at (0,0) size 800x600 RenderBlock (anonymous) at (14,14) size 756x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 33x27 - text run at (14,14) width 33: "baz" + RenderText {#text} at (14,14) size 34x27 + text run at (14,14) width 34: "baz" caret: position 0 of child 0 {BR} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-019-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-019-expected.txt index a8284b4ff87b..729a39db3414 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-019-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-019-expected.txt @@ -13,8 +13,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x568 RenderBlock (anonymous) at (0,0) size 784x56 - RenderText {#text} at (0,0) size 742x55 - text run at (0,0) width 742: "Test inserting paragraphs: should see an empty blue box above an empty line " + RenderText {#text} at (0,0) size 752x55 + text run at (0,0) width 752: "Test inserting paragraphs: should see an empty blue box above an empty line " text run at (0,28) width 237: "between \"foo\" and \"bar\"" RenderBlock {DIV} at (0,56) size 784x36 RenderBlock {P} at (0,116) size 784x56 [border: (2px solid #FF0000)] diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-020-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-020-expected.txt index ac6a416f0eab..00f3cc28e374 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-020-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-020-expected.txt @@ -15,9 +15,9 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x56 - RenderText {#text} at (0,0) size 760x55 - text run at (0,0) width 760: "Test inserting paragraphs: should see a blue box with \"bar\" in it, and two blank " - text run at (0,28) width 293: "lines between \"foo\" and \"bar\"." + RenderText {#text} at (0,0) size 770x55 + text run at (0,0) width 770: "Test inserting paragraphs: should see a blue box with \"bar\" in it, and two blank " + text run at (0,28) width 295: "lines between \"foo\" and \"bar\"." RenderBlock {DIV} at (0,56) size 784x36 RenderBlock (anonymous) at (0,92) size 784x84 RenderInline {SPAN} at (0,0) size 32x27 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-022-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-022-expected.txt index c5973362e317..cbc8cfee448c 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-022-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-022-expected.txt @@ -16,21 +16,21 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x568 RenderBlock (anonymous) at (0,0) size 784x112 - RenderText {#text} at (0,0) size 786x83 - text run at (0,0) width 754: "Test inserting paragraphs: should see \"foo\" in a blue box, then a blue box with " - text run at (0,28) width 786: "with two lines in it: First line a bold \"x\"; second line a non-bold \"bar\". Fix for this " - text run at (0,56) width 47: "bug: " - RenderInline {A} at (0,0) size 257x27 [color=#0000EE] - RenderText {#text} at (47,56) size 257x27 - text run at (47,56) width 257: "" - RenderText {#text} at (304,56) size 790x55 - text run at (304,56) width 486: " Style info applied to remainder of document after " - text run at (0,84) width 191: "a newline is entered" + RenderText {#text} at (0,0) size 763x83 + text run at (0,0) width 763: "Test inserting paragraphs: should see \"foo\" in a blue box, then a blue box with " + text run at (0,28) width 760: "with two lines in it: First line a bold \"x\"; second line a non-bold \"bar\". Fix for " + text run at (0,56) width 90: "this bug: " + RenderInline {A} at (0,0) size 260x27 [color=#0000EE] + RenderText {#text} at (90,56) size 260x27 + text run at (90,56) width 260: "" + RenderText {#text} at (350,56) size 691x55 + text run at (350,56) width 341: " Style info applied to remainder of " + text run at (0,84) width 347: "document after a newline is entered" RenderBlock {DIV} at (0,112) size 784x12 RenderBlock {P} at (0,148) size 784x55 [border: (2px solid #0000FF)] - RenderInline {B} at (0,0) size 31x26 - RenderText {#text} at (14,14) size 31x26 - text run at (14,14) width 31: "foo" + RenderInline {B} at (0,0) size 32x26 + RenderText {#text} at (14,14) size 32x26 + text run at (14,14) width 32: "foo" RenderBlock {P} at (0,227) size 784x83 [border: (2px solid #0000FF)] RenderInline {B} at (0,0) size 12x26 RenderText {#text} at (14,14) size 12x26 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-023-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-023-expected.txt index ef3cbf83003e..61a988363210 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-023-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-023-expected.txt @@ -30,19 +30,19 @@ layer at (0,0) size 785x685 RenderBlock {HTML} at (0,0) size 785x685 RenderBody {BODY} at (8,8) size 769x653 RenderBlock (anonymous) at (0,0) size 769x84 - RenderText {#text} at (0,0) size 750x55 - text run at (0,0) width 750: "Test inserting paragraphs and managing typing style correctly: \"x\" under \"line " - text run at (0,28) width 338: "2\" should be bold. Fix for this bug: " - RenderInline {A} at (0,0) size 257x27 [color=#0000EE] - RenderText {#text} at (338,28) size 257x27 - text run at (338,28) width 257: "" - RenderText {#text} at (595,28) size 744x55 - text run at (595,28) width 149: " in some cases, " - text run at (0,56) width 537: "text does not retain style info after pressing return twice" + RenderText {#text} at (0,0) size 764x55 + text run at (0,0) width 764: "Test inserting paragraphs and managing typing style correctly: \"x\" under \"line " + text run at (0,28) width 344: "2\" should be bold. Fix for this bug: " + RenderInline {A} at (0,0) size 260x27 [color=#0000EE] + RenderText {#text} at (344,28) size 260x27 + text run at (344,28) width 260: "" + RenderText {#text} at (604,28) size 755x55 + text run at (604,28) width 151: " in some cases, " + text run at (0,56) width 543: "text does not retain style info after pressing return twice" RenderBlock {DIV} at (0,84) size 769x12 RenderBlock {P} at (0,120) size 769x56 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 53x27 - text run at (14,14) width 53: "line 1" + RenderText {#text} at (14,14) size 55x27 + text run at (14,14) width 55: "line 1" RenderBlock {P} at (0,200) size 769x56 [border: (2px solid #0000FF)] RenderBR {BR} at (14,14) size 0x27 [bgcolor=#008000] RenderBlock {P} at (0,280) size 769x55 [border: (2px solid #0000FF)] @@ -59,6 +59,6 @@ layer at (0,0) size 785x685 RenderBlock {P} at (0,517) size 769x56 [border: (2px solid #0000FF)] RenderBR {BR} at (14,14) size 0x27 [bgcolor=#008000] RenderBlock {P} at (0,597) size 769x56 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 53x27 - text run at (14,14) width 53: "line 3" + RenderText {#text} at (14,14) size 55x27 + text run at (14,14) width 55: "line 3" caret: position 1 of child 0 {#text} of child 0 {B} of child 11 {P} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-024-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-024-expected.txt index 7d5c209e537c..0bad52956e05 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-024-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-024-expected.txt @@ -44,15 +44,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x568 RenderBlock (anonymous) at (0,0) size 784x112 - RenderText {#text} at (0,0) size 732x55 - text run at (0,0) width 732: "Test inserting paragraphs and managing typing style correctly: Only \"line 1\" " - text run at (0,28) width 617: "should be bold. Other lines should be non-bold. Fix for this bug: " - RenderInline {A} at (0,0) size 257x27 [color=#0000EE] - RenderText {#text} at (0,56) size 257x27 - text run at (0,56) width 257: "" - RenderText {#text} at (257,56) size 715x55 - text run at (257,56) width 458: " after pressing return twice, text is bold when it " - text run at (0,84) width 115: "shouldn't be" + RenderText {#text} at (0,0) size 747x55 + text run at (0,0) width 747: "Test inserting paragraphs and managing typing style correctly: Only \"line 1\" " + text run at (0,28) width 627: "should be bold. Other lines should be non-bold. Fix for this bug: " + RenderInline {A} at (0,0) size 260x27 [color=#0000EE] + RenderText {#text} at (0,56) size 260x27 + text run at (0,56) width 260: "" + RenderText {#text} at (260,56) size 724x55 + text run at (260,56) width 464: " after pressing return twice, text is bold when it " + text run at (0,84) width 116: "shouldn't be" RenderBlock {DIV} at (0,112) size 784x12 RenderBlock {P} at (0,148) size 784x55 [border: (2px solid #0000FF)] RenderInline {B} at (0,0) size 56x26 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-025-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-025-expected.txt index 77dd7a61a8a8..0ad006750926 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-025-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-025-expected.txt @@ -16,15 +16,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #0000FF)] - RenderText {#text} at (14,14) size 755x55 - text run at (14,14) width 755: "Should see \"foo\" and \"bar\" each in a separate red box. Note that the \"foo\" text" - text run at (14,42) width 151: "is really \"foo \". " - text run at (165,42) width 62: "There " - RenderInline {B} at (0,0) size 49x26 - RenderText {#text} at (227,42) size 49x26 - text run at (227,42) width 49: "must" - RenderText {#text} at (276,42) size 316x27 - text run at (276,42) width 316: " be a space at the end of the line." + RenderText {#text} at (14,14) size 715x55 + text run at (14,14) width 715: "Should see \"foo\" and \"bar\" each in a separate red box. Note that the \"foo\"" + text run at (14,42) width 197: "text is really \"foo \". " + text run at (211,42) width 63: "There " + RenderInline {B} at (0,0) size 50x26 + RenderText {#text} at (274,42) size 50x26 + text run at (274,42) width 50: "must" + RenderText {#text} at (324,42) size 318x27 + text run at (324,42) width 318: " be a space at the end of the line." RenderBlock {DIV} at (0,108) size 784x112 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] RenderText {#text} at (14,14) size 38x27 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-026-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-026-expected.txt index 955dbea42352..5cbe03a38894 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-026-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-026-expected.txt @@ -24,34 +24,34 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x210 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x111 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 711x55 - text run at (0,27) width 711: "Inserting blocks for paragraphs should do a better job of finding a block to" + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 721x55 + text run at (0,27) width 721: "Inserting blocks for paragraphs should do a better job of finding a block to" text run at (0,55) width 116: "insert after. " - RenderInline {A} at (0,0) size 257x27 [color=#0000EE] - RenderText {#text} at (116,55) size 257x27 - text run at (116,55) width 257: "" - RenderText {#text} at (373,55) size 728x55 - text run at (373,55) width 355: " Insert paragraph command puts new" - text run at (0,83) width 543: "block in wrong place, creating difficult-to-handle HTML" + RenderInline {A} at (0,0) size 260x27 [color=#0000EE] + RenderText {#text} at (116,55) size 260x27 + text run at (116,55) width 260: "" + RenderText {#text} at (376,55) size 734x55 + text run at (376,55) width 358: " Insert paragraph command puts new" + text run at (0,83) width 554: "block in wrong place, creating difficult-to-handle HTML" RenderBlock {DIV} at (14,141) size 756x55 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 436x27 - text run at (0,27) width 436: "Should see this content in the red box below: " - RenderInline {B} at (0,0) size 19x26 - RenderText {#text} at (436,27) size 19x26 - text run at (436,27) width 19: "fo" - RenderText {#text} at (455,27) size 12x27 - text run at (455,27) width 12: "x" + RenderText {#text} at (0,27) size 442x27 + text run at (0,27) width 442: "Should see this content in the red box below: " + RenderInline {B} at (0,0) size 20x26 + RenderText {#text} at (442,27) size 20x26 + text run at (442,27) width 20: "fo" + RenderText {#text} at (462,27) size 12x27 + text run at (462,27) width 12: "x" RenderBlock {DIV} at (0,234) size 784x32 RenderBlock {DIV} at (0,0) size 784x32 [border: (2px solid #FF0000)] - RenderInline {B} at (0,0) size 19x26 - RenderText {#text} at (2,2) size 19x26 - text run at (2,2) width 19: "fo" - RenderText {#text} at (21,2) size 12x27 - text run at (21,2) width 12: "x" + RenderInline {B} at (0,0) size 20x26 + RenderText {#text} at (2,2) size 20x26 + text run at (2,2) width 20: "fo" + RenderText {#text} at (22,2) size 12x27 + text run at (22,2) width 12: "x" caret: position 3 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-div-027-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-div-027-expected.txt index 00445c1197ff..2aacada6a996 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-div-027-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-div-027-expected.txt @@ -17,14 +17,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock (anonymous) at (0,0) size 784x56 - RenderText {#text} at (0,0) size 778x55 - text run at (0,0) width 778: "Test inserting paragraphs: should see two blue boxes, where the second blue box " - text run at (0,28) width 241: "starts with an empty line." + RenderText {#text} at (0,0) size 785x55 + text run at (0,0) width 785: "Test inserting paragraphs: should see two blue boxes, where the second blue box " + text run at (0,28) width 245: "starts with an empty line." RenderBlock {DIV} at (0,56) size 784x36 RenderBlock {DIV} at (0,92) size 784x112 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x56 [border: (2px solid #FF0000)] - RenderText {#text} at (14,14) size 33x27 - text run at (14,14) width 33: "baz" + RenderText {#text} at (14,14) size 34x27 + text run at (14,14) width 34: "baz" RenderBlock (anonymous) at (14,70) size 756x28 RenderText {#text} at (0,0) size 31x27 text run at (0,0) width 31: "bar" diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-01-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-01-expected.txt index 0ecf988d1256..4aa1d573ecf0 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-01-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-01-expected.txt @@ -9,17 +9,17 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 742x39 - text run at (0,0) width 341: "This tests inserting a paragraph separator before a table. " - text run at (341,0) width 401: "There should be an empty paragraph before the table and the caret" - text run at (0,20) width 185: "should be just before the table." + RenderText {#text} at (0,0) size 769x39 + text run at (0,0) width 353: "This tests inserting a paragraph separator before a table. " + text run at (353,0) width 416: "There should be an empty paragraph before the table and the caret" + text run at (0,20) width 192: "should be just before the table." RenderBlock {DIV} at (0,56) size 784x50 RenderBlock (anonymous) at (0,0) size 784x20 RenderBR {BR} at (0,0) size 0x19 - RenderTable {TABLE} at (0,20) size 30x30 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 28x28 - RenderTableRow {TR} at (0,2) size 28x24 - RenderTableCell {TD} at (2,2) size 24x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 20x19 - text run at (2,2) width 20: "foo" + RenderTable {TABLE} at (0,20) size 31x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 29x28 + RenderTableRow {TR} at (0,2) size 29x24 + RenderTableCell {TD} at (2,2) size 25x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 21x19 + text run at (2,2) width 21: "foo" caret: position 0 of child 1 {TABLE} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-02-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-02-expected.txt index 628a6bef2efb..259906437265 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-02-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-02-expected.txt @@ -15,17 +15,17 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 764x39 - text run at (0,0) width 329: "This tests inserting a paragraph separator after a table. " - text run at (329,0) width 435: "There should be an empty paragraph between the table and 'bar' and the" - text run at (0,20) width 238: "caret should be in the empty paragraph." + RenderText {#text} at (0,0) size 770x39 + text run at (0,0) width 341: "This tests inserting a paragraph separator after a table. " + text run at (341,0) width 429: "There should be an empty paragraph between the table and 'bar' and" + text run at (0,20) width 271: "the caret should be in the empty paragraph." RenderBlock {DIV} at (0,56) size 784x70 - RenderTable {TABLE} at (0,0) size 30x30 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 28x28 - RenderTableRow {TR} at (0,2) size 28x24 - RenderTableCell {TD} at (2,2) size 24x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 20x19 - text run at (2,2) width 20: "foo" + RenderTable {TABLE} at (0,0) size 31x30 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 29x28 + RenderTableRow {TR} at (0,2) size 29x24 + RenderTableCell {TD} at (2,2) size 25x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 21x19 + text run at (2,2) width 21: "foo" RenderBlock (anonymous) at (0,30) size 784x40 RenderBR {BR} at (0,0) size 0x19 RenderText {#text} at (0,20) size 20x19 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-03-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-03-expected.txt index 4005c6b2103b..ad82fd421e19 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-03-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-03-expected.txt @@ -11,15 +11,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 759x39 - text run at (0,0) width 396: "This tests inserting a paragraph separator before a horizontal rule. " - text run at (396,0) width 363: "You should see 'foo', empty paragraph, horizontal rule, 'bar'," - text run at (0,20) width 322: "and the caret should be just before the horizontal rule." + RenderText {#text} at (0,0) size 758x39 + text run at (0,0) width 414: "This tests inserting a paragraph separator before a horizontal rule. " + text run at (414,0) width 344: "You should see 'foo', empty paragraph, horizontal rule," + text run at (0,20) width 371: "'bar', and the caret should be just before the horizontal rule." RenderBlock {DIV} at (0,56) size 784x78 RenderBlock (anonymous) at (0,0) size 784x40 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" - RenderBR {BR} at (20,0) size 0x19 + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" + RenderBR {BR} at (21,0) size 0x19 RenderBR {BR} at (0,20) size 0x19 RenderBlock (anonymous) at (0,58) size 784x20 RenderText {#text} at (0,0) size 20x19 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-04-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-04-expected.txt index 2d01bdfe5680..07f6df43103e 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-04-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-04-expected.txt @@ -13,15 +13,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x60 - RenderText {#text} at (0,0) size 773x39 - text run at (0,0) width 384: "This tests inserting a paragraph separator after a horizontal rule. " - text run at (384,0) width 389: "You should see 'foo', empty paragraph, horizontal rule, 'bar', and" - text run at (0,20) width 288: "the caret should be just after the horizontal rule. " - RenderInline {B} at (0,0) size 766x39 - RenderText {#text} at (288,20) size 766x39 - text run at (288,20) width 167: "This demonstrates 8345. " - text run at (455,20) width 311: "The caret after a horizontal rule is drawn in the" - text run at (0,40) width 335: "same location as the caret before a horizontal rule." + RenderText {#text} at (0,0) size 780x39 + text run at (0,0) width 402: "This tests inserting a paragraph separator after a horizontal rule. " + text run at (402,0) width 378: "You should see 'foo', empty paragraph, horizontal rule, 'bar'," + text run at (0,20) width 329: "and the caret should be just after the horizontal rule. " + RenderInline {B} at (0,0) size 777x39 + RenderText {#text} at (329,20) size 777x39 + text run at (329,20) width 168: "This demonstrates 8345. " + text run at (497,20) width 280: "The caret after a horizontal rule is drawn" + text run at (0,40) width 381: "in the same location as the caret before a horizontal rule." RenderBlock (anonymous) at (0,76) size 784x0 RenderInline {B} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 @@ -32,8 +32,8 @@ layer at (0,0) size 800x600 text run at (0,0) width 21: "foo" RenderBlock (anonymous) at (0,38) size 784x40 RenderBR {BR} at (0,0) size 0x19 - RenderText {#text} at (0,20) size 22x19 - text run at (0,20) width 22: "bar" + RenderText {#text} at (0,20) size 24x19 + text run at (0,20) width 24: "bar" RenderBlock (anonymous) at (0,154) size 784x0 RenderInline {B} at (0,0) size 0x0 layer at (8,112) size 784x2 clip at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-05-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-05-expected.txt index 821f4c934a06..9653584bcf15 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-05-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-paragraph-05-expected.txt @@ -9,19 +9,20 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 580x19 - text run at (0,0) width 580: "This tests inserting a paragraph separator before a special element at the start of an editable root." + RenderText {#text} at (0,0) size 601x19 + text run at (0,0) width 601: "This tests inserting a paragraph separator before a special element at the start of an editable root." RenderBlock {P} at (0,36) size 784x20 - RenderText {#text} at (0,0) size 578x19 - text run at (0,0) width 578: "Visually, it should leave a blank line before the link, and the caret selection at the start of the link." - RenderBlock {P} at (0,72) size 784x20 - RenderText {#text} at (0,0) size 753x19 - text run at (0,0) width 753: "Structurally, the empty paragraph element should go before the anchor element, rather than inside of it. See Radar #5452675." - RenderBlock {DIV} at (0,108) size 784x40 + RenderText {#text} at (0,0) size 609x19 + text run at (0,0) width 609: "Visually, it should leave a blank line before the link, and the caret selection at the start of the link." + RenderBlock {P} at (0,72) size 784x40 + RenderText {#text} at (0,0) size 713x39 + text run at (0,0) width 713: "Structurally, the empty paragraph element should go before the anchor element, rather than inside of it. See Radar" + text run at (0,20) width 68: "#5452675." + RenderBlock {DIV} at (0,128) size 784x40 RenderBlock {DIV} at (0,0) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderBlock (anonymous) at (0,20) size 784x20 - RenderInline {A} at (0,0) size 53x19 [color=#0000EE] - RenderText {#text} at (0,0) size 53x19 - text run at (0,0) width 53: "applesite" + RenderInline {A} at (0,0) size 55x19 [color=#0000EE] + RenderText {#text} at (0,0) size 55x19 + text run at (0,0) width 55: "applesite" caret: position 0 of child 0 {#text} of child 1 {A} of child 6 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/insert-text-with-newlines-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/insert-text-with-newlines-expected.txt index 6106793417cb..dfdedc3dc835 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/insert-text-with-newlines-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/insert-text-with-newlines-expected.txt @@ -58,14 +58,14 @@ layer at (0,0) size 800x600 RenderText {#text} at (14,14) size 79x27 text run at (14,14) width 79: "Foo xxx" RenderBR {BR} at (93,14) size 0x27 - RenderInline {I} at (0,0) size 34x27 - RenderText {#text} at (14,42) size 34x27 - text run at (14,42) width 34: "bar" - RenderText {#text} at (48,42) size 42x27 - text run at (48,42) width 6: " " - text run at (54,42) width 36: "xxx" - RenderBR {BR} at (90,42) size 0x27 + RenderInline {I} at (0,0) size 33x27 + RenderText {#text} at (14,42) size 33x27 + text run at (14,42) width 33: "bar" + RenderText {#text} at (47,42) size 42x27 + text run at (47,42) width 6: " " + text run at (53,42) width 36: "xxx" + RenderBR {BR} at (89,42) size 0x27 RenderBR {BR} at (14,70) size 0x27 - RenderText {#text} at (14,98) size 69x27 - text run at (14,98) width 69: "bazxxx" + RenderText {#text} at (14,98) size 70x27 + text run at (14,98) width 70: "bazxxx" caret: position 6 of child 6 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/line-break-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/line-break-expected.txt index 1e95d2f38c31..611760fd9503 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/line-break-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/line-break-expected.txt @@ -9,10 +9,10 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 754x39 - text run at (0,0) width 273: "This testcase used to break InsertLineBreak. " - text run at (273,0) width 481: "The editable region below should have two empty paragraphs in it, and the caret" - text run at (0,20) width 145: "should be in the second." + RenderText {#text} at (0,0) size 753x39 + text run at (0,0) width 282: "This testcase used to break InsertLineBreak. " + text run at (282,0) width 471: "The editable region below should have two empty paragraphs in it, and the" + text run at (0,20) width 186: "caret should be in the second." RenderBlock {DIV} at (0,56) size 784x40 RenderBlock {DIV} at (0,0) size 784x40 RenderBR {BR} at (0,0) size 0x19 diff --git a/LayoutTests/platform/wincairo/editing/inserting/multiple-lines-selected-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/multiple-lines-selected-expected.txt index 073d6fd47f80..6736bb960bbe 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/multiple-lines-selected-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/multiple-lines-selected-expected.txt @@ -4,6 +4,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification +EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of DIV > DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification @@ -13,15 +14,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 770x39 - text run at (0,0) width 532: "This tests inserting a paragraph separator into a selection that spans multiple paragraphs. " - text run at (532,0) width 238: "'ar' should be on the line after 'f' and the" - text run at (0,20) width 203: "caret should be just before the 'a'." + RenderText {#text} at (0,0) size 783x39 + text run at (0,0) width 556: "This tests inserting a paragraph separator into a selection that spans multiple paragraphs. " + text run at (556,0) width 227: "'ar' should be on the line after 'f' and" + text run at (0,20) width 232: "the caret should be just before the 'a'." RenderBlock {DIV} at (0,56) size 784x40 RenderBlock {DIV} at (0,0) size 784x20 RenderText {#text} at (0,0) size 4x19 text run at (0,0) width 4: "f" RenderBlock {DIV} at (0,20) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "bar" + RenderText {#text} at (0,0) size 12x19 + text run at (0,0) width 12: "ar" caret: position 0 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-01-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-01-expected.txt index e6b9a463fdc2..360b7fc13a29 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-01-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-01-expected.txt @@ -11,13 +11,13 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 560x19 - text run at (0,0) width 348: "Tests for a bug in the paragraph separator insertion code. " - text run at (348,0) width 212: "Only one newline should be added." + RenderText {#text} at (0,0) size 584x19 + text run at (0,0) width 360: "Tests for a bug in the paragraph separator insertion code. " + text run at (360,0) width 224: "Only one newline should be added." RenderBlock {DIV} at (0,36) size 784x60 RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" RenderBlock {DIV} at (0,20) size 784x40 RenderBlock (anonymous) at (0,0) size 784x20 RenderBR {BR} at (0,0) size 0x19 diff --git a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-02-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-02-expected.txt index b0d736a40262..7206a0ce9af9 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-02-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-02-expected.txt @@ -11,13 +11,13 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 560x19 - text run at (0,0) width 348: "Tests for a bug in the paragraph separator insertion code. " - text run at (348,0) width 212: "Only one newline should be added." + RenderText {#text} at (0,0) size 584x19 + text run at (0,0) width 360: "Tests for a bug in the paragraph separator insertion code. " + text run at (360,0) width 224: "Only one newline should be added." RenderBlock {DIV} at (0,36) size 784x60 RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" RenderBlock {DIV} at (0,20) size 784x40 RenderBlock (anonymous) at (0,0) size 784x20 RenderBR {BR} at (0,0) size 0x19 diff --git a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-03-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-03-expected.txt index cf80dea89952..f17e93765c98 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-03-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-03-expected.txt @@ -12,19 +12,18 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x579 RenderBlock {P} at (0,0) size 784x60 - RenderText {#text} at (0,0) size 776x59 - text run at (0,0) width 776: "Tests for a bug in the paragraph separator insertion code that would add an extra newline when inserting a paragraph separator at" - text run at (0,20) width 327: "the end of a paragraph in text that preserves newlines. " - text run at (327,20) width 329: "Also, an extraneous space would be added after 'foo'. " - text run at (656,20) width 104: "Only one newline" - text run at (0,40) width 108: "should be added. " - text run at (108,40) width 259: "And there should be no extraneous spaces." + RenderText {#text} at (0,0) size 754x59 + text run at (0,0) width 733: "Tests for a bug in the paragraph separator insertion code that would add an extra newline when inserting a paragraph" + text run at (0,20) width 418: "separator at the end of a paragraph in text that preserves newlines. " + text run at (418,20) width 336: "Also, an extraneous space would be added after 'foo'." + text run at (0,40) width 228: "Only one newline should be added. " + text run at (228,40) width 269: "And there should be no extraneous spaces." RenderBlock {P} at (0,76) size 784x20 - RenderInline {B} at (0,0) size 150x19 - RenderText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "It demonstrates a bug:" - RenderText {#text} at (150,0) size 552x19 - text run at (150,0) width 552: " too much padding is left between the new line and the end of the paragraph containing 'foo'." + RenderInline {B} at (0,0) size 152x19 + RenderText {#text} at (0,0) size 152x19 + text run at (0,0) width 152: "It demonstrates a bug:" + RenderText {#text} at (152,0) size 583x19 + text run at (152,0) width 583: " too much padding is left between the new line and the end of the paragraph containing 'foo'." RenderBlock {DIV} at (0,112) size 784x61 RenderBlock {PRE} at (0,0) size 784x16 RenderText {#text} at (0,0) size 24x16 diff --git a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-in-table-1-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-in-table-1-expected.txt index f572ad115d60..cd5bddd97835 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-in-table-1-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-in-table-1-expected.txt @@ -10,21 +10,21 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 589x19 - text run at (0,0) width 325: "This tests InsertParagraphSeparator inside table cells. " - text run at (325,0) width 264: "'Cell' and 'Two' should be on separate lines." + RenderText {#text} at (0,0) size 612x19 + text run at (0,0) width 337: "This tests InsertParagraphSeparator inside table cells. " + text run at (337,0) width 275: "'Cell' and 'Two' should be on separate lines." RenderBlock {DIV} at (0,36) size 784x50 - RenderTable {TABLE} at (0,0) size 98x50 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 96x48 - RenderTableRow {TR} at (0,2) size 96x44 - RenderTableCell {TD} at (2,12) size 58x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 54x19 - text run at (2,2) width 54: "Cell One" - RenderTableCell {TD} at (62,2) size 32x44 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (2,2) size 24x19 - text run at (2,2) width 24: "Cell" - RenderBR {BR} at (26,2) size 0x19 - RenderInline {SPAN} at (0,0) size 28x19 - RenderText {#text} at (2,22) size 28x19 - text run at (2,22) width 28: "Two" + RenderTable {TABLE} at (0,0) size 102x50 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 100x48 + RenderTableRow {TR} at (0,2) size 100x44 + RenderTableCell {TD} at (2,12) size 61x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 57x19 + text run at (2,2) width 57: "Cell One" + RenderTableCell {TD} at (65,2) size 33x44 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (2,2) size 26x19 + text run at (2,2) width 26: "Cell" + RenderBR {BR} at (28,2) size 0x19 + RenderInline {SPAN} at (0,0) size 29x19 + RenderText {#text} at (2,22) size 29x19 + text run at (2,22) width 29: "Two" caret: position 0 of child 0 {#text} of child 2 {SPAN} of child 1 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-in-table-2-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-in-table-2-expected.txt index 779446f955fe..826de0a3c817 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-in-table-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/paragraph-separator-in-table-2-expected.txt @@ -10,22 +10,22 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 774x39 - text run at (0,0) width 325: "This tests InsertParagraphSeparator inside table cells. " - text run at (325,0) width 449: "The first cell should contain 'Cell' and a newline, and the second cell should" - text run at (0,20) width 85: "contain 'Two'." + RenderText {#text} at (0,0) size 768x39 + text run at (0,0) width 337: "This tests InsertParagraphSeparator inside table cells. " + text run at (337,0) width 431: "The first cell should contain 'Cell' and a newline, and the second cell" + text run at (0,20) width 135: "should contain 'Two'." RenderBlock {DIV} at (0,56) size 784x50 - RenderTable {TABLE} at (0,0) size 76x50 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 74x48 - RenderTableRow {TR} at (0,2) size 74x44 - RenderTableCell {TD} at (2,2) size 32x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderText {#text} at (2,2) size 28x19 - text run at (2,2) width 24: "Cell" - text run at (26,2) width 4: " " - RenderBR {BR} at (30,2) size 0x19 + RenderTable {TABLE} at (0,0) size 79x50 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 77x48 + RenderTableRow {TR} at (0,2) size 77x44 + RenderTableCell {TD} at (2,2) size 34x44 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 30x19 + text run at (2,2) width 26: "Cell" + text run at (28,2) width 4: " " + RenderBR {BR} at (32,2) size 0x19 RenderBR {BR} at (2,22) size 0x19 - RenderTableCell {TD} at (36,12) size 36x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] - RenderText {#text} at (2,2) size 32x19 + RenderTableCell {TD} at (38,12) size 37x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (2,2) size 33x19 text run at (2,2) width 4: " " - text run at (6,2) width 28: "Two" + text run at (6,2) width 29: "Two" caret: position 0 of child 2 {BR} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/redo-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/redo-expected.txt index 03934e8823cf..5b102f667ab0 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/redo-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/redo-expected.txt @@ -16,6 +16,6 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 282x19 - text run at (0,0) width 282: "The caret should be at the end of this sentence." + RenderText {#text} at (0,0) size 294x19 + text run at (0,0) width 294: "The caret should be at the end of this sentence." caret: position 48 of child 0 {#text} of child 0 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-001-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-001-expected.txt index b308e78ff0e9..cc735479ca96 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-001-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-001-expected.txt @@ -13,33 +13,33 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x294 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x83 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 158x27 - text run at (0,27) width 158: "Fix for this bug: " - RenderInline {A} at (0,0) size 257x27 [color=#0000EE] - RenderText {#text} at (158,27) size 257x27 - text run at (158,27) width 257: "" - RenderText {#text} at (415,27) size 719x55 - text run at (415,27) width 304: " Hitting return key with full line" - text run at (0,55) width 420: "selected does not add blank line as it should" + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 162x27 + text run at (0,27) width 162: "Fix for this bug: " + RenderInline {A} at (0,0) size 260x27 [color=#0000EE] + RenderText {#text} at (162,27) size 260x27 + text run at (162,27) width 260: "" + RenderText {#text} at (422,27) size 734x55 + text run at (422,27) width 312: " Hitting return key with full line" + text run at (0,55) width 426: "selected does not add blank line as it should" RenderBlock {DIV} at (14,113) size 756x167 RenderBlock (anonymous) at (0,0) size 756x83 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 703x55 - text run at (0,27) width 703: "Should see this content in the red box below (note that the insertion point" - text run at (0,55) width 657: "should be at the start of the third line, immediately preceding \"baz\"):" + RenderText {#text} at (0,27) size 711x55 + text run at (0,27) width 711: "Should see this content in the red box below (note that the insertion point" + text run at (0,55) width 670: "should be at the start of the third line, immediately preceding \"baz\"):" RenderBlock {DIV} at (0,83) size 756x28 RenderText {#text} at (0,0) size 32x27 text run at (0,0) width 32: "foo" RenderBlock {DIV} at (0,111) size 756x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (0,139) size 756x28 - RenderText {#text} at (0,0) size 33x27 - text run at (0,0) width 33: "baz" + RenderText {#text} at (0,0) size 34x27 + text run at (0,0) width 34: "baz" RenderBlock {DIV} at (0,318) size 784x88 RenderBlock {DIV} at (0,0) size 784x88 [border: (2px solid #FF0000)] RenderBlock {DIV} at (2,2) size 780x28 @@ -48,6 +48,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (2,30) size 780x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (2,58) size 780x28 - RenderText {#text} at (0,0) size 33x27 - text run at (0,0) width 33: "baz" + RenderText {#text} at (0,0) size 34x27 + text run at (0,0) width 34: "baz" caret: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {DIV} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-002-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-002-expected.txt index bb8b7b917fe5..5cdea3c5cea9 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-002-expected.txt @@ -15,33 +15,33 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x322 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x111 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 604x27 - text run at (0,27) width 604: "A scenario I thought of based on my experiences with this bug:" - RenderInline {A} at (0,0) size 257x27 [color=#0000EE] - RenderText {#text} at (0,55) size 257x27 - text run at (0,55) width 257: "" - RenderText {#text} at (257,55) size 732x55 - text run at (257,55) width 475: " Hitting return key with full line selected does not" - text run at (0,83) width 249: "add blank line as it should" + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 611x27 + text run at (0,27) width 611: "A scenario I thought of based on my experiences with this bug:" + RenderInline {A} at (0,0) size 260x27 [color=#0000EE] + RenderText {#text} at (0,55) size 260x27 + text run at (0,55) width 260: "" + RenderText {#text} at (260,55) size 744x55 + text run at (260,55) width 484: " Hitting return key with full line selected does not" + text run at (0,83) width 254: "add blank line as it should" RenderBlock {DIV} at (14,141) size 756x167 RenderBlock (anonymous) at (0,0) size 756x83 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 703x55 - text run at (0,27) width 703: "Should see this content in the red box below (note that the insertion point" - text run at (0,55) width 657: "should be at the start of the third line, immediately preceding \"baz\"):" + RenderText {#text} at (0,27) size 711x55 + text run at (0,27) width 711: "Should see this content in the red box below (note that the insertion point" + text run at (0,55) width 670: "should be at the start of the third line, immediately preceding \"baz\"):" RenderBlock {DIV} at (0,83) size 756x28 RenderText {#text} at (0,0) size 32x27 text run at (0,0) width 32: "foo" RenderBlock {DIV} at (0,111) size 756x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (0,139) size 756x28 - RenderText {#text} at (0,0) size 33x27 - text run at (0,0) width 33: "baz" + RenderText {#text} at (0,0) size 34x27 + text run at (0,0) width 34: "baz" RenderBlock {DIV} at (0,346) size 784x88 RenderBlock {DIV} at (0,0) size 784x88 [border: (2px solid #FF0000)] RenderBlock {DIV} at (2,2) size 780x28 @@ -50,6 +50,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (2,30) size 780x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (2,58) size 780x28 - RenderText {#text} at (0,0) size 33x27 - text run at (0,0) width 33: "baz" + RenderText {#text} at (0,0) size 34x27 + text run at (0,0) width 34: "baz" caret: position 0 of child 0 {#text} of child 3 {DIV} of child 1 {DIV} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-003-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-003-expected.txt index 07e928d0677c..c1c9c7424241 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-003-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/return-key-with-selection-003-expected.txt @@ -16,26 +16,26 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x378 [border: (2px solid #0000FF)] RenderBlock {DIV} at (14,14) size 756x111 - RenderText {#text} at (0,0) size 66x26 - text run at (0,0) width 66: "Tests: " - RenderBR {BR} at (66,0) size 0x26 - RenderText {#text} at (0,27) size 604x27 - text run at (0,27) width 604: "A scenario I thought of based on my experiences with this bug:" - RenderInline {A} at (0,0) size 257x27 [color=#0000EE] - RenderText {#text} at (0,55) size 257x27 - text run at (0,55) width 257: "" - RenderText {#text} at (257,55) size 732x55 - text run at (257,55) width 475: " Hitting return key with full line selected does not" - text run at (0,83) width 249: "add blank line as it should" + RenderText {#text} at (0,0) size 65x26 + text run at (0,0) width 65: "Tests: " + RenderBR {BR} at (65,0) size 0x26 + RenderText {#text} at (0,27) size 611x27 + text run at (0,27) width 611: "A scenario I thought of based on my experiences with this bug:" + RenderInline {A} at (0,0) size 260x27 [color=#0000EE] + RenderText {#text} at (0,55) size 260x27 + text run at (0,55) width 260: "" + RenderText {#text} at (260,55) size 744x55 + text run at (260,55) width 484: " Hitting return key with full line selected does not" + text run at (0,83) width 254: "add blank line as it should" RenderBlock {DIV} at (14,141) size 756x223 RenderBlock (anonymous) at (0,0) size 756x111 RenderText {#text} at (0,0) size 189x26 text run at (0,0) width 189: "Expected Results: " RenderBR {BR} at (189,0) size 0x26 - RenderText {#text} at (0,27) size 739x83 - text run at (0,27) width 718: "Should see this content in the red box below (note that there should be two" - text run at (0,55) width 739: "blank lines between \"foo\" and \"baz\"; also note that the insertion point should" - text run at (0,83) width 422: "be at the start of the third line, a blank line):" + RenderText {#text} at (0,27) size 748x83 + text run at (0,27) width 724: "Should see this content in the red box below (note that there should be two" + text run at (0,55) width 748: "blank lines between \"foo\" and \"baz\"; also note that the insertion point should" + text run at (0,83) width 429: "be at the start of the third line, a blank line):" RenderBlock {DIV} at (0,111) size 756x28 RenderText {#text} at (0,0) size 32x27 text run at (0,0) width 32: "foo" @@ -44,8 +44,8 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,167) size 756x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (0,195) size 756x28 - RenderText {#text} at (0,0) size 33x27 - text run at (0,0) width 33: "baz" + RenderText {#text} at (0,0) size 34x27 + text run at (0,0) width 34: "baz" RenderBlock {DIV} at (0,402) size 784x116 RenderBlock {DIV} at (0,0) size 784x116 [border: (2px solid #FF0000)] RenderBlock {DIV} at (2,2) size 780x28 @@ -56,6 +56,6 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (2,58) size 780x28 RenderBR {BR} at (0,0) size 0x27 RenderBlock {DIV} at (2,86) size 780x28 - RenderText {#text} at (0,0) size 33x27 - text run at (0,0) width 33: "baz" + RenderText {#text} at (0,0) size 34x27 + text run at (0,0) width 34: "baz" caret: position 0 of child 0 {BR} of child 3 {DIV} of child 1 {DIV} of child 3 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/typing-002-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/typing-002-expected.txt index 1ec1b78e2ab7..bc0407335d2f 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/typing-002-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/typing-002-expected.txt @@ -20,11 +20,11 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)] - RenderInline {SPAN} at (0,0) size 113x27 + RenderInline {SPAN} at (0,0) size 112x27 RenderText {#text} at (14,14) size 79x27 text run at (14,14) width 79: "Foo xxx" - RenderInline {I} at (0,0) size 34x27 - RenderText {#text} at (93,14) size 34x27 - text run at (93,14) width 34: "bar" + RenderInline {I} at (0,0) size 33x27 + RenderText {#text} at (93,14) size 33x27 + text run at (93,14) width 33: "bar" RenderText {#text} at (0,0) size 0x0 caret: position 7 of child 0 {#text} of child 1 {SPAN} of child 1 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/inserting/typing-at-end-of-line-expected.txt b/LayoutTests/platform/wincairo/editing/inserting/typing-at-end-of-line-expected.txt index 9ae31c2b33e4..1f22c8be8349 100644 --- a/LayoutTests/platform/wincairo/editing/inserting/typing-at-end-of-line-expected.txt +++ b/LayoutTests/platform/wincairo/editing/inserting/typing-at-end-of-line-expected.txt @@ -24,13 +24,13 @@ layer at (0,0) size 800x585 RenderBlock {HTML} at (0,0) size 800x585 RenderBody {BODY} at (8,8) size 784x569 RenderBlock {DIV} at (0,0) size 784x60 - RenderText {#text} at (0,0) size 739x59 - text run at (0,0) width 739: "This test validates the fix for a bug that occurred when typing a blank at the end of a line when the character doesn't fix by a" - text run at (0,20) width 725: "fraction of a pixel. If the test runs correctly, you should see the word 'you' at the end of the line and the word 'have' at the" - text run at (0,40) width 180: "beginning of the following line." + RenderText {#text} at (0,0) size 779x59 + text run at (0,0) width 779: "This test validates the fix for a bug that occurred when typing a blank at the end of a line when the character doesn't fix by a" + text run at (0,20) width 759: "fraction of a pixel. If the test runs correctly, you should see the word 'you' at the end of the line and the word 'have' at the" + text run at (0,40) width 199: "beginning of the following line." RenderBlock (anonymous) at (0,60) size 784x20 RenderBR {BR} at (0,0) size 0x19 RenderBlock {DIV} at (0,80) size 871x100 - RenderText {#text} at (0,0) size 748x15 - text run at (0,0) width 748: "and Anna, you can do your regular weekly report run, and I'll extract the key sections into this. Andrew and Mark, I'd like to include any new bits you have" + RenderText {#text} at (0,0) size 733x15 + text run at (0,0) width 733: "and Anna, you can do your regular weekly report run, and I'll extract the key sections into this. Andrew and Mark, I'd like to include any new bits you have" caret: position 157 of child 0 {#text} of child 5 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/pasteboard/3976872-expected.txt b/LayoutTests/platform/wincairo/editing/pasteboard/3976872-expected.txt index 2d1cb5693f36..d0003d336d05 100644 --- a/LayoutTests/platform/wincairo/editing/pasteboard/3976872-expected.txt +++ b/LayoutTests/platform/wincairo/editing/pasteboard/3976872-expected.txt @@ -19,21 +19,21 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 363x19 - text run at (0,0) width 363: "This tests paste and match style on an empty (but styled) line" + RenderText {#text} at (0,0) size 381x19 + text run at (0,0) width 381: "This tests paste and match style on an empty (but styled) line" RenderBlock {P} at (0,36) size 784x40 - RenderText {#text} at (0,0) size 756x39 - text run at (0,0) width 756: "The first line is copied (unstyled), then it's bolded, then a paragraph separator is inserted and the original unstyled line is pasted" - text run at (0,20) width 127: "(with style matching)." + RenderText {#text} at (0,0) size 751x39 + text run at (0,0) width 751: "The first line is copied (unstyled), then it's bolded, then a paragraph separator is inserted and the original unstyled line is" + text run at (0,20) width 181: "pasted (with style matching)." RenderBlock {DIV} at (0,102) size 784x44 RenderBlock {DIV} at (0,0) size 784x22 [border: (1px solid #FF0000)] - RenderInline {B} at (0,0) size 181x19 - RenderText {#text} at (1,1) size 181x19 - text run at (1,1) width 181: "this text should end up bold" + RenderInline {B} at (0,0) size 187x19 + RenderText {#text} at (1,1) size 187x19 + text run at (1,1) width 187: "this text should end up bold" RenderBlock {DIV} at (0,22) size 784x22 [border: (1px solid #FF0000)] - RenderInline {B} at (0,0) size 181x19 - RenderText {#text} at (1,1) size 181x19 - text run at (1,1) width 181: "this text should end up bold" + RenderInline {B} at (0,0) size 187x19 + RenderText {#text} at (1,1) size 187x19 + text run at (1,1) width 187: "this text should end up bold" layer at (8,100) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)] caret: position 28 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 7 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/pasteboard/4076267-2-expected.txt b/LayoutTests/platform/wincairo/editing/pasteboard/4076267-2-expected.txt index 9d69c2982b09..ce05ef4571c6 100644 --- a/LayoutTests/platform/wincairo/editing/pasteboard/4076267-2-expected.txt +++ b/LayoutTests/platform/wincairo/editing/pasteboard/4076267-2-expected.txt @@ -19,14 +19,14 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 365x19 - text run at (0,0) width 365: "This tests to see if trailing spaces are lost during a copy/paste" + RenderText {#text} at (0,0) size 381x19 + text run at (0,0) width 381: "This tests to see if trailing spaces are lost during a copy/paste" RenderBlock {DIV} at (0,46) size 784x28 [border: (2px solid #FFAAAA)] RenderBlock {DIV} at (2,2) size 780x24 [border: (2px solid #AAAAFF)] - RenderText {#text} at (2,2) size 547x19 - text run at (2,2) width 539: "there should be a single trailing space between the '.' and the last character in this sentence" - text run at (541,2) width 4: " " - text run at (545,2) width 4: "." + RenderText {#text} at (2,2) size 573x19 + text run at (2,2) width 565: "there should be a single trailing space between the '.' and the last character in this sentence" + text run at (567,2) width 4: " " + text run at (571,2) width 4: "." layer at (8,44) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,36) size 784x2 [border: (1px inset #000000)] caret: position 96 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/pasteboard/4076267-3-expected.txt b/LayoutTests/platform/wincairo/editing/pasteboard/4076267-3-expected.txt index e9a5f92cc6a3..ba8c6e0842df 100644 --- a/LayoutTests/platform/wincairo/editing/pasteboard/4076267-3-expected.txt +++ b/LayoutTests/platform/wincairo/editing/pasteboard/4076267-3-expected.txt @@ -122,11 +122,11 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: shouldInsertText:x x replacingDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 6 of #text > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldInsertText:x x replacingDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > DIV > BODY > HTML > #document to 6 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE +EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > DIV > BODY > HTML > #document to 5 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE @@ -477,89 +477,87 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This tests to see if spaces are lost during a copy/paste" + RenderText {#text} at (0,0) size 333x19 + text run at (0,0) width 333: "This tests to see if spaces are lost during a copy/paste" RenderBlock {DIV} at (0,46) size 784x220 RenderBlock (anonymous) at (0,0) size 784x20 - RenderText {#text} at (0,0) size 18x19 - text run at (0,0) width 18: "x x" + RenderText {#text} at (0,0) size 19x19 + text run at (0,0) width 19: "x x" RenderBlock {DIV} at (0,20) size 784x20 - RenderText {#text} at (0,0) size 22x19 - text run at (0,0) width 11: "x " - text run at (11,0) width 4: " " - text run at (15,0) width 7: "x" + RenderText {#text} at (0,0) size 23x19 + text run at (0,0) width 12: "x " + text run at (12,0) width 4: " " + text run at (16,0) width 7: "x" RenderBlock {DIV} at (0,40) size 784x20 - RenderText {#text} at (0,0) size 26x19 - text run at (0,0) width 11: "x " - text run at (11,0) width 4: " " - text run at (15,0) width 11: " x" + RenderText {#text} at (0,0) size 27x19 + text run at (0,0) width 12: "x " + text run at (12,0) width 4: " " + text run at (16,0) width 11: " x" RenderBlock {DIV} at (0,60) size 784x20 - RenderText {#text} at (0,0) size 30x19 - text run at (0,0) width 11: "x " - text run at (11,0) width 4: " " - text run at (15,0) width 4: " " - text run at (19,0) width 4: " " - text run at (23,0) width 7: "x" + RenderText {#text} at (0,0) size 27x19 + text run at (0,0) width 12: "x " + text run at (12,0) width 4: " " + text run at (16,0) width 11: " x" RenderBlock {DIV} at (0,80) size 784x20 - RenderText {#text} at (0,0) size 34x19 - text run at (0,0) width 11: "x " - text run at (11,0) width 4: " " - text run at (15,0) width 4: " " - text run at (19,0) width 4: " " - text run at (23,0) width 11: " x" + RenderText {#text} at (0,0) size 35x19 + text run at (0,0) width 12: "x " + text run at (12,0) width 4: " " + text run at (16,0) width 4: " " + text run at (20,0) width 4: " " + text run at (24,0) width 11: " x" RenderBlock {DIV} at (0,100) size 784x20 - RenderText {#text} at (0,0) size 38x19 - text run at (0,0) width 11: "x " - text run at (11,0) width 4: " " - text run at (15,0) width 4: " " - text run at (19,0) width 4: " " - text run at (23,0) width 4: " " - text run at (27,0) width 4: " " - text run at (31,0) width 7: "x" + RenderText {#text} at (0,0) size 39x19 + text run at (0,0) width 12: "x " + text run at (12,0) width 4: " " + text run at (16,0) width 4: " " + text run at (20,0) width 4: " " + text run at (24,0) width 4: " " + text run at (28,0) width 4: " " + text run at (32,0) width 7: "x" RenderBlock {DIV} at (0,120) size 784x20 - RenderText {#text} at (0,0) size 42x19 - text run at (0,0) width 11: "x " - text run at (11,0) width 4: " " - text run at (15,0) width 4: " " - text run at (19,0) width 4: " " - text run at (23,0) width 4: " " - text run at (27,0) width 4: " " - text run at (31,0) width 11: " x" + RenderText {#text} at (0,0) size 43x19 + text run at (0,0) width 12: "x " + text run at (12,0) width 4: " " + text run at (16,0) width 4: " " + text run at (20,0) width 4: " " + text run at (24,0) width 4: " " + text run at (28,0) width 4: " " + text run at (32,0) width 11: " x" RenderBlock {DIV} at (0,140) size 784x20 - RenderText {#text} at (0,0) size 46x19 - text run at (0,0) width 11: "x " - text run at (11,0) width 4: " " - text run at (15,0) width 4: " " - text run at (19,0) width 4: " " - text run at (23,0) width 4: " " - text run at (27,0) width 4: " " - text run at (31,0) width 4: " " - text run at (35,0) width 4: " " - text run at (39,0) width 7: "x" + RenderText {#text} at (0,0) size 47x19 + text run at (0,0) width 12: "x " + text run at (12,0) width 4: " " + text run at (16,0) width 4: " " + text run at (20,0) width 4: " " + text run at (24,0) width 4: " " + text run at (28,0) width 4: " " + text run at (32,0) width 4: " " + text run at (36,0) width 4: " " + text run at (40,0) width 7: "x" RenderBlock {DIV} at (0,160) size 784x20 - RenderText {#text} at (0,0) size 50x19 - text run at (0,0) width 11: "x " - text run at (11,0) width 4: " " - text run at (15,0) width 4: " " - text run at (19,0) width 4: " " - text run at (23,0) width 4: " " - text run at (27,0) width 4: " " - text run at (31,0) width 4: " " - text run at (35,0) width 4: " " - text run at (39,0) width 11: " x" + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 12: "x " + text run at (12,0) width 4: " " + text run at (16,0) width 4: " " + text run at (20,0) width 4: " " + text run at (24,0) width 4: " " + text run at (28,0) width 4: " " + text run at (32,0) width 4: " " + text run at (36,0) width 4: " " + text run at (40,0) width 11: " x" RenderBlock {DIV} at (0,180) size 784x20 - RenderText {#text} at (0,0) size 54x19 - text run at (0,0) width 11: "x " - text run at (11,0) width 4: " " - text run at (15,0) width 4: " " - text run at (19,0) width 4: " " - text run at (23,0) width 4: " " - text run at (27,0) width 4: " " - text run at (31,0) width 4: " " - text run at (35,0) width 4: " " - text run at (39,0) width 4: " " - text run at (43,0) width 4: " " - text run at (47,0) width 7: "x" + RenderText {#text} at (0,0) size 55x19 + text run at (0,0) width 12: "x " + text run at (12,0) width 4: " " + text run at (16,0) width 4: " " + text run at (20,0) width 4: " " + text run at (24,0) width 4: " " + text run at (28,0) width 4: " " + text run at (32,0) width 4: " " + text run at (36,0) width 4: " " + text run at (40,0) width 4: " " + text run at (44,0) width 4: " " + text run at (48,0) width 7: "x" RenderBlock {DIV} at (0,200) size 784x20 RenderBR {BR} at (0,0) size 0x19 layer at (8,44) size 784x2 clip at (0,0) size 0x0 diff --git a/LayoutTests/platform/wincairo/editing/pasteboard/4076267-expected.txt b/LayoutTests/platform/wincairo/editing/pasteboard/4076267-expected.txt index 7854d3688352..ad41d644dbb2 100644 --- a/LayoutTests/platform/wincairo/editing/pasteboard/4076267-expected.txt +++ b/LayoutTests/platform/wincairo/editing/pasteboard/4076267-expected.txt @@ -22,13 +22,13 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 368x19 - text run at (0,0) width 368: "This tests to see if leading spaces are lost during a copy/paste" + RenderText {#text} at (0,0) size 383x19 + text run at (0,0) width 383: "This tests to see if leading spaces are lost during a copy/paste" RenderBlock {DIV} at (0,46) size 784x20 RenderBlock {DIV} at (0,0) size 784x20 - RenderText {#text} at (0,0) size 312x19 + RenderText {#text} at (0,0) size 330x19 text run at (0,0) width 4: " " - text run at (4,0) width 308: "this text should have a single leading space before it" + text run at (4,0) width 326: "this text should have a single leading space before it" layer at (8,44) size 784x2 clip at (0,0) size 0x0 RenderBlock {HR} at (0,36) size 784x2 [border: (1px inset #000000)] caret: position 55 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/pasteboard/4242293-expected.txt b/LayoutTests/platform/wincairo/editing/pasteboard/4242293-expected.txt index b730f52dc278..0458c7d77a59 100644 --- a/LayoutTests/platform/wincairo/editing/pasteboard/4242293-expected.txt +++ b/LayoutTests/platform/wincairo/editing/pasteboard/4242293-expected.txt @@ -18,33 +18,33 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 756x39 - text run at (0,0) width 756: "This tests for a bug in createMarkup (markup for ancestors of the start of the selection wasn't being added to the pasteboard)." - text run at (0,20) width 319: "You should see the same thing in both regions below." + RenderText {#text} at (0,0) size 782x39 + text run at (0,0) width 782: "This tests for a bug in createMarkup (markup for ancestors of the start of the selection wasn't being added to the pasteboard)." + text run at (0,20) width 335: "You should see the same thing in both regions below." RenderBlock {P} at (0,56) size 784x20 - RenderInline {B} at (0,0) size 430x19 - RenderText {#text} at (0,0) size 430x19 - text run at (0,0) width 430: "This demonstrates a bug: 'foo' is pulled out of its bordered block." + RenderInline {B} at (0,0) size 438x19 + RenderText {#text} at (0,0) size 438x19 + text run at (0,0) width 438: "This demonstrates a bug: 'foo' is pulled out of its bordered block." RenderBlock {DIV} at (0,92) size 784x79 RenderBlock {DIV} at (5,0) size 774x54 [border: (1px solid #FF0000)] RenderBlock (anonymous) at (1,1) size 772x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" RenderBlock {DIV} at (6,26) size 762x22 [border: (1px solid #0000FF)] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "bar" RenderBlock (anonymous) at (0,59) size 784x20 - RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "baz" + RenderText {#text} at (0,0) size 22x19 + text run at (0,0) width 22: "baz" RenderBlock {DIV} at (0,176) size 784x79 RenderBlock {DIV} at (5,0) size 774x54 [border: (1px solid #FF0000)] RenderBlock (anonymous) at (1,1) size 772x20 - RenderText {#text} at (0,0) size 20x19 - text run at (0,0) width 20: "foo" + RenderText {#text} at (0,0) size 21x19 + text run at (0,0) width 21: "foo" RenderBlock {DIV} at (6,26) size 762x22 [border: (1px solid #0000FF)] RenderText {#text} at (1,1) size 20x19 text run at (1,1) width 20: "bar" RenderBlock (anonymous) at (0,59) size 784x20 - RenderText {#text} at (0,0) size 21x19 - text run at (0,0) width 21: "baz" + RenderText {#text} at (0,0) size 22x19 + text run at (0,0) width 22: "baz" caret: position 3 of child 1 {#text} of child 6 {DIV} of body diff --git a/LayoutTests/platform/wincairo/editing/pasteboard/4631972-expected.txt b/LayoutTests/platform/wincairo/editing/pasteboard/4631972-expected.txt index 6aa288cada5a..304d2e2bfbcf 100644 --- a/LayoutTests/platform/wincairo/editing/pasteboard/4631972-expected.txt +++ b/LayoutTests/platform/wincairo/editing/pasteboard/4631972-expected.txt @@ -10,15 +10,15 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 784x584 RenderBlock {P} at (0,0) size 784x40 - RenderText {#text} at (0,0) size 613x39 - text run at (0,0) width 400: "This tests pasting a fragment containing an