[webkit-changes] cvs commit: WebCore/layout-tests/fast/text/basic
003-expected.txt 004-expected.txt 005-expected.txt 009-expected.txt
Geoffrey
ggaren at opensource.apple.com
Tue Jul 19 14:18:26 PDT 2005
ggaren 05/07/19 14:18:25
Modified: . ChangeLog
khtml/rendering bidi.cpp
layout-tests/css1/basic containment-expected.txt
layout-tests/css1/box_properties border-expected.txt
border_bottom-expected.txt
border_bottom_inline-expected.txt
border_bottom_width-expected.txt
border_bottom_width_inline-expected.txt
border_inline-expected.txt border_left-expected.txt
border_left_inline-expected.txt
border_left_width-expected.txt
border_left_width_inline-expected.txt
border_right-expected.txt
border_right_inline-expected.txt
border_right_width-expected.txt
border_right_width_inline-expected.txt
border_top-expected.txt
border_top_inline-expected.txt
border_top_width-expected.txt
border_top_width_inline-expected.txt
border_width-expected.txt
border_width_inline-expected.txt
clear_float-expected.txt
float_elements_in_series-expected.txt
float_margin-expected.txt
float_on_text_elements-expected.txt
height-expected.txt margin-expected.txt
margin_bottom-expected.txt
margin_bottom_inline-expected.txt
margin_inline-expected.txt margin_left-expected.txt
margin_left_inline-expected.txt
margin_right-expected.txt
margin_right_inline-expected.txt
margin_top-expected.txt
margin_top_inline-expected.txt padding-expected.txt
padding_bottom-expected.txt
padding_bottom_inline-expected.txt
padding_inline-expected.txt
padding_left-expected.txt
padding_left_inline-expected.txt
padding_right-expected.txt
padding_right_inline-expected.txt
padding_top-expected.txt
padding_top_inline-expected.txt width-expected.txt
layout-tests/css1/classification display-expected.txt
layout-tests/css1/color_and_background
background_position-expected.txt
layout-tests/css1/conformance
forward_compatible_parsing-expected.txt
layout-tests/css1/font_properties font-expected.txt
font_size-expected.txt
layout-tests/css1/formatting_model canvas-expected.txt
floating_elements-expected.txt
height_of_lines-expected.txt
inline_elements-expected.txt
replaced_elements-expected.txt
vertical_formatting-expected.txt
layout-tests/css1/pseudo anchor-expected.txt
layout-tests/css1/text_properties
letter_spacing-expected.txt
line_height-expected.txt text_indent-expected.txt
vertical_align-expected.txt
word_spacing-expected.txt
layout-tests/css1/units length_units-expected.txt
layout-tests/editing/style
relative-font-size-change-001-expected.txt
relative-font-size-change-002-expected.txt
relative-font-size-change-003-expected.txt
relative-font-size-change-004-expected.txt
smoosh-styles-003-expected.txt
layout-tests/fast/block/basic 018-expected.txt
layout-tests/fast/block/float 002-expected.txt
021-expected.txt 023-expected.txt 024-expected.txt
029-expected.txt 030-expected.txt
layout-tests/fast/block/margin-collapse 043-expected.txt
101-expected.txt
layout-tests/fast/block/positioning 060-expected.txt
layout-tests/fast/block/positioning/auto 001-expected.txt
002-expected.txt 003-expected.txt 004-expected.txt
005-expected.txt 006-expected.txt
layout-tests/fast/clip 001-expected.txt 002-expected.txt
003-expected.txt 004-expected.txt 005-expected.txt
006-expected.txt 007-expected.txt 008-expected.txt
009-expected.txt 010-expected.txt 011-expected.txt
012-expected.txt 013-expected.txt 014-expected.txt
015-expected.txt 016-expected.txt
layout-tests/fast/css 008-expected.txt
MarqueeLayoutTest-expected.txt
apple-prefix-expected.txt
layout-tests/fast/css-generated-content 012-expected.txt
layout-tests/fast/dom quadraticCurveTo-expected.txt
layout-tests/fast/dynamic noninlinebadness-expected.txt
layout-tests/fast/encoding utf-16-big-endian-expected.txt
utf-16-little-endian-expected.txt
layout-tests/fast/flexbox 001-expected.txt 004-expected.txt
007-expected.txt 008-expected.txt 009-expected.txt
010-expected.txt 012-expected.txt 013-expected.txt
014-expected.txt 015-expected.txt 018-expected.txt
019-expected.txt 020-expected.txt 021-expected.txt
022-expected.txt 023-expected.txt 024-expected.txt
layout-tests/fast/invalid 012-expected.txt 016-expected.txt
nestedh3s-expected.txt
layout-tests/fast/lists 003-expected.txt
layout-tests/fast/replaced 004-expected.txt
layout-tests/fast/selectors 166-expected.txt
layout-tests/fast/table 032-expected.txt
layout-tests/fast/table/border-collapsing 004-expected.txt
layout-tests/fast/text/basic 003-expected.txt
004-expected.txt 005-expected.txt 009-expected.txt
Log:
- rolled in patch by opendarwin.org at mitzpettel.com for
http://bugzilla.opendarwin.org/show_bug.cgi?id=3838
Text runs unnecessarily split at EN L boundaries
Reviewed by hyatt.
* khtml/rendering/bidi.cpp:
(khtml::RenderBlock::bidiReorderLine):
Lots of new test case results because previous results had inappropriately
split text runs.
* layout-tests/css1/basic/containment-expected.txt:
* layout-tests/css1/box_properties/border-expected.txt:
* layout-tests/css1/box_properties/border_bottom-expected.txt:
* layout-tests/css1/box_properties/border_bottom_inline-expected.txt:
* layout-tests/css1/box_properties/border_bottom_width-expected.txt:
* layout-tests/css1/box_properties/border_bottom_width_inline-expected.txt:
* layout-tests/css1/box_properties/border_inline-expected.txt:
* layout-tests/css1/box_properties/border_left-expected.txt:
* layout-tests/css1/box_properties/border_left_inline-expected.txt:
* layout-tests/css1/box_properties/border_left_width-expected.txt:
* layout-tests/css1/box_properties/border_left_width_inline-expected.txt:
* layout-tests/css1/box_properties/border_right-expected.txt:
* layout-tests/css1/box_properties/border_right_inline-expected.txt:
* layout-tests/css1/box_properties/border_right_width-expected.txt:
* layout-tests/css1/box_properties/border_right_width_inline-expected.txt:
* layout-tests/css1/box_properties/border_top-expected.txt:
* layout-tests/css1/box_properties/border_top_inline-expected.txt:
* layout-tests/css1/box_properties/border_top_width-expected.txt:
* layout-tests/css1/box_properties/border_top_width_inline-expected.txt:
* layout-tests/css1/box_properties/border_width-expected.txt:
* layout-tests/css1/box_properties/border_width_inline-expected.txt:
* layout-tests/css1/box_properties/clear_float-expected.txt:
* layout-tests/css1/box_properties/float_elements_in_series-expected.txt:
* layout-tests/css1/box_properties/float_margin-expected.txt:
* layout-tests/css1/box_properties/float_on_text_elements-expected.txt:
* layout-tests/css1/box_properties/height-expected.txt:
* layout-tests/css1/box_properties/margin-expected.txt:
* layout-tests/css1/box_properties/margin_bottom-expected.txt:
* layout-tests/css1/box_properties/margin_bottom_inline-expected.txt:
* layout-tests/css1/box_properties/margin_inline-expected.txt:
* layout-tests/css1/box_properties/margin_left-expected.txt:
* layout-tests/css1/box_properties/margin_left_inline-expected.txt:
* layout-tests/css1/box_properties/margin_right-expected.txt:
* layout-tests/css1/box_properties/margin_right_inline-expected.txt:
* layout-tests/css1/box_properties/margin_top-expected.txt:
* layout-tests/css1/box_properties/margin_top_inline-expected.txt:
* layout-tests/css1/box_properties/padding-expected.txt:
* layout-tests/css1/box_properties/padding_bottom-expected.txt:
* layout-tests/css1/box_properties/padding_bottom_inline-expected.txt:
* layout-tests/css1/box_properties/padding_inline-expected.txt:
* layout-tests/css1/box_properties/padding_left-expected.txt:
* layout-tests/css1/box_properties/padding_left_inline-expected.txt:
* layout-tests/css1/box_properties/padding_right-expected.txt:
* layout-tests/css1/box_properties/padding_right_inline-expected.txt:
* layout-tests/css1/box_properties/padding_top-expected.txt:
* layout-tests/css1/box_properties/padding_top_inline-expected.txt:
* layout-tests/css1/box_properties/width-expected.txt:
* layout-tests/css1/classification/display-expected.txt:
* layout-tests/css1/color_and_background/background_position-expected.txt:
* layout-tests/css1/conformance/forward_compatible_parsing-expected.txt:
* layout-tests/css1/font_properties/font-expected.txt:
* layout-tests/css1/font_properties/font_size-expected.txt:
* layout-tests/css1/formatting_model/canvas-expected.txt:
* layout-tests/css1/formatting_model/floating_elements-expected.txt:
* layout-tests/css1/formatting_model/height_of_lines-expected.txt:
* layout-tests/css1/formatting_model/inline_elements-expected.txt:
* layout-tests/css1/formatting_model/replaced_elements-expected.txt:
* layout-tests/css1/formatting_model/vertical_formatting-expected.txt:
* layout-tests/css1/pseudo/anchor-expected.txt:
* layout-tests/css1/text_properties/letter_spacing-expected.txt:
* layout-tests/css1/text_properties/line_height-expected.txt:
* layout-tests/css1/text_properties/text_indent-expected.txt:
* layout-tests/css1/text_properties/vertical_align-expected.txt:
* layout-tests/css1/text_properties/word_spacing-expected.txt:
* layout-tests/css1/units/length_units-expected.txt:
* layout-tests/editing/style/relative-font-size-change-001-expected.txt:
* layout-tests/editing/style/relative-font-size-change-002-expected.txt:
* layout-tests/editing/style/relative-font-size-change-003-expected.txt:
* layout-tests/editing/style/relative-font-size-change-004-expected.txt:
* layout-tests/editing/style/smoosh-styles-003-expected.txt:
* layout-tests/fast/block/basic/018-expected.txt:
* layout-tests/fast/block/float/002-expected.txt:
* layout-tests/fast/block/float/021-expected.txt:
* layout-tests/fast/block/float/023-expected.txt:
* layout-tests/fast/block/float/024-expected.txt:
* layout-tests/fast/block/float/029-expected.txt:
* layout-tests/fast/block/float/030-expected.txt:
* layout-tests/fast/block/margin-collapse/043-expected.txt:
* layout-tests/fast/block/margin-collapse/101-expected.txt:
* layout-tests/fast/block/positioning/060-expected.txt:
* layout-tests/fast/block/positioning/auto/001-expected.txt:
* layout-tests/fast/block/positioning/auto/002-expected.txt:
* layout-tests/fast/block/positioning/auto/003-expected.txt:
* layout-tests/fast/block/positioning/auto/004-expected.txt:
* layout-tests/fast/block/positioning/auto/005-expected.txt:
* layout-tests/fast/block/positioning/auto/006-expected.txt:
* layout-tests/fast/clip/001-expected.txt:
* layout-tests/fast/clip/002-expected.txt:
* layout-tests/fast/clip/003-expected.txt:
* layout-tests/fast/clip/004-expected.txt:
* layout-tests/fast/clip/005-expected.txt:
* layout-tests/fast/clip/006-expected.txt:
* layout-tests/fast/clip/007-expected.txt:
* layout-tests/fast/clip/008-expected.txt:
* layout-tests/fast/clip/009-expected.txt:
* layout-tests/fast/clip/010-expected.txt:
* layout-tests/fast/clip/011-expected.txt:
* layout-tests/fast/clip/012-expected.txt:
* layout-tests/fast/clip/013-expected.txt:
* layout-tests/fast/clip/014-expected.txt:
* layout-tests/fast/clip/015-expected.txt:
* layout-tests/fast/clip/016-expected.txt:
* layout-tests/fast/css-generated-content/012-expected.txt:
* layout-tests/fast/css/008-expected.txt:
* layout-tests/fast/css/MarqueeLayoutTest-expected.txt:
* layout-tests/fast/css/apple-prefix-expected.txt:
* layout-tests/fast/dom/quadraticCurveTo-expected.txt:
* layout-tests/fast/dynamic/noninlinebadness-expected.txt:
* layout-tests/fast/encoding/utf-16-big-endian-expected.txt:
* layout-tests/fast/encoding/utf-16-little-endian-expected.txt:
* layout-tests/fast/flexbox/001-expected.txt:
* layout-tests/fast/flexbox/004-expected.txt:
* layout-tests/fast/flexbox/007-expected.txt:
* layout-tests/fast/flexbox/008-expected.txt:
* layout-tests/fast/flexbox/009-expected.txt:
* layout-tests/fast/flexbox/010-expected.txt:
* layout-tests/fast/flexbox/012-expected.txt:
* layout-tests/fast/flexbox/013-expected.txt:
* layout-tests/fast/flexbox/014-expected.txt:
* layout-tests/fast/flexbox/015-expected.txt:
* layout-tests/fast/flexbox/018-expected.txt:
* layout-tests/fast/flexbox/019-expected.txt:
* layout-tests/fast/flexbox/020-expected.txt:
* layout-tests/fast/flexbox/021-expected.txt:
* layout-tests/fast/flexbox/022-expected.txt:
* layout-tests/fast/flexbox/023-expected.txt:
* layout-tests/fast/flexbox/024-expected.txt:
* layout-tests/fast/invalid/012-expected.txt:
* layout-tests/fast/invalid/016-expected.txt:
* layout-tests/fast/invalid/nestedh3s-expected.txt:
* layout-tests/fast/lists/003-expected.txt:
* layout-tests/fast/replaced/004-expected.txt:
* layout-tests/fast/selectors/166-expected.txt:
* layout-tests/fast/table/032-expected.txt:
* layout-tests/fast/table/border-collapsing/004-expected.txt:
* layout-tests/fast/text/basic/003-expected.txt:
* layout-tests/fast/text/basic/004-expected.txt:
* layout-tests/fast/text/basic/005-expected.txt:
* layout-tests/fast/text/basic/009-expected.txt:
Revision Changes Path
1.4442 +154 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4441
retrieving revision 1.4442
diff -u -r1.4441 -r1.4442
--- ChangeLog 19 Jul 2005 19:52:45 -0000 1.4441
+++ ChangeLog 19 Jul 2005 21:17:59 -0000 1.4442
@@ -1,3 +1,157 @@
+2005-07-19 Geoffrey Garen <ggaren at apple.com>
+
+ - rolled in patch by opendarwin.org at mitzpettel.com for
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=3838
+ Text runs unnecessarily split at EN L boundaries
+
+ Reviewed by hyatt.
+
+ * khtml/rendering/bidi.cpp:
+ (khtml::RenderBlock::bidiReorderLine):
+
+ Lots of new test case results because previous results had inappropriately
+ split text runs.
+
+ * layout-tests/css1/basic/containment-expected.txt:
+ * layout-tests/css1/box_properties/border-expected.txt:
+ * layout-tests/css1/box_properties/border_bottom-expected.txt:
+ * layout-tests/css1/box_properties/border_bottom_inline-expected.txt:
+ * layout-tests/css1/box_properties/border_bottom_width-expected.txt:
+ * layout-tests/css1/box_properties/border_bottom_width_inline-expected.txt:
+ * layout-tests/css1/box_properties/border_inline-expected.txt:
+ * layout-tests/css1/box_properties/border_left-expected.txt:
+ * layout-tests/css1/box_properties/border_left_inline-expected.txt:
+ * layout-tests/css1/box_properties/border_left_width-expected.txt:
+ * layout-tests/css1/box_properties/border_left_width_inline-expected.txt:
+ * layout-tests/css1/box_properties/border_right-expected.txt:
+ * layout-tests/css1/box_properties/border_right_inline-expected.txt:
+ * layout-tests/css1/box_properties/border_right_width-expected.txt:
+ * layout-tests/css1/box_properties/border_right_width_inline-expected.txt:
+ * layout-tests/css1/box_properties/border_top-expected.txt:
+ * layout-tests/css1/box_properties/border_top_inline-expected.txt:
+ * layout-tests/css1/box_properties/border_top_width-expected.txt:
+ * layout-tests/css1/box_properties/border_top_width_inline-expected.txt:
+ * layout-tests/css1/box_properties/border_width-expected.txt:
+ * layout-tests/css1/box_properties/border_width_inline-expected.txt:
+ * layout-tests/css1/box_properties/clear_float-expected.txt:
+ * layout-tests/css1/box_properties/float_elements_in_series-expected.txt:
+ * layout-tests/css1/box_properties/float_margin-expected.txt:
+ * layout-tests/css1/box_properties/float_on_text_elements-expected.txt:
+ * layout-tests/css1/box_properties/height-expected.txt:
+ * layout-tests/css1/box_properties/margin-expected.txt:
+ * layout-tests/css1/box_properties/margin_bottom-expected.txt:
+ * layout-tests/css1/box_properties/margin_bottom_inline-expected.txt:
+ * layout-tests/css1/box_properties/margin_inline-expected.txt:
+ * layout-tests/css1/box_properties/margin_left-expected.txt:
+ * layout-tests/css1/box_properties/margin_left_inline-expected.txt:
+ * layout-tests/css1/box_properties/margin_right-expected.txt:
+ * layout-tests/css1/box_properties/margin_right_inline-expected.txt:
+ * layout-tests/css1/box_properties/margin_top-expected.txt:
+ * layout-tests/css1/box_properties/margin_top_inline-expected.txt:
+ * layout-tests/css1/box_properties/padding-expected.txt:
+ * layout-tests/css1/box_properties/padding_bottom-expected.txt:
+ * layout-tests/css1/box_properties/padding_bottom_inline-expected.txt:
+ * layout-tests/css1/box_properties/padding_inline-expected.txt:
+ * layout-tests/css1/box_properties/padding_left-expected.txt:
+ * layout-tests/css1/box_properties/padding_left_inline-expected.txt:
+ * layout-tests/css1/box_properties/padding_right-expected.txt:
+ * layout-tests/css1/box_properties/padding_right_inline-expected.txt:
+ * layout-tests/css1/box_properties/padding_top-expected.txt:
+ * layout-tests/css1/box_properties/padding_top_inline-expected.txt:
+ * layout-tests/css1/box_properties/width-expected.txt:
+ * layout-tests/css1/classification/display-expected.txt:
+ * layout-tests/css1/color_and_background/background_position-expected.txt:
+ * layout-tests/css1/conformance/forward_compatible_parsing-expected.txt:
+ * layout-tests/css1/font_properties/font-expected.txt:
+ * layout-tests/css1/font_properties/font_size-expected.txt:
+ * layout-tests/css1/formatting_model/canvas-expected.txt:
+ * layout-tests/css1/formatting_model/floating_elements-expected.txt:
+ * layout-tests/css1/formatting_model/height_of_lines-expected.txt:
+ * layout-tests/css1/formatting_model/inline_elements-expected.txt:
+ * layout-tests/css1/formatting_model/replaced_elements-expected.txt:
+ * layout-tests/css1/formatting_model/vertical_formatting-expected.txt:
+ * layout-tests/css1/pseudo/anchor-expected.txt:
+ * layout-tests/css1/text_properties/letter_spacing-expected.txt:
+ * layout-tests/css1/text_properties/line_height-expected.txt:
+ * layout-tests/css1/text_properties/text_indent-expected.txt:
+ * layout-tests/css1/text_properties/vertical_align-expected.txt:
+ * layout-tests/css1/text_properties/word_spacing-expected.txt:
+ * layout-tests/css1/units/length_units-expected.txt:
+ * layout-tests/editing/style/relative-font-size-change-001-expected.txt:
+ * layout-tests/editing/style/relative-font-size-change-002-expected.txt:
+ * layout-tests/editing/style/relative-font-size-change-003-expected.txt:
+ * layout-tests/editing/style/relative-font-size-change-004-expected.txt:
+ * layout-tests/editing/style/smoosh-styles-003-expected.txt:
+ * layout-tests/fast/block/basic/018-expected.txt:
+ * layout-tests/fast/block/float/002-expected.txt:
+ * layout-tests/fast/block/float/021-expected.txt:
+ * layout-tests/fast/block/float/023-expected.txt:
+ * layout-tests/fast/block/float/024-expected.txt:
+ * layout-tests/fast/block/float/029-expected.txt:
+ * layout-tests/fast/block/float/030-expected.txt:
+ * layout-tests/fast/block/margin-collapse/043-expected.txt:
+ * layout-tests/fast/block/margin-collapse/101-expected.txt:
+ * layout-tests/fast/block/positioning/060-expected.txt:
+ * layout-tests/fast/block/positioning/auto/001-expected.txt:
+ * layout-tests/fast/block/positioning/auto/002-expected.txt:
+ * layout-tests/fast/block/positioning/auto/003-expected.txt:
+ * layout-tests/fast/block/positioning/auto/004-expected.txt:
+ * layout-tests/fast/block/positioning/auto/005-expected.txt:
+ * layout-tests/fast/block/positioning/auto/006-expected.txt:
+ * layout-tests/fast/clip/001-expected.txt:
+ * layout-tests/fast/clip/002-expected.txt:
+ * layout-tests/fast/clip/003-expected.txt:
+ * layout-tests/fast/clip/004-expected.txt:
+ * layout-tests/fast/clip/005-expected.txt:
+ * layout-tests/fast/clip/006-expected.txt:
+ * layout-tests/fast/clip/007-expected.txt:
+ * layout-tests/fast/clip/008-expected.txt:
+ * layout-tests/fast/clip/009-expected.txt:
+ * layout-tests/fast/clip/010-expected.txt:
+ * layout-tests/fast/clip/011-expected.txt:
+ * layout-tests/fast/clip/012-expected.txt:
+ * layout-tests/fast/clip/013-expected.txt:
+ * layout-tests/fast/clip/014-expected.txt:
+ * layout-tests/fast/clip/015-expected.txt:
+ * layout-tests/fast/clip/016-expected.txt:
+ * layout-tests/fast/css-generated-content/012-expected.txt:
+ * layout-tests/fast/css/008-expected.txt:
+ * layout-tests/fast/css/MarqueeLayoutTest-expected.txt:
+ * layout-tests/fast/css/apple-prefix-expected.txt:
+ * layout-tests/fast/dom/quadraticCurveTo-expected.txt:
+ * layout-tests/fast/dynamic/noninlinebadness-expected.txt:
+ * layout-tests/fast/encoding/utf-16-big-endian-expected.txt:
+ * layout-tests/fast/encoding/utf-16-little-endian-expected.txt:
+ * layout-tests/fast/flexbox/001-expected.txt:
+ * layout-tests/fast/flexbox/004-expected.txt:
+ * layout-tests/fast/flexbox/007-expected.txt:
+ * layout-tests/fast/flexbox/008-expected.txt:
+ * layout-tests/fast/flexbox/009-expected.txt:
+ * layout-tests/fast/flexbox/010-expected.txt:
+ * layout-tests/fast/flexbox/012-expected.txt:
+ * layout-tests/fast/flexbox/013-expected.txt:
+ * layout-tests/fast/flexbox/014-expected.txt:
+ * layout-tests/fast/flexbox/015-expected.txt:
+ * layout-tests/fast/flexbox/018-expected.txt:
+ * layout-tests/fast/flexbox/019-expected.txt:
+ * layout-tests/fast/flexbox/020-expected.txt:
+ * layout-tests/fast/flexbox/021-expected.txt:
+ * layout-tests/fast/flexbox/022-expected.txt:
+ * layout-tests/fast/flexbox/023-expected.txt:
+ * layout-tests/fast/flexbox/024-expected.txt:
+ * layout-tests/fast/invalid/012-expected.txt:
+ * layout-tests/fast/invalid/016-expected.txt:
+ * layout-tests/fast/invalid/nestedh3s-expected.txt:
+ * layout-tests/fast/lists/003-expected.txt:
+ * layout-tests/fast/replaced/004-expected.txt:
+ * layout-tests/fast/selectors/166-expected.txt:
+ * layout-tests/fast/table/032-expected.txt:
+ * layout-tests/fast/table/border-collapsing/004-expected.txt:
+ * layout-tests/fast/text/basic/003-expected.txt:
+ * layout-tests/fast/text/basic/004-expected.txt:
+ * layout-tests/fast/text/basic/005-expected.txt:
+ * layout-tests/fast/text/basic/009-expected.txt:
+
2005-07-19 Darin Adler <darin at apple.com>
Reviewed by Geoff Garen.
1.135 +2 -3 WebCore/khtml/rendering/bidi.cpp
Index: bidi.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/bidi.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- bidi.cpp 9 Jul 2005 20:19:17 -0000 1.134
+++ bidi.cpp 19 Jul 2005 21:18:02 -0000 1.135
@@ -919,9 +919,8 @@
case QChar::DirAL:
case QChar::DirEN:
case QChar::DirAN:
- // to avoid many unncessary splits, the following appendRun can
- // be done only if (bidi.status.last != QChar::DirEN || bidi.status.lastStrong != QChar::DirL )
- appendRun( bidi );
+ if (bidi.status.last != QChar::DirEN || bidi.status.lastStrong != QChar::DirL)
+ appendRun( bidi );
dir = QChar::DirL;
// fall through
case QChar::DirL:
1.9 +3 -6 WebCore/layout-tests/css1/basic/containment-expected.txt
Index: containment-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/basic/containment-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- containment-expected.txt 6 Jul 2005 00:21:47 -0000 1.8
+++ containment-expected.txt 19 Jul 2005 21:18:03 -0000 1.9
@@ -11,8 +11,7 @@
text run at (0,0) width 624: "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"linktest.css\" title=\"Default SS\">"
text run at (0,15) width 728: "<LINK rel=\"alternate stylesheet\" type=\"text/css\" href=\"linktest2.css\" title=\"Alternate SS\">"
text run at (0,30) width 208: "@import url(imptest1.css);"
- text run at (0,45) width 136: "@import \"imptest1"
- text run at (136,45) width 56: "a.css\";"
+ text run at (0,45) width 192: "@import \"imptest1a.css\";"
text run at (0,60) width 128: "UL {color: red;}"
text run at (0,75) width 176: ".four {color: purple;}"
text run at (0,90) width 208: "@import url(imptest2.css);"
@@ -58,8 +57,7 @@
text run at (0,0) width 395: "This sentence should be purple due to an imported style sheet ["
RenderInline {CODE} at (0,0) size 184x15
RenderText {TEXT} at (395,2) size 184x15
- text run at (395,2) width 136: "@import \"imptest1"
- text run at (531,2) width 48: "a.css\""
+ text run at (395,2) width 184: "@import \"imptest1a.css\""
RenderText {TEXT} at (579,0) size 9x18
text run at (579,0) width 9: "]."
RenderListItem {LI} at (40,36) size 744x18 [color=#008000]
@@ -154,8 +152,7 @@
text run at (0,0) width 395: "This sentence should be purple due to an imported style sheet ["
RenderInline {CODE} at (0,0) size 184x15
RenderText {TEXT} at (395,2) size 184x15
- text run at (395,2) width 136: "@import \"imptest1"
- text run at (531,2) width 48: "a.css\""
+ text run at (395,2) width 184: "@import \"imptest1a.css\""
RenderText {TEXT} at (579,0) size 9x18
text run at (579,0) width 9: "]."
RenderListItem {LI} at (40,36) size 722x18 [color=#008000]
1.8 +5 -10 WebCore/layout-tests/css1/box_properties/border-expected.txt
Index: border-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border-expected.txt 20 Aug 2004 23:37:46 -0000 1.7
+++ border-expected.txt 19 Jul 2005 21:18:03 -0000 1.8
@@ -10,18 +10,13 @@
RenderText {TEXT} at (0,0) size 272x135
text run at (0,0) width 272: ".one {border: medium black solid;}"
text run at (0,15) width 264: ".two {border: thin maroon ridge;}"
- text run at (0,30) width 144: ".three {border: 10"
- text run at (144,30) width 128: "px teal outset;}"
- text run at (0,45) width 136: ".four {border: 10"
- text run at (136,45) width 128: "px olive inset;}"
- text run at (0,60) width 136: ".five {border: 10"
- text run at (136,60) width 88: "px maroon;}"
+ text run at (0,30) width 272: ".three {border: 10px teal outset;}"
+ text run at (0,45) width 264: ".four {border: 10px olive inset;}"
+ text run at (0,60) width 224: ".five {border: 10px maroon;}"
text run at (0,75) width 232: ".six {border: maroon double;}"
text run at (0,90) width 256: ".seven {border: left red solid;}"
- text run at (0,105) width 136: ".eight {border: 0"
- text run at (136,105) width 32: "px;}"
- text run at (0,120) width 104: "TD {border: 2"
- text run at (104,120) width 128: "px solid green;}"
+ text run at (0,105) width 168: ".eight {border: 0px;}"
+ text run at (0,120) width 232: "TD {border: 2px solid green;}"
RenderBlock {HR} at (0,182) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,200) size 784x36
RenderText {TEXT} at (0,0) size 780x36
1.8 +2 -4 WebCore/layout-tests/css1/box_properties/border_bottom-expected.txt
Index: border_bottom-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_bottom-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border_bottom-expected.txt 20 Aug 2004 23:37:46 -0000 1.7
+++ border_bottom-expected.txt 19 Jul 2005 21:18:03 -0000 1.8
@@ -8,12 +8,10 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x60
RenderText {TEXT} at (0,0) size 344x60
- text run at (0,0) width 296: ".one {border-bottom: purple double 10"
- text run at (296,0) width 32: "px;}"
+ text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}"
text run at (0,15) width 320: ".two {border-bottom: purple thin solid;}"
text run at (0,30) width 344: ".three {border-bottom: black medium solid;}"
- text run at (0,45) width 208: "TD {border-bottom: green 2"
- text run at (208,45) width 80: "px solid;}"
+ text run at (0,45) width 288: "TD {border-bottom: green 2px solid;}"
RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,125) size 784x36
RenderText {TEXT} at (0,0) size 779x36
1.9 +1 -2 WebCore/layout-tests/css1/box_properties/border_bottom_inline-expected.txt
Index: border_bottom_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_bottom_inline-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- border_bottom_inline-expected.txt 20 Aug 2004 23:37:46 -0000 1.8
+++ border_bottom_inline-expected.txt 19 Jul 2005 21:18:03 -0000 1.9
@@ -8,8 +8,7 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 328x30
- text run at (0,0) width 296: ".one {border-bottom: purple double 10"
- text run at (296,0) width 32: "px;}"
+ text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}"
text run at (0,15) width 320: ".two {border-bottom: purple thin solid;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x54 [bgcolor=#C0C0C0]
1.7 +2 -4 WebCore/layout-tests/css1/box_properties/border_bottom_width-expected.txt
Index: border_bottom_width-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_bottom_width-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- border_bottom_width-expected.txt 11 Dec 2003 19:46:13 -0000 1.6
+++ border_bottom_width-expected.txt 19 Jul 2005 21:18:03 -0000 1.7
@@ -9,13 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 464x90
text run at (0,0) width 456: ".zero {background-color: silver; border-bottom-width: 0;}"
- text run at (0,15) width 232: ".one {border-bottom-width: 50"
- text run at (232,15) width 200: "px; border-style: solid;}"
+ text run at (0,15) width 432: ".one {border-bottom-width: 50px; border-style: solid;}"
text run at (0,30) width 440: ".two {border-bottom-width: thick; border-style: solid;}"
text run at (0,45) width 464: ".three {border-bottom-width: medium; border-style: solid;}"
text run at (0,60) width 440: ".four {border-bottom-width: thin; border-style: solid;}"
- text run at (0,75) width 240: ".five {border-bottom-width: 25"
- text run at (240,75) width 32: "px;}"
+ text run at (0,75) width 272: ".five {border-bottom-width: 25px;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18
RenderText {TEXT} at (0,0) size 157x18
1.8 +2 -4 WebCore/layout-tests/css1/box_properties/border_bottom_width_inline-expected.txt
Index: border_bottom_width_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_bottom_width_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border_bottom_width_inline-expected.txt 26 Apr 2004 21:18:59 -0000 1.7
+++ border_bottom_width_inline-expected.txt 19 Jul 2005 21:18:03 -0000 1.8
@@ -8,11 +8,9 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 432x45
- text run at (0,0) width 232: ".one {border-bottom-width: 25"
- text run at (232,0) width 200: "px; border-style: solid;}"
+ text run at (0,0) width 432: ".one {border-bottom-width: 25px; border-style: solid;}"
text run at (0,15) width 432: ".two {border-bottom-width: thin; border-style: solid;}"
- text run at (0,30) width 248: ".three {border-bottom-width: 25"
- text run at (248,30) width 32: "px;}"
+ text run at (0,30) width 280: ".three {border-bottom-width: 25px;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x100 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)]
RenderText {TEXT} at (3,3) size 172x18
1.9 +2 -4 WebCore/layout-tests/css1/box_properties/border_inline-expected.txt
Index: border_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_inline-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- border_inline-expected.txt 20 Aug 2004 23:37:46 -0000 1.8
+++ border_inline-expected.txt 19 Jul 2005 21:18:03 -0000 1.9
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 256x30
- text run at (0,0) width 128: ".one {border: 10"
- text run at (128,0) width 128: "px teal outset;}"
- text run at (0,15) width 128: ".two {border: 10"
- text run at (128,15) width 128: "px olive inset;}"
+ text run at (0,0) width 256: ".one {border: 10px teal outset;}"
+ text run at (0,15) width 256: ".two {border: 10px olive inset;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x54 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 677x18
1.8 +3 -6 WebCore/layout-tests/css1/box_properties/border_left-expected.txt
Index: border_left-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_left-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border_left-expected.txt 20 Aug 2004 23:37:46 -0000 1.7
+++ border_left-expected.txt 19 Jul 2005 21:18:03 -0000 1.8
@@ -8,16 +8,13 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x105
RenderText {TEXT} at (0,0) size 344x105
- text run at (0,0) width 144: "P {margin-left: 20"
- text run at (144,0) width 32: "px;}"
- text run at (0,15) width 280: ".one {border-left: purple double 10"
- text run at (280,15) width 32: "px;}"
+ text run at (0,0) width 176: "P {margin-left: 20px;}"
+ text run at (0,15) width 312: ".one {border-left: purple double 10px;}"
text run at (0,30) width 304: ".two {border-left: purple thin solid;}"
text run at (0,45) width 336: ".threea {border-left: black medium solid;}"
text run at (0,60) width 344: ".threeb {border-left: purple medium solid;}"
text run at (0,75) width 328: ".threec {border-left: blue medium solid;}"
- text run at (0,90) width 192: "TD {border-left: green 2"
- text run at (192,90) width 80: "px solid;}"
+ text run at (0,90) width 272: "TD {border-left: green 2px solid;}"
RenderBlock {HR} at (0,152) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (20,170) size 764x36
RenderText {TEXT} at (0,0) size 755x36
1.9 +2 -4 WebCore/layout-tests/css1/box_properties/border_left_inline-expected.txt
Index: border_left_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_left_inline-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- border_left_inline-expected.txt 20 Aug 2004 23:37:46 -0000 1.8
+++ border_left_inline-expected.txt 19 Jul 2005 21:18:03 -0000 1.9
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x60
RenderText {TEXT} at (0,0) size 312x45
- text run at (0,0) width 144: "P {margin-left: 20"
- text run at (144,0) width 32: "px;}"
- text run at (0,15) width 280: ".one {border-left: purple double 10"
- text run at (280,15) width 32: "px;}"
+ text run at (0,0) width 176: "P {margin-left: 20px;}"
+ text run at (0,15) width 312: ".one {border-left: purple double 10px;}"
text run at (0,30) width 304: ".two {border-left: purple thin solid;}"
RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (20,125) size 764x54 [bgcolor=#C0C0C0]
1.7 +2 -4 WebCore/layout-tests/css1/box_properties/border_left_width-expected.txt
Index: border_left_width-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_left_width-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- border_left_width-expected.txt 11 Dec 2003 19:46:13 -0000 1.6
+++ border_left_width-expected.txt 19 Jul 2005 21:18:03 -0000 1.7
@@ -9,13 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 448x90
text run at (0,0) width 440: ".zero {background-color: silver; border-left-width: 0;}"
- text run at (0,15) width 216: ".one {border-left-width: 50"
- text run at (216,15) width 200: "px; border-style: solid;}"
+ text run at (0,15) width 416: ".one {border-left-width: 50px; border-style: solid;}"
text run at (0,30) width 424: ".two {border-left-width: thick; border-style: solid;}"
text run at (0,45) width 448: ".three {border-left-width: medium; border-style: solid;}"
text run at (0,60) width 424: ".four {border-left-width: thin; border-style: solid;}"
- text run at (0,75) width 224: ".five {border-left-width: 25"
- text run at (224,75) width 32: "px;}"
+ text run at (0,75) width 256: ".five {border-left-width: 25px;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18
RenderText {TEXT} at (0,0) size 157x18
1.8 +2 -4 WebCore/layout-tests/css1/box_properties/border_left_width_inline-expected.txt
Index: border_left_width_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_left_width_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border_left_width_inline-expected.txt 26 Apr 2004 21:18:59 -0000 1.7
+++ border_left_width_inline-expected.txt 19 Jul 2005 21:18:03 -0000 1.8
@@ -8,11 +8,9 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 416x45
- text run at (0,0) width 216: ".one {border-left-width: 25"
- text run at (216,0) width 200: "px; border-style: solid;}"
+ text run at (0,0) width 416: ".one {border-left-width: 25px; border-style: solid;}"
text run at (0,15) width 416: ".two {border-left-width: thin; border-style: solid;}"
- text run at (0,30) width 232: ".three {border-left-width: 25"
- text run at (232,30) width 32: "px;}"
+ text run at (0,30) width 264: ".three {border-left-width: 25px;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x78 [border: (3px solid #000000) (25px solid #000000)]
RenderText {TEXT} at (25,3) size 172x18
1.9 +2 -4 WebCore/layout-tests/css1/box_properties/border_right-expected.txt
Index: border_right-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_right-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- border_right-expected.txt 20 Aug 2004 23:37:46 -0000 1.8
+++ border_right-expected.txt 19 Jul 2005 21:18:03 -0000 1.9
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x60
RenderText {TEXT} at (0,0) size 320x45
- text run at (0,0) width 152: "P {margin-right: 20"
- text run at (152,0) width 32: "px;}"
- text run at (0,15) width 288: ".one {border-right: purple double 10"
- text run at (288,15) width 32: "px;}"
+ text run at (0,0) width 184: "P {margin-right: 20px;}"
+ text run at (0,15) width 320: ".one {border-right: purple double 10px;}"
text run at (0,30) width 312: ".two {border-right: purple thin solid;}"
RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,125) size 764x54 [bgcolor=#C0C0C0]
1.8 +3 -6 WebCore/layout-tests/css1/box_properties/border_right_inline-expected.txt
Index: border_right_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_right_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border_right_inline-expected.txt 20 Aug 2004 23:37:46 -0000 1.7
+++ border_right_inline-expected.txt 19 Jul 2005 21:18:03 -0000 1.8
@@ -8,16 +8,13 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x105
RenderText {TEXT} at (0,0) size 352x105
- text run at (0,0) width 152: "P {margin-right: 20"
- text run at (152,0) width 32: "px;}"
- text run at (0,15) width 288: ".one {border-right: purple double 10"
- text run at (288,15) width 32: "px;}"
+ text run at (0,0) width 184: "P {margin-right: 20px;}"
+ text run at (0,15) width 320: ".one {border-right: purple double 10px;}"
text run at (0,30) width 312: ".two {border-right: purple thin solid;}"
text run at (0,45) width 344: ".threea {border-right: black medium solid;}"
text run at (0,60) width 352: ".threeb {border-right: purple medium solid;}"
text run at (0,75) width 336: ".threec {border-right: blue medium solid;}"
- text run at (0,90) width 200: "TD {border-right: green 2"
- text run at (200,90) width 80: "px solid;}"
+ text run at (0,90) width 280: "TD {border-right: green 2px solid;}"
RenderBlock {HR} at (0,152) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,170) size 764x36
RenderText {TEXT} at (0,0) size 764x36
1.7 +2 -4 WebCore/layout-tests/css1/box_properties/border_right_width-expected.txt
Index: border_right_width-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_right_width-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- border_right_width-expected.txt 11 Dec 2003 19:46:13 -0000 1.6
+++ border_right_width-expected.txt 19 Jul 2005 21:18:03 -0000 1.7
@@ -9,13 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 456x90
text run at (0,0) width 448: ".zero {background-color: silver; border-right-width: 0;}"
- text run at (0,15) width 224: ".one {border-right-width: 25"
- text run at (224,15) width 200: "px; border-style: solid;}"
+ text run at (0,15) width 424: ".one {border-right-width: 25px; border-style: solid;}"
text run at (0,30) width 432: ".two {border-right-width: thick; border-style: solid;}"
text run at (0,45) width 456: ".three {border-right-width: medium; border-style: solid;}"
text run at (0,60) width 432: ".four {border-right-width: thin; border-style: solid;}"
- text run at (0,75) width 240: ".five {border-right-width: 100"
- text run at (240,75) width 32: "px;}"
+ text run at (0,75) width 272: ".five {border-right-width: 100px;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18
RenderText {TEXT} at (0,0) size 157x18
1.8 +2 -4 WebCore/layout-tests/css1/box_properties/border_right_width_inline-expected.txt
Index: border_right_width_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_right_width_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border_right_width_inline-expected.txt 26 Apr 2004 21:18:59 -0000 1.7
+++ border_right_width_inline-expected.txt 19 Jul 2005 21:18:03 -0000 1.8
@@ -8,11 +8,9 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 424x45
- text run at (0,0) width 224: ".one {border-right-width: 25"
- text run at (224,0) width 200: "px; border-style: solid;}"
+ text run at (0,0) width 424: ".one {border-right-width: 25px; border-style: solid;}"
text run at (0,15) width 424: ".two {border-right-width: thin; border-style: solid;}"
- text run at (0,30) width 240: ".three {border-right-width: 25"
- text run at (240,30) width 32: "px;}"
+ text run at (0,30) width 272: ".three {border-right-width: 25px;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x78 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)]
RenderText {TEXT} at (3,3) size 172x18
1.8 +2 -4 WebCore/layout-tests/css1/box_properties/border_top-expected.txt
Index: border_top-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_top-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border_top-expected.txt 20 Aug 2004 23:37:46 -0000 1.7
+++ border_top-expected.txt 19 Jul 2005 21:18:03 -0000 1.8
@@ -8,12 +8,10 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x60
RenderText {TEXT} at (0,0) size 320x60
- text run at (0,0) width 272: ".one {border-top: purple double 10"
- text run at (272,0) width 32: "px;}"
+ text run at (0,0) width 304: ".one {border-top: purple double 10px;}"
text run at (0,15) width 296: ".two {border-top: purple thin solid;}"
text run at (0,30) width 320: ".three {border-top: black medium solid;}"
- text run at (0,45) width 184: "TD {border-top: green 2"
- text run at (184,45) width 80: "px solid;}"
+ text run at (0,45) width 264: "TD {border-top: green 2px solid;}"
RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,125) size 784x36
RenderText {TEXT} at (0,0) size 755x36
1.10 +1 -2 WebCore/layout-tests/css1/box_properties/border_top_inline-expected.txt
Index: border_top_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_top_inline-expected.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- border_top_inline-expected.txt 20 Aug 2004 23:37:46 -0000 1.9
+++ border_top_inline-expected.txt 19 Jul 2005 21:18:03 -0000 1.10
@@ -8,8 +8,7 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 304x30
- text run at (0,0) width 272: ".one {border-top: purple double 10"
- text run at (272,0) width 32: "px;}"
+ text run at (0,0) width 304: ".one {border-top: purple double 10px;}"
text run at (0,15) width 296: ".two {border-top: purple thin solid;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x54 [bgcolor=#C0C0C0]
1.7 +2 -4 WebCore/layout-tests/css1/box_properties/border_top_width-expected.txt
Index: border_top_width-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_top_width-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- border_top_width-expected.txt 11 Dec 2003 19:46:14 -0000 1.6
+++ border_top_width-expected.txt 19 Jul 2005 21:18:03 -0000 1.7
@@ -9,13 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 440x90
text run at (0,0) width 432: ".zero {background-color: silver; border-top-width: 0;}"
- text run at (0,15) width 208: ".one {border-top-width: 25"
- text run at (208,15) width 200: "px; border-style: solid;}"
+ text run at (0,15) width 408: ".one {border-top-width: 25px; border-style: solid;}"
text run at (0,30) width 416: ".two {border-top-width: thick; border-style: solid;}"
text run at (0,45) width 440: ".three {border-top-width: medium; border-style: solid;}"
text run at (0,60) width 416: ".four {border-top-width: thin; border-style: solid;}"
- text run at (0,75) width 216: ".five {border-top-width: 25"
- text run at (216,75) width 32: "px;}"
+ text run at (0,75) width 248: ".five {border-top-width: 25px;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18
RenderText {TEXT} at (0,0) size 157x18
1.8 +2 -4 WebCore/layout-tests/css1/box_properties/border_top_width_inline-expected.txt
Index: border_top_width_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_top_width_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border_top_width_inline-expected.txt 26 Apr 2004 21:18:59 -0000 1.7
+++ border_top_width_inline-expected.txt 19 Jul 2005 21:18:03 -0000 1.8
@@ -8,11 +8,9 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 408x45
- text run at (0,0) width 208: ".one {border-top-width: 25"
- text run at (208,0) width 200: "px; border-style: solid;}"
+ text run at (0,0) width 408: ".one {border-top-width: 25px; border-style: solid;}"
text run at (0,15) width 408: ".two {border-top-width: thin; border-style: solid;}"
- text run at (0,30) width 224: ".three {border-top-width: 25"
- text run at (224,30) width 32: "px;}"
+ text run at (0,30) width 256: ".three {border-top-width: 25px;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x82 [border: (25px solid #000000) (3px solid #000000)]
RenderText {TEXT} at (3,25) size 172x18
1.7 +2 -4 WebCore/layout-tests/css1/box_properties/border_width-expected.txt
Index: border_width-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_width-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- border_width-expected.txt 11 Dec 2003 19:46:14 -0000 1.6
+++ border_width-expected.txt 19 Jul 2005 21:18:03 -0000 1.7
@@ -9,13 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 408x90
text run at (0,0) width 400: ".zero {background-color: silver; border-width: 0;}"
- text run at (0,15) width 176: ".one {border-width: 50"
- text run at (176,15) width 200: "px; border-style: solid;}"
+ text run at (0,15) width 376: ".one {border-width: 50px; border-style: solid;}"
text run at (0,30) width 384: ".two {border-width: thick; border-style: solid;}"
text run at (0,45) width 408: ".three {border-width: medium; border-style: solid;}"
text run at (0,60) width 384: ".four {border-width: thin; border-style: solid;}"
- text run at (0,75) width 184: ".five {border-width: 25"
- text run at (184,75) width 32: "px;}"
+ text run at (0,75) width 216: ".five {border-width: 25px;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18
RenderText {TEXT} at (0,0) size 157x18
1.8 +2 -4 WebCore/layout-tests/css1/box_properties/border_width_inline-expected.txt
Index: border_width_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/border_width_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- border_width_inline-expected.txt 26 Apr 2004 21:18:59 -0000 1.7
+++ border_width_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -8,11 +8,9 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 376x45
- text run at (0,0) width 176: ".one {border-width: 25"
- text run at (176,0) width 200: "px; border-style: solid;}"
+ text run at (0,0) width 376: ".one {border-width: 25px; border-style: solid;}"
text run at (0,15) width 376: ".two {border-width: thin; border-style: solid;}"
- text run at (0,30) width 192: ".three {border-width: 25"
- text run at (192,30) width 32: "px;}"
+ text run at (0,30) width 224: ".three {border-width: 25px;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x104 [border: (25px solid #000000)]
RenderText {TEXT} at (25,25) size 172x18
1.11 +17 -40 WebCore/layout-tests/css1/box_properties/clear_float-expected.txt
Index: clear_float-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/clear_float-expected.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clear_float-expected.txt 19 Oct 2004 23:28:49 -0000 1.10
+++ clear_float-expected.txt 19 Jul 2005 21:18:04 -0000 1.11
@@ -9,22 +9,11 @@
RenderBlock {PRE} at (0,31) size 784x135
RenderText {TEXT} at (0,0) size 616x120
text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}"
- text run at (0,30) width 360: "DIV.menu {float: left; clear: left; width: 11"
- text run at (360,30) width 24: "em;"
- text run at (0,45) width 304: " margin: 0; margin-bottom: 10"
- text run at (304,45) width 128: "px; padding: 0.5"
- text run at (432,45) width 32: "em;}"
- text run at (0,60) width 216: "DIV.menu H1 {font-size: 1.2"
- text run at (216,60) width 216: "em; margin: 0; padding: 0;}"
- text run at (0,75) width 192: "DIV.menu UL {margin: 0.2"
- text run at (192,75) width 48: "em 0.3"
- text run at (240,75) width 48: "em 0.2"
- text run at (288,75) width 32: "em 1"
- text run at (320,75) width 128: "em; padding: 0;}"
- text run at (0,90) width 200: "DIV.article {padding: 0.5"
- text run at (200,90) width 240: "em; margin: 0; margin-left: 14"
- text run at (440,90) width 152: "em; margin-right: 2"
- text run at (592,90) width 24: "em;"
+ text run at (0,30) width 384: "DIV.menu {float: left; clear: left; width: 11em;"
+ text run at (0,45) width 464: " margin: 0; margin-bottom: 10px; padding: 0.5em;}"
+ text run at (0,60) width 432: "DIV.menu H1 {font-size: 1.2em; margin: 0; padding: 0;}"
+ text run at (0,75) width 448: "DIV.menu UL {margin: 0.2em 0.3em 0.2em 1em; padding: 0;}"
+ text run at (0,90) width 616: "DIV.article {padding: 0.5em; margin: 0; margin-left: 14em; margin-right: 2em;"
text run at (0,105) width 480: " color: black; background: yellow; clear: none;}"
RenderBlock {HR} at (0,179) size 784x2 [border: (1px inset #000000)]
RenderBlock (floating) {DIV} at (0,189) size 192x116 [color=#FFFFFF] [bgcolor=#008000]
@@ -43,13 +32,11 @@
RenderListItem {LI} at (0,36) size 156x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 94x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 74: "em padding"
+ text run at (0,0) width 94: "0.5em padding"
RenderListItem {LI} at (0,54) size 156x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 87x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 67: "em margin"
+ text run at (0,0) width 87: "0.5em margin"
RenderBlock (floating) {DIV} at (0,315) size 192x116 [color=#FFFFFF] [bgcolor=#0000FF]
RenderBlock {H1} at (8,8) size 176x22
RenderText {TEXT} at (0,0) size 112x22
@@ -66,13 +53,11 @@
RenderListItem {LI} at (0,36) size 156x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 94x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 74: "em padding"
+ text run at (0,0) width 94: "0.5em padding"
RenderListItem {LI} at (0,54) size 156x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 87x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 67: "em margin"
+ text run at (0,0) width 87: "0.5em margin"
RenderBlock {DIV} at (224,189) size 528x221 [bgcolor=#FFFF00]
RenderBlock {H1} at (8,29) size 512x37
RenderText {TEXT} at (0,0) size 275x37
@@ -83,10 +68,8 @@
text run at (0,18) width 238: "and the other a blue background. "
text run at (238,18) width 274: "Due to settings on the 'float' and 'clear'"
text run at (0,36) width 512: "properties, the two menus should appear on the left side of the page, the blue"
- text run at (0,54) width 257: "below the green. There should be a 10"
- text run at (257,54) width 255: "px gap between the two menus. There"
- text run at (0,72) width 121: "should also be a 10"
- text run at (121,72) width 338: "px gap between the top menu and the top of the page."
+ text run at (0,54) width 512: "below the green. There should be a 10px gap between the two menus. There"
+ text run at (0,72) width 459: "should also be a 10px gap between the top menu and the top of the page."
RenderBlock {P} at (8,177) size 512x36
RenderText {TEXT} at (0,0) size 512x36
text run at (0,0) width 512: "The top of the yellow rectangle (to which this paragraph belongs) should be"
@@ -119,13 +102,11 @@
RenderListItem {LI} at (0,36) size 156x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 94x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 74: "em padding"
+ text run at (0,0) width 94: "0.5em padding"
RenderListItem {LI} at (0,54) size 156x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 87x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 67: "em margin"
+ text run at (0,0) width 87: "0.5em margin"
RenderBlock (floating) {DIV} at (4,130) size 192x116 [color=#FFFFFF] [bgcolor=#0000FF]
RenderBlock {H1} at (8,8) size 176x22
RenderText {TEXT} at (0,0) size 112x22
@@ -142,13 +123,11 @@
RenderListItem {LI} at (0,36) size 156x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 94x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 74: "em padding"
+ text run at (0,0) width 94: "0.5em padding"
RenderListItem {LI} at (0,54) size 156x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 87x18
- text run at (0,0) width 20: "0.5"
- text run at (20,0) width 67: "em margin"
+ text run at (0,0) width 87: "0.5em margin"
RenderBlock {DIV} at (228,4) size 314x311 [bgcolor=#FFFF00]
RenderBlock {H1} at (8,29) size 298x37
RenderText {TEXT} at (0,0) size 275x37
@@ -161,11 +140,9 @@
text run at (161,36) width 137: "Due to settings on the"
text run at (0,54) width 298: "'float' and 'clear' properties, the two menus"
text run at (0,72) width 298: "should appear on the left side of the page, the"
- text run at (0,90) width 282: "blue below the green. There should be a 10"
- text run at (282,90) width 16: "px"
+ text run at (0,90) width 298: "blue below the green. There should be a 10px"
text run at (0,108) width 298: "gap between the two menus. There should also"
- text run at (0,126) width 49: "be a 10"
- text run at (49,126) width 249: "px gap between the top menu and the"
+ text run at (0,126) width 298: "be a 10px gap between the top menu and the"
text run at (0,144) width 98: "top of the page."
RenderBlock {P} at (8,249) size 298x54
RenderText {TEXT} at (0,0) size 298x54
1.9 +4 -11 WebCore/layout-tests/css1/box_properties/float_elements_in_series-expected.txt
Index: float_elements_in_series-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/float_elements_in_series-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- float_elements_in_series-expected.txt 10 Feb 2004 22:03:48 -0000 1.8
+++ float_elements_in_series-expected.txt 19 Jul 2005 21:18:04 -0000 1.9
@@ -10,22 +10,15 @@
RenderText {TEXT} at (0,0) size 512x180
text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}"
text run at (0,30) width 336: "DIV.yellow, DIV.blue, DIV.red, DIV.green {"
- text run at (0,45) width 80: " width: 60"
- text run at (80,45) width 120: "px; padding: 20"
- text run at (200,45) width 112: "px; margin: 10"
- text run at (312,45) width 24: "px;"
- text run at (0,60) width 88: " border: 20"
- text run at (88,60) width 384: "px solid black; float: left; text-align: center;"
+ text run at (0,45) width 336: " width: 60px; padding: 20px; margin: 10px;"
+ text run at (0,60) width 472: " border: 20px solid black; float: left; text-align: center;"
text run at (0,75) width 360: " font-family: \"Times New Roman\",Times,serif;}"
- text run at (0,90) width 208: "DIV.yellow {margin-left: 0"
- text run at (208,90) width 304: "px; background: yellow; color: black;}"
+ text run at (0,90) width 512: "DIV.yellow {margin-left: 0px; background: yellow; color: black;}"
text run at (0,105) width 336: "DIV.blue {background: blue; color: white;}"
text run at (0,120) width 320: "DIV.red {background: red; color: black;}"
text run at (0,135) width 352: "DIV.green {background: green; color: white;}"
text run at (0,150) width 192: "DIV.below {clear: both;}"
- text run at (0,165) width 136: "TABLE {margin: 20"
- text run at (136,165) width 32: "px 0"
- text run at (168,165) width 32: "px;}"
+ text run at (0,165) width 200: "TABLE {margin: 20px 0px;}"
RenderBlock {HR} at (0,239) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,249) size 784x36
RenderText {TEXT} at (0,0) size 784x36
1.8 +6 -17 WebCore/layout-tests/css1/box_properties/float_margin-expected.txt
Index: float_margin-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/float_margin-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- float_margin-expected.txt 11 Dec 2003 19:46:14 -0000 1.7
+++ float_margin-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -8,25 +8,14 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x135
RenderText {TEXT} at (0,0) size 560x120
- text run at (0,0) width 320: "P.test {background: white; font-size: 20"
- text run at (320,0) width 24: "px;"
- text run at (0,15) width 184: " margin-left: 30"
- text run at (184,15) width 160: "px; margin-right: 10"
- text run at (344,15) width 216: "px; padding: 0; border: 0;}"
+ text run at (0,0) width 344: "P.test {background: white; font-size: 20px;"
+ text run at (0,15) width 560: " margin-left: 30px; margin-right: 10px; padding: 0; border: 0;}"
text run at (0,30) width 312: "IMG {padding: 0; border: 0; margin: 0;}"
text run at (0,45) width 200: "P.test IMG {float: left;}"
- text run at (0,60) width 168: "#img2 {margin-top: 30"
- text run at (168,60) width 152: "px; margin-left: 30"
- text run at (320,60) width 32: "px;}"
- text run at (0,75) width 176: "#img3 {margin-top: -30"
- text run at (176,75) width 160: "px; margin-left: -30"
- text run at (336,75) width 32: "px;}"
- text run at (0,90) width 184: "#img4 {margin-right: 30"
- text run at (184,90) width 168: "px; margin-bottom: 30"
- text run at (352,90) width 32: "px;}"
- text run at (0,105) width 192: "#img5 {margin-right: -30"
- text run at (192,105) width 176: "px; margin-bottom: -30"
- text run at (368,105) width 32: "px;}"
+ text run at (0,60) width 352: "#img2 {margin-top: 30px; margin-left: 30px;}"
+ text run at (0,75) width 368: "#img3 {margin-top: -30px; margin-left: -30px;}"
+ text run at (0,90) width 384: "#img4 {margin-right: 30px; margin-bottom: 30px;}"
+ text run at (0,105) width 400: "#img5 {margin-right: -30px; margin-bottom: -30px;}"
RenderBlock {HR} at (0,182) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (30,204) size 744x92 [bgcolor=#FFFFFF]
RenderText {TEXT} at (0,0) size 738x92
1.13 +20 -42 WebCore/layout-tests/css1/box_properties/float_on_text_elements-expected.txt
Index: float_on_text_elements-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/float_on_text_elements-expected.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- float_on_text_elements-expected.txt 6 Jul 2005 00:21:48 -0000 1.12
+++ float_on_text_elements-expected.txt 19 Jul 2005 21:18:04 -0000 1.13
@@ -62,8 +62,7 @@
text run at (0,0) width 21: "T"
RenderText {TEXT} at (48,0) size 736x54
text run at (48,0) width 736: "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,18) width 235: "as bold, with a content width of 1.5"
- text run at (283,18) width 246: "em and a background-color of silver. "
+ text run at (48,18) width 481: "as bold, with a content width of 1.5em and a background-color of silver. "
text run at (529,18) width 255: "The top of the big letter \"T\" should be"
text run at (48,36) width 656: "vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"."
RenderBlock (anonymous) at (0,523) size 784x18
@@ -73,16 +72,12 @@
RenderText {TEXT} at (8,8) size 320x180
text run at (8,8) width 320: "This paragraph should be floated to the right, sort"
text run at (8,26) width 320: "of like a 'sidebar' in a magazine article. Its width is"
- text run at (8,44) width 16: "20"
- text run at (24,44) width 304: "em so the box should not be reformatted when"
+ text run at (8,44) width 320: "20em so the box should not be reformatted when"
text run at (8,62) width 320: "the size of the viewport is changed (e.g. when the"
text run at (8,80) width 320: "window is resized). The background color of the"
- text run at (8,98) width 269: "element is yellow, and there should be a 3"
- text run at (277,98) width 51: "px solid"
- text run at (8,116) width 143: "red border outside a 5"
- text run at (151,116) width 177: "px wide padding. Also, the"
- text run at (8,134) width 109: "element has a 10"
- text run at (117,134) width 211: "px wide margin around it where"
+ text run at (8,98) width 320: "element is yellow, and there should be a 3px solid"
+ text run at (8,116) width 320: "red border outside a 5px wide padding. Also, the"
+ text run at (8,134) width 320: "element has a 10px wide margin around it where"
text run at (8,152) width 320: "the blue background of the paragraph in the"
text run at (8,170) width 217: "normal flow should shine through."
RenderBlock {P} at (0,559) size 784x198 [bgcolor=#66CCFF]
@@ -99,8 +94,7 @@
text run at (0,108) width 428: "floated element is obscured, it still forces the content of this element"
text run at (0,126) width 121: "to flow around it. "
text run at (121,126) width 307: "If the floated element is not obscured, then the"
- text run at (0,144) width 321: "blue rectangle of this paragraph should extend 10"
- text run at (321,144) width 107: "px above and to"
+ text run at (0,144) width 428: "blue rectangle of this paragraph should extend 10px above and to"
text run at (0,162) width 428: "the right of the sidebar's red border, due to the margin styles set for"
text run at (0,180) width 123: "the floated element."
RenderBlock (anonymous) at (0,757) size 784x18
@@ -112,11 +106,8 @@
RenderText {TEXT} at (0,0) size 320x216
text run at (0,0) width 320: "This paragraph is placed inside a DIV element"
text run at (0,18) width 320: "which is floated to the right. The width of the DIV"
- text run at (0,36) width 88: "element is 20"
- text run at (88,36) width 232: "em. The background is yellow and"
- text run at (0,54) width 79: "there is a 5"
- text run at (79,54) width 118: "px padding, a 10"
- text run at (197,54) width 123: "px margin and no"
+ text run at (0,36) width 320: "element is 20em. The background is yellow and"
+ text run at (0,54) width 320: "there is a 5px padding, a 10px margin and no"
text run at (0,72) width 320: "border. Since it is floated, the yellow box should"
text run at (0,90) width 320: "be rendered on top of the background and borders"
text run at (0,108) width 320: "of adjacent non-floated elements. To the left of this"
@@ -170,9 +161,7 @@
text run at (0,72) width 350: "the blue DIV, the yellow DIV should appear inside the "
text run at (350,72) width 238: "blue rectangle. Due to it being floated"
text run at (0,90) width 155: "to the right and having "
- text run at (155,90) width 28: "a 10"
- text run at (183,90) width 356: "px right margin, the yellow rectange should have a 10"
- text run at (539,90) width 49: "px blue"
+ text run at (155,90) width 433: "a 10px right margin, the yellow rectange should have a 10px blue"
text run at (0,108) width 138: "stripe on its right side."
RenderBlock (anonymous) at (0,1151) size 784x126
RenderBR {BR} at (588,0) size 0x18
@@ -249,9 +238,8 @@
text run at (0,0) width 21: "T"
RenderText {TEXT} at (48,0) size 714x54
text run at (48,0) width 714: "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,18) width 254: "well as bold, with a content width of 1.5"
- text run at (302,18) width 236: "em and a background-color of silver. "
- text run at (538,18) width 224: "The top of the big letter \"T\" should"
+ text run at (48,18) width 491: "well as bold, with a content width of 1.5em and a background-color of silver. "
+ text run at (539,18) width 223: "The top of the big letter \"T\" should"
text run at (48,36) 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 (4,545) size 762x18
RenderBR {BR} at (0,0) size 0x18
@@ -260,16 +248,12 @@
RenderText {TEXT} at (8,8) size 320x180
text run at (8,8) width 320: "This paragraph should be floated to the right, sort"
text run at (8,26) width 320: "of like a 'sidebar' in a magazine article. Its width is"
- text run at (8,44) width 16: "20"
- text run at (24,44) width 304: "em so the box should not be reformatted when"
+ text run at (8,44) width 320: "20em so the box should not be reformatted when"
text run at (8,62) width 320: "the size of the viewport is changed (e.g. when the"
text run at (8,80) width 320: "window is resized). The background color of the"
- text run at (8,98) width 269: "element is yellow, and there should be a 3"
- text run at (277,98) width 51: "px solid"
- text run at (8,116) width 143: "red border outside a 5"
- text run at (151,116) width 177: "px wide padding. Also, the"
- text run at (8,134) width 109: "element has a 10"
- text run at (117,134) width 211: "px wide margin around it where"
+ text run at (8,98) width 320: "element is yellow, and there should be a 3px solid"
+ text run at (8,116) width 320: "red border outside a 5px wide padding. Also, the"
+ text run at (8,134) width 320: "element has a 10px wide margin around it where"
text run at (8,152) width 320: "the blue background of the paragraph in the"
text run at (8,170) width 217: "normal flow should shine through."
RenderBlock {P} at (4,581) size 762x216 [bgcolor=#66CCFF]
@@ -287,8 +271,7 @@
text run at (0,126) width 318: "the content of this element to flow around it. "
text run at (318,126) width 88: "If the floated"
text run at (0,144) width 406: "element is not obscured, then the blue rectangle of this"
- text run at (0,162) width 185: "paragraph should extend 10"
- text run at (185,162) width 221: "px above and to the right of the"
+ text run at (0,162) width 406: "paragraph should extend 10px above and to the right of the"
text run at (0,180) width 406: "sidebar's red border, due to the margin styles set for the floated"
text run at (0,198) width 53: "element."
RenderBlock (anonymous) at (4,797) size 762x18
@@ -300,11 +283,8 @@
RenderText {TEXT} at (0,0) size 320x216
text run at (0,0) width 320: "This paragraph is placed inside a DIV element"
text run at (0,18) width 320: "which is floated to the right. The width of the DIV"
- text run at (0,36) width 88: "element is 20"
- text run at (88,36) width 232: "em. The background is yellow and"
- text run at (0,54) width 79: "there is a 5"
- text run at (79,54) width 118: "px padding, a 10"
- text run at (197,54) width 123: "px margin and no"
+ text run at (0,36) width 320: "element is 20em. The background is yellow and"
+ text run at (0,54) width 320: "there is a 5px padding, a 10px margin and no"
text run at (0,72) width 320: "border. Since it is floated, the yellow box should"
text run at (0,90) width 320: "be rendered on top of the background and borders"
text run at (0,108) width 320: "of adjacent non-floated elements. To the left of this"
@@ -358,10 +338,8 @@
text run at (0,72) width 415: "child of the blue DIV, the yellow DIV should appear inside the "
text run at (415,72) width 156: "blue rectangle. Due to it"
text run at (0,90) width 233: "being floated to the right and having "
- text run at (233,90) width 27: "a 10"
- text run at (260,90) width 311: "px right margin, the yellow rectange should have"
- text run at (0,108) width 27: "a 10"
- text run at (27,108) width 51: "px blue "
+ text run at (233,90) width 338: "a 10px right margin, the yellow rectange should have"
+ text run at (0,108) width 78: "a 10px blue "
text run at (78,108) width 138: "stripe on its right side."
RenderBlock (anonymous) at (4,1191) size 762x126
RenderBR {BR} at (571,0) size 0x18
1.8 +4 -8 WebCore/layout-tests/css1/box_properties/height-expected.txt
Index: height-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/height-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- height-expected.txt 10 Feb 2004 22:03:48 -0000 1.7
+++ height-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 168x30
- text run at (0,0) width 128: ".one {height: 50"
- text run at (128,0) width 32: "px;}"
- text run at (0,15) width 136: ".two {height: 100"
- text run at (136,15) width 32: "px;}"
+ text run at (0,0) width 160: ".one {height: 50px;}"
+ text run at (0,15) width 168: ".two {height: 100px;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock (anonymous) at (0,102) size 784x50
RenderImage {IMG} at (0,0) size 50x50
@@ -30,8 +28,7 @@
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (0,468) size 784x36
RenderText {TEXT} at (0,0) size 784x36
- text run at (0,0) width 619: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50"
- text run at (619,0) width 165: "x15, and the size has been"
+ text run at (0,0) width 784: "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,18) width 116: "doubled using the "
RenderInline {CODE} at (0,0) size 48x15
RenderText {TEXT} at (116,20) size 48x15
@@ -67,8 +64,7 @@
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {P} at (4,370) size 762x36
RenderText {TEXT} at (0,0) size 750x36
- text run at (0,0) width 619: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50"
- text run at (619,0) width 131: "x15, and the size has"
+ 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,18) width 150: "been doubled using the "
RenderInline {CODE} at (0,0) size 48x15
RenderText {TEXT} at (150,20) size 48x15
1.8 +11 -22 WebCore/layout-tests/css1/box_properties/margin-expected.txt
Index: margin-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- margin-expected.txt 11 Dec 2003 19:46:14 -0000 1.7
+++ margin-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,17 +9,12 @@
RenderBlock {PRE} at (0,34) size 784x105
RenderText {TEXT} at (0,0) size 360x105
text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}"
- text run at (0,15) width 136: ".one {margin: 0.5"
- text run at (136,15) width 224: "in; background-color: aqua;}"
- text run at (0,30) width 128: ".two {margin: 25"
- text run at (128,30) width 224: "px; background-color: aqua;}"
- text run at (0,45) width 136: ".three {margin: 5"
- text run at (136,45) width 224: "em; background-color: aqua;}"
+ text run at (0,15) width 360: ".one {margin: 0.5in; background-color: aqua;}"
+ text run at (0,30) width 352: ".two {margin: 25px; background-color: aqua;}"
+ text run at (0,45) width 360: ".three {margin: 5em; background-color: aqua;}"
text run at (0,60) width 352: ".four {margin: 25%; background-color: aqua;}"
- text run at (0,75) width 136: ".five {margin: 25"
- text run at (136,75) width 32: "px;}"
- text run at (0,90) width 136: ".six {margin: -10"
- text run at (136,90) width 224: "px; background-color: aqua;}"
+ text run at (0,75) width 168: ".five {margin: 25px;}"
+ text run at (0,90) width 360: ".six {margin: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,152) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,170) size 784x36
RenderText {TEXT} at (0,0) size 738x36
@@ -58,8 +53,7 @@
RenderListItem {LI} at (40,0) size 694x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 375x18
- text run at (0,0) width 171: "This list has a margin of 25"
- text run at (171,0) width 204: "px, and a light blue background."
+ text run at (0,0) width 375: "This list has a margin of 25px, and a light blue background."
RenderListItem {LI} at (40,18) size 694x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 264x18
@@ -67,8 +61,7 @@
RenderListItem {LI} at (65,61) size 644x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 543x18
- text run at (0,0) width 202: "This list item has a margin of 25"
- text run at (202,0) width 341: "px, which should cause it to be offset in some fashion."
+ 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,104) size 694x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 294x18
@@ -78,8 +71,7 @@
text run at (0,0) width 203: "This element has a class of zero."
RenderBlock {P} at (-10,1298) size 804x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 775x54
- text run at (0,0) width 276: "This paragraph has an overall margin of -10"
- text run at (276,0) width 482: "px, which should make it wider than usual as well as shift it upward and pull"
+ 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,18) width 369: "subsequent text up toward it, and a light blue background. "
text run at (369,18) width 386: "In all other respects, however, the element should be normal. "
text run at (755,18) width 20: "No"
@@ -137,8 +129,7 @@
RenderListItem {LI} at (40,0) size 672x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 375x18
- text run at (0,0) width 171: "This list has a margin of 25"
- text run at (171,0) width 204: "px, and a light blue background."
+ text run at (0,0) width 375: "This list has a margin of 25px, and a light blue background."
RenderListItem {LI} at (40,18) size 672x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 264x18
@@ -146,8 +137,7 @@
RenderListItem {LI} at (65,61) size 622x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 543x18
- text run at (0,0) width 202: "This list item has a margin of 25"
- text run at (202,0) width 341: "px, which should cause it to be offset in some fashion."
+ 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,104) size 672x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 294x18
@@ -157,8 +147,7 @@
text run at (0,0) width 203: "This element has a class of zero."
RenderBlock {P} at (-6,1138) size 782x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 775x54
- text run at (0,0) width 276: "This paragraph has an overall margin of -10"
- text run at (276,0) width 482: "px, which should make it wider than usual as well as shift it upward and pull"
+ 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,18) width 369: "subsequent text up toward it, and a light blue background. "
text run at (369,18) width 386: "In all other respects, however, the element should be normal. "
text run at (755,18) width 20: "No"
1.8 +11 -22 WebCore/layout-tests/css1/box_properties/margin_bottom-expected.txt
Index: margin_bottom-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin_bottom-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- margin_bottom-expected.txt 10 Feb 2004 22:03:48 -0000 1.7
+++ margin_bottom-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,17 +9,12 @@
RenderBlock {PRE} at (0,34) size 784x135
RenderText {TEXT} at (0,0) size 416x120
text run at (0,0) width 408: ".zero {background-color: silver; margin-bottom: 0;}"
- text run at (0,15) width 192: ".one {margin-bottom: 0.5"
- text run at (192,15) width 224: "in; background-color: aqua;}"
- text run at (0,30) width 184: ".two {margin-bottom: 25"
- text run at (184,30) width 224: "px; background-color: aqua;}"
- text run at (0,45) width 192: ".three {margin-bottom: 5"
- text run at (192,45) width 224: "em; background-color: aqua;}"
+ text run at (0,15) width 416: ".one {margin-bottom: 0.5in; background-color: aqua;}"
+ text run at (0,30) width 408: ".two {margin-bottom: 25px; background-color: aqua;}"
+ text run at (0,45) width 416: ".three {margin-bottom: 5em; background-color: aqua;}"
text run at (0,60) width 408: ".four {margin-bottom: 25%; background-color: aqua;}"
- text run at (0,75) width 192: ".five {margin-bottom: 25"
- text run at (192,75) width 32: "px;}"
- text run at (0,90) width 192: ".six {margin-bottom: -10"
- text run at (192,90) width 224: "px; background-color: aqua;}"
+ text run at (0,75) width 224: ".five {margin-bottom: 25px;}"
+ text run at (0,90) width 416: ".six {margin-bottom: -10px; background-color: aqua;}"
text run at (0,105) width 176: "P, UL {margin-top: 0;}"
RenderBlock {HR} at (0,182) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,192) size 784x18 [bgcolor=#C0C0C0]
@@ -51,8 +46,7 @@
RenderListItem {LI} at (40,0) size 744x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 424x18
- text run at (0,0) width 220: "This list has a margin-bottom of 25"
- text run at (220,0) width 204: "px, and a light blue background."
+ text run at (0,0) width 424: "This list has a margin-bottom of 25px, and a light blue background."
RenderListItem {LI} at (40,18) size 744x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 264x18
@@ -60,16 +54,14 @@
RenderListItem {LI} at (40,36) size 744x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 591x18
- text run at (0,0) width 250: "This list item has a bottom margin of 25"
- text run at (250,0) width 341: "px, which should cause it to be offset in some fashion."
+ 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,79) size 744x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 294x18
text run at (0,0) width 294: "This list item has no special styles applied to it."
RenderBlock {P} at (0,861) size 784x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 775x54
- text run at (0,0) width 269: "This paragraph has a bottom margin of -10"
- text run at (269,0) width 506: "px, which should cause elements after it to be shifted \"upward\" on the page, and"
+ text run at (0,0) width 775: "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,18) width 96: "no top margin. "
text run at (96,18) width 488: "No other styles have been applied to it besides a light blue background color. "
text run at (584,18) width 149: "In all other respects, the"
@@ -121,8 +113,7 @@
RenderListItem {LI} at (40,0) size 722x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 424x18
- text run at (0,0) width 220: "This list has a margin-bottom of 25"
- text run at (220,0) width 204: "px, and a light blue background."
+ text run at (0,0) width 424: "This list has a margin-bottom of 25px, and a light blue background."
RenderListItem {LI} at (40,18) size 722x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 264x18
@@ -130,16 +121,14 @@
RenderListItem {LI} at (40,36) size 722x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 591x18
- text run at (0,0) width 250: "This list item has a bottom margin of 25"
- text run at (250,0) width 341: "px, which should cause it to be offset in some fashion."
+ 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,79) size 722x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 294x18
text run at (0,0) width 294: "This list item has no special styles applied to it."
RenderBlock {P} at (4,667) size 762x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 760x54
- text run at (0,0) width 269: "This paragraph has a bottom margin of -10"
- text run at (269,0) width 479: "px, which should cause elements after it to be shifted \"upward\" on the page,"
+ 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,18) width 123: "and no top margin. "
text run at (123,18) width 488: "No other styles have been applied to it besides a light blue background color. "
text run at (611,18) width 149: "In all other respects, the"
1.8 +6 -12 WebCore/layout-tests/css1/box_properties/margin_bottom_inline-expected.txt
Index: margin_bottom_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin_bottom_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- margin_bottom_inline-expected.txt 26 Apr 2004 21:18:59 -0000 1.7
+++ margin_bottom_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x30
RenderText {TEXT} at (0,0) size 416x30
- text run at (0,0) width 184: ".one {margin-bottom: 25"
- text run at (184,0) width 224: "px; background-color: aqua;}"
- text run at (0,15) width 192: ".two {margin-bottom: -10"
- text run at (192,15) width 224: "px; background-color: aqua;}"
+ text run at (0,0) width 408: ".one {margin-bottom: 25px; background-color: aqua;}"
+ text run at (0,15) width 416: ".two {margin-bottom: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,77) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,95) size 784x54 [bgcolor=#808080]
RenderText {TEXT} at (0,0) size 481x18
@@ -25,8 +23,7 @@
text run at (624,2) width 24: "one"
RenderText {TEXT} at (648,0) size 761x36
text run at (648,0) width 113: ", giving it an aqua"
- text run at (0,18) width 133: "background and a 25"
- text run at (133,18) width 112: "px bottom margin"
+ text run at (0,18) width 245: "background and a 25px bottom margin"
RenderText {TEXT} at (245,18) size 784x36
text run at (245,18) width 8: ". "
text run at (253,18) width 531: "Margins on inline elements does not affect line-height calculations, so all lines in this"
@@ -43,8 +40,7 @@
text run at (624,2) width 24: "two"
RenderText {TEXT} at (648,0) size 761x36
text run at (648,0) width 113: ", giving it an aqua"
- text run at (0,18) width 138: "background and a -10"
- text run at (138,18) width 112: "px bottom margin"
+ text run at (0,18) width 250: "background and a -10px bottom margin"
RenderText {TEXT} at (250,18) size 763x36
text run at (250,18) width 8: ". "
text run at (258,18) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in"
@@ -73,8 +69,7 @@
text run at (624,2) width 24: "one"
RenderText {TEXT} at (648,0) size 761x36
text run at (648,0) width 113: ", giving it an aqua"
- text run at (0,18) width 133: "background and a 25"
- text run at (133,18) width 112: "px bottom margin"
+ text run at (0,18) width 245: "background and a 25px bottom margin"
RenderText {TEXT} at (245,18) size 758x36
text run at (245,18) width 8: ". "
text run at (253,18) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in"
@@ -91,8 +86,7 @@
text run at (624,2) width 24: "two"
RenderText {TEXT} at (648,0) size 761x36
text run at (648,0) width 113: ", giving it an aqua"
- text run at (0,18) width 138: "background and a -10"
- text run at (138,18) width 112: "px bottom margin"
+ text run at (0,18) width 250: "background and a -10px bottom margin"
RenderText {TEXT} at (250,18) size 747x36
text run at (250,18) width 8: ". "
text run at (258,18) width 489: "Margins on inline elements does not affect line-height calculations, so all lines"
1.8 +14 -28 WebCore/layout-tests/css1/box_properties/margin_inline-expected.txt
Index: margin_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- margin_inline-expected.txt 10 Feb 2004 22:03:48 -0000 1.7
+++ margin_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,10 +9,8 @@
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 360x45
text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}"
- text run at (0,15) width 128: ".one {margin: 25"
- text run at (128,15) width 224: "px; background-color: aqua;}"
- text run at (0,30) width 136: ".two {margin: -10"
- text run at (136,30) width 224: "px; background-color: aqua;}"
+ text run at (0,15) width 352: ".one {margin: 25px; background-color: aqua;}"
+ text run at (0,30) width 360: ".two {margin: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,102) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
@@ -29,16 +27,13 @@
text run at (649,2) width 24: "one"
RenderText {TEXT} at (673,0) size 752x36
text run at (673,0) width 79: ", giving it an"
- text run at (0,18) width 167: "aqua background and a 25"
- text run at (167,18) width 64: "px margin"
+ text run at (0,18) width 231: "aqua background and a 25px margin"
RenderText {TEXT} at (256,18) size 769x54
text run at (256,18) width 8: ". "
text run at (264,18) width 505: "Margins on inline elements does not affect line-height calculations, so all lines in"
text run at (0,36) width 293: "this element should have the same line-height. "
- text run at (293,36) width 194: "However, there should be a 25"
- text run at (487,36) width 279: "px margin to the left side of the inline box in"
- text run at (0,54) width 200: "the first line it appears, and a 25"
- text run at (200,54) width 527: "px margin to the right side of the inline element box in the last line where it appears."
+ text run at (293,36) width 473: "However, there should be a 25px margin to the left side of the inline box in"
+ text run at (0,54) 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,224) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
text run at (0,0) width 203: "This element has a class of zero."
@@ -54,16 +49,13 @@
text run at (614,2) width 24: "two"
RenderText {TEXT} at (638,0) size 751x36
text run at (638,0) width 113: ", giving it an aqua"
- text run at (0,18) width 138: "background and a -10"
- text run at (138,18) width 64: "px margin"
+ text run at (0,18) width 202: "background and a -10px margin"
RenderText {TEXT} at (192,18) size 784x54
text run at (192,18) width 8: ". "
text run at (200,18) width 584: "Margins on inline elements does not affect line-height calculations, so all lines in this element"
text run at (0,36) width 214: "should have the same line-height. "
- text run at (214,36) width 199: "However, there should be a -10"
- text run at (413,36) width 369: "px margin to the left side of the inline box in the first line it"
- text run at (0,54) width 115: "appears, and a -10"
- text run at (115,54) width 527: "px margin to the right side of the inline element box in the last line where it appears."
+ text run at (214,36) width 568: "However, there should be a -10px margin to the left side of the inline box in the first line it"
+ text run at (0,54) width 642: "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,346) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
text run at (0,0) width 203: "This element has a class of zero."
@@ -94,16 +86,13 @@
text run at (649,2) width 24: "one"
RenderText {TEXT} at (673,0) size 752x36
text run at (673,0) width 79: ", giving it an"
- text run at (0,18) width 167: "aqua background and a 25"
- text run at (167,18) width 64: "px margin"
+ text run at (0,18) width 231: "aqua background and a 25px margin"
RenderText {TEXT} at (256,18) size 753x72
text run at (256,18) width 8: ". "
text run at (264,18) width 489: "Margins on inline elements does not affect line-height calculations, so all lines"
text run at (0,36) width 309: "in this element should have the same line-height. "
- text run at (309,36) width 194: "However, there should be a 25"
- text run at (503,36) width 235: "px margin to the left side of the inline"
- text run at (0,54) width 244: "box in the first line it appears, and a 25"
- text run at (244,54) width 471: "px margin to the right side of the inline element box in the last line where it"
+ text run at (309,36) width 429: "However, there should be a 25px margin to the left side of the inline"
+ text run at (0,54) width 715: "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 it"
text run at (0,72) width 52: "appears."
RenderBlock {P} at (4,144) size 762x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
@@ -120,16 +109,13 @@
text run at (614,2) width 24: "two"
RenderText {TEXT} at (638,0) size 751x36
text run at (638,0) width 113: ", giving it an aqua"
- text run at (0,18) width 138: "background and a -10"
- text run at (138,18) width 64: "px margin"
+ text run at (0,18) width 202: "background and a -10px margin"
RenderText {TEXT} at (192,18) size 745x54
text run at (192,18) width 8: ". "
text run at (200,18) width 531: "Margins on inline elements does not affect line-height calculations, so all lines in this"
text run at (0,36) width 267: "element should have the same line-height. "
- text run at (267,36) width 199: "However, there should be a -10"
- text run at (466,36) width 279: "px margin to the left side of the inline box in"
- text run at (0,54) width 205: "the first line it appears, and a -10"
- text run at (205,54) width 527: "px margin to the right side of the inline element box in the last line where it appears."
+ text run at (267,36) width 478: "However, there should be a -10px margin to the left side of the inline box in"
+ text run at (0,54) width 732: "the 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 (4,266) size 762x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
text run at (0,0) width 203: "This element has a class of zero."
1.8 +6 -12 WebCore/layout-tests/css1/box_properties/margin_left-expected.txt
Index: margin_left-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin_left-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- margin_left-expected.txt 11 Dec 2003 19:46:14 -0000 1.7
+++ margin_left-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,15 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 408x90
text run at (0,0) width 392: ".zero {background-color: silver; margin-left: 0;}"
- text run at (0,15) width 176: ".one {margin-left: 0.5"
- text run at (176,15) width 224: "in; background-color: aqua;}"
- text run at (0,30) width 168: ".two {margin-left: 25"
- text run at (168,30) width 224: "px; background-color: aqua;}"
- text run at (0,45) width 176: ".three {margin-left: 5"
- text run at (176,45) width 224: "em; background-color: aqua;}"
+ text run at (0,15) width 400: ".one {margin-left: 0.5in; background-color: aqua;}"
+ text run at (0,30) width 392: ".two {margin-left: 25px; background-color: aqua;}"
+ text run at (0,45) width 400: ".three {margin-left: 5em; background-color: aqua;}"
text run at (0,60) width 392: ".four {margin-left: 25%; background-color: aqua;}"
- text run at (0,75) width 184: ".five {margin-left: -10"
- text run at (184,75) width 224: "px; background-color: aqua;}"
+ text run at (0,75) width 408: ".five {margin-left: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
@@ -56,8 +52,7 @@
text run at (0,0) width 203: "This element has a class of zero."
RenderBlock {P} at (-10,483) size 794x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 789x54
- text run at (0,0) width 245: "This paragraph has a left margin of -10"
- text run at (245,0) width 544: "px, which should cause it to be wider than it might otherwise be, and it has a light blue"
+ text run at (0,0) width 789: "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,18) width 83: "background. "
text run at (83,18) width 386: "In all other respects, however, the element should be normal. "
text run at (469,18) width 278: "No styles have been applied to it besides the"
@@ -111,8 +106,7 @@
text run at (0,0) width 203: "This element has a class of zero."
RenderBlock {P} at (-6,332) size 772x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 758x54
- text run at (0,0) width 245: "This paragraph has a left margin of -10"
- text run at (245,0) width 513: "px, which should cause it to be wider than it might otherwise be, and it has a light"
+ 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,18) width 114: "blue background. "
text run at (114,18) width 386: "In all other respects, however, the element should be normal. "
text run at (500,18) width 255: "No styles have been applied to it besides"
1.9 +4 -8 WebCore/layout-tests/css1/box_properties/margin_left_inline-expected.txt
Index: margin_left_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin_left_inline-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- margin_left_inline-expected.txt 20 Aug 2004 23:37:46 -0000 1.8
+++ margin_left_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.9
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x30
RenderText {TEXT} at (0,0) size 400x30
- text run at (0,0) width 168: ".one {margin-left: 25"
- text run at (168,0) width 224: "px; background-color: aqua;}"
- text run at (0,15) width 176: ".two {margin-left: -10"
- text run at (176,15) width 224: "px; background-color: aqua;}"
+ text run at (0,0) width 392: ".one {margin-left: 25px; background-color: aqua;}"
+ text run at (0,15) width 400: ".two {margin-left: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,77) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,95) size 784x36 [bgcolor=#808080]
RenderText {TEXT} at (0,0) size 543x18
@@ -43,8 +41,7 @@
text run at (676,2) width 24: "two"
RenderText {TEXT} at (700,0) size 747x36
text run at (700,0) width 47: ", which"
- text run at (0,18) width 121: "should result in -10"
- text run at (121,18) width 163: "px left margin only in the "
+ text run at (0,18) width 284: "should result in -10px left margin only in the "
RenderInline {STRONG} at (0,0) size 27x18
RenderText {TEXT} at (284,18) size 27x18
text run at (284,18) width 27: "first"
@@ -92,8 +89,7 @@
text run at (676,2) width 24: "two"
RenderText {TEXT} at (700,0) size 747x36
text run at (700,0) width 47: ", which"
- text run at (0,18) width 121: "should result in -10"
- text run at (121,18) width 163: "px left margin only in the "
+ text run at (0,18) width 284: "should result in -10px left margin only in the "
RenderInline {STRONG} at (0,0) size 27x18
RenderText {TEXT} at (284,18) size 27x18
text run at (284,18) width 27: "first"
1.9 +6 -12 WebCore/layout-tests/css1/box_properties/margin_right-expected.txt
Index: margin_right-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin_right-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- margin_right-expected.txt 11 Dec 2003 19:46:14 -0000 1.8
+++ margin_right-expected.txt 19 Jul 2005 21:18:04 -0000 1.9
@@ -9,15 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 560x90
text run at (0,0) width 552: ".zero {background-color: silver; margin-right: 0; text-align: right;}"
- text run at (0,15) width 184: ".one {margin-right: 0.5"
- text run at (184,15) width 376: "in; text-align: right; background-color: aqua;}"
- text run at (0,30) width 176: ".two {margin-right: 25"
- text run at (176,30) width 376: "px; text-align: right; background-color: aqua;}"
- text run at (0,45) width 184: ".three {margin-right: 5"
- text run at (184,45) width 376: "em; text-align: right; background-color: aqua;}"
+ text run at (0,15) width 560: ".one {margin-right: 0.5in; text-align: right; background-color: aqua;}"
+ text run at (0,30) width 552: ".two {margin-right: 25px; text-align: right; background-color: aqua;}"
+ text run at (0,45) width 560: ".three {margin-right: 5em; text-align: right; background-color: aqua;}"
text run at (0,60) width 552: ".four {margin-right: 25%; text-align: right; background-color: aqua;}"
- text run at (0,75) width 192: ".five {margin-right: -10"
- text run at (192,75) width 224: "px; background-color: aqua;}"
+ text run at (0,75) width 416: ".five {margin-right: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (581,0) size 203x18
@@ -56,8 +52,7 @@
text run at (581,0) width 203: "This element has a class of zero."
RenderBlock {P} at (0,483) size 794x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 778x54
- text run at (0,0) width 254: "This paragraph has a right margin of -10"
- text run at (254,0) width 513: "px, which should cause it to be wider than it might otherwise be, and it has a light"
+ 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,18) width 114: "blue background. "
text run at (114,18) width 386: "In all other respects, however, the element should be normal. "
text run at (500,18) width 278: "No styles have been applied to it besides the"
@@ -112,8 +107,7 @@
text run at (559,0) width 203: "This element has a class of zero."
RenderBlock {P} at (4,350) size 772x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 767x54
- text run at (0,0) width 254: "This paragraph has a right margin of -10"
- text run at (254,0) width 513: "px, which should cause it to be wider than it might otherwise be, and it has a light"
+ 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,18) width 114: "blue background. "
text run at (114,18) width 386: "In all other respects, however, the element should be normal. "
text run at (500,18) width 255: "No styles have been applied to it besides"
1.9 +4 -8 WebCore/layout-tests/css1/box_properties/margin_right_inline-expected.txt
Index: margin_right_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin_right_inline-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- margin_right_inline-expected.txt 20 Aug 2004 23:37:46 -0000 1.8
+++ margin_right_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.9
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x30
RenderText {TEXT} at (0,0) size 552x30
- text run at (0,0) width 176: ".one {margin-right: 25"
- text run at (176,0) width 376: "px; text-align: right; background-color: aqua;}"
- text run at (0,15) width 184: ".two {margin-right: -10"
- text run at (184,15) width 224: "px; background-color: aqua;}"
+ text run at (0,0) width 552: ".one {margin-right: 25px; text-align: right; background-color: aqua;}"
+ text run at (0,15) width 408: ".two {margin-right: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,77) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,95) size 784x36 [bgcolor=#808080]
RenderText {TEXT} at (0,0) size 543x18
@@ -43,8 +41,7 @@
text run at (686,2) width 24: "two"
RenderText {TEXT} at (700,0) size 747x36
text run at (700,0) width 47: ", which"
- text run at (0,18) width 121: "should result in -10"
- text run at (121,18) width 172: "px right margin only in the "
+ text run at (0,18) width 293: "should result in -10px right margin only in the "
RenderInline {STRONG} at (0,0) size 23x18
RenderText {TEXT} at (293,18) size 23x18
text run at (293,18) width 23: "last"
@@ -92,8 +89,7 @@
text run at (686,2) width 24: "two"
RenderText {TEXT} at (700,0) size 747x36
text run at (700,0) width 47: ", which"
- text run at (0,18) width 121: "should result in -10"
- text run at (121,18) width 172: "px right margin only in the "
+ text run at (0,18) width 293: "should result in -10px right margin only in the "
RenderInline {STRONG} at (0,0) size 23x18
RenderText {TEXT} at (293,18) size 23x18
text run at (293,18) width 23: "last"
1.8 +11 -22 WebCore/layout-tests/css1/box_properties/margin_top-expected.txt
Index: margin_top-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin_top-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- margin_top-expected.txt 10 Feb 2004 22:03:48 -0000 1.7
+++ margin_top-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,17 +9,12 @@
RenderBlock {PRE} at (0,31) size 784x120
RenderText {TEXT} at (0,0) size 392x120
text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}"
- text run at (0,15) width 168: ".one {margin-top: 0.5"
- text run at (168,15) width 224: "in; background-color: aqua;}"
- text run at (0,30) width 160: ".two {margin-top: 25"
- text run at (160,30) width 224: "px; background-color: aqua;}"
- text run at (0,45) width 168: ".three {margin-top: 5"
- text run at (168,45) width 224: "em; background-color: aqua;}"
+ text run at (0,15) width 392: ".one {margin-top: 0.5in; background-color: aqua;}"
+ text run at (0,30) width 384: ".two {margin-top: 25px; background-color: aqua;}"
+ text run at (0,45) width 392: ".three {margin-top: 5em; background-color: aqua;}"
text run at (0,60) width 384: ".four {margin-top: 25%; background-color: aqua;}"
- text run at (0,75) width 168: ".five {margin-top: 25"
- text run at (168,75) width 32: "px;}"
- text run at (0,90) width 168: ".six {margin-top: -10"
- text run at (168,90) width 224: "px; background-color: aqua;}"
+ text run at (0,75) width 200: ".five {margin-top: 25px;}"
+ text run at (0,90) width 392: ".six {margin-top: -10px; background-color: aqua;}"
text run at (0,105) width 200: "P, UL {margin-bottom: 0;}"
RenderBlock {HR} at (0,164) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,174) size 784x18 [bgcolor=#C0C0C0]
@@ -49,8 +44,7 @@
RenderListItem {LI} at (40,0) size 744x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 400x18
- text run at (0,0) width 196: "This list has a margin-top of 25"
- text run at (196,0) width 204: "px, and a light blue background."
+ text run at (0,0) width 400: "This list has a margin-top of 25px, and a light blue background."
RenderListItem {LI} at (40,18) size 744x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 264x18
@@ -58,8 +52,7 @@
RenderListItem {LI} at (40,61) size 744x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 567x18
- text run at (0,0) width 226: "This list item has a top margin of 25"
- text run at (226,0) width 341: "px, which should cause it to be offset in some fashion."
+ 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,79) size 744x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 294x18
@@ -69,8 +62,7 @@
text run at (0,0) width 203: "This element has a class of zero."
RenderBlock {P} at (0,833) size 784x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 766x54
- text run at (0,0) width 231: "This element has a top margin of -10"
- text run at (231,0) width 535: "px, which should cause it to be shifted \"upward\" on the page, and no bottom margin."
+ 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,18) width 488: "No other styles have been applied to it besides a light blue background color. "
text run at (488,18) width 267: "In all other respects, the element should be"
text run at (0,36) width 48: "normal."
@@ -113,8 +105,7 @@
RenderListItem {LI} at (40,0) size 722x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 400x18
- text run at (0,0) width 196: "This list has a margin-top of 25"
- text run at (196,0) width 204: "px, and a light blue background."
+ text run at (0,0) width 400: "This list has a margin-top of 25px, and a light blue background."
RenderListItem {LI} at (40,18) size 722x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 264x18
@@ -122,8 +113,7 @@
RenderListItem {LI} at (40,61) size 722x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 567x18
- text run at (0,0) width 226: "This list item has a top margin of 25"
- text run at (226,0) width 341: "px, which should cause it to be offset in some fashion."
+ 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,79) size 722x18
RenderListMarker at (0,0) size 0x14
RenderText {TEXT} at (0,0) size 294x18
@@ -133,8 +123,7 @@
text run at (0,0) width 203: "This element has a class of zero."
RenderBlock {P} at (4,657) size 762x54 [bgcolor=#00FFFF]
RenderText {TEXT} at (0,0) size 742x54
- text run at (0,0) width 231: "This element has a top margin of -10"
- text run at (231,0) width 483: "px, which should cause it to be shifted \"upward\" on the page, and no bottom"
+ 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,18) width 52: "margin. "
text run at (52,18) width 488: "No other styles have been applied to it besides a light blue background color. "
text run at (540,18) width 202: "In all other respects, the element"
1.8 +6 -12 WebCore/layout-tests/css1/box_properties/margin_top_inline-expected.txt
Index: margin_top_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/margin_top_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- margin_top_inline-expected.txt 26 Apr 2004 21:18:59 -0000 1.7
+++ margin_top_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,10 +9,8 @@
RenderBlock {PRE} at (0,34) size 784x60
RenderText {TEXT} at (0,0) size 392x45
text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}"
- text run at (0,15) width 160: ".one {margin-top: 25"
- text run at (160,15) width 224: "px; background-color: aqua;}"
- text run at (0,30) width 168: ".two {margin-top: -10"
- text run at (168,30) width 224: "px; background-color: aqua;}"
+ text run at (0,15) width 384: ".one {margin-top: 25px; background-color: aqua;}"
+ text run at (0,30) width 392: ".two {margin-top: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,125) size 784x54 [bgcolor=#808080]
RenderText {TEXT} at (0,0) size 477x18
@@ -26,8 +24,7 @@
text run at (620,2) width 24: "one"
RenderText {TEXT} at (644,0) size 757x36
text run at (644,0) width 113: ", giving it an aqua"
- text run at (0,18) width 133: "background and a 25"
- text run at (133,18) width 88: "px top margin"
+ text run at (0,18) width 221: "background and a 25px top margin"
RenderText {TEXT} at (221,18) size 747x36
text run at (221,18) width 8: ". "
text run at (229,18) width 518: "Margins on inline elements do not affect line-height calculations, so all lines in this"
@@ -44,8 +41,7 @@
text run at (620,2) width 24: "two"
RenderText {TEXT} at (644,0) size 754x36
text run at (644,0) width 110: ", giving the inline"
- text run at (0,18) width 244: "element an aqua background and a -10"
- text run at (244,18) width 88: "px top margin"
+ text run at (0,18) width 332: "element an aqua background and a -10px top margin"
RenderText {TEXT} at (332,18) size 783x36
text run at (332,18) width 8: ". "
text run at (340,18) width 443: "Margins on inline elements do not affect line-height calculations, so all"
@@ -74,8 +70,7 @@
text run at (620,2) width 24: "one"
RenderText {TEXT} at (644,0) size 757x36
text run at (644,0) width 113: ", giving it an aqua"
- text run at (0,18) width 133: "background and a 25"
- text run at (133,18) width 88: "px top margin"
+ text run at (0,18) width 221: "background and a 25px top margin"
RenderText {TEXT} at (221,18) size 747x36
text run at (221,18) width 8: ". "
text run at (229,18) width 518: "Margins on inline elements do not affect line-height calculations, so all lines in this"
@@ -92,8 +87,7 @@
text run at (620,2) width 24: "two"
RenderText {TEXT} at (644,0) size 754x36
text run at (644,0) width 110: ", giving the inline"
- text run at (0,18) width 244: "element an aqua background and a -10"
- text run at (244,18) width 88: "px top margin"
+ text run at (0,18) width 332: "element an aqua background and a -10px top margin"
RenderText {TEXT} at (332,18) size 746x36
text run at (332,18) width 8: ". "
text run at (340,18) width 406: "Margins on inline elements do not affect line-height calculations,"
1.8 +4 -8 WebCore/layout-tests/css1/box_properties/padding-expected.txt
Index: padding-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- padding-expected.txt 11 Dec 2003 19:46:14 -0000 1.7
+++ padding-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,15 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 376x90
text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}"
- text run at (0,15) width 144: ".one {padding: 0.5"
- text run at (144,15) width 224: "in; background-color: aqua;}"
- text run at (0,30) width 136: ".two {padding: 25"
- text run at (136,30) width 224: "px; background-color: aqua;}"
- text run at (0,45) width 144: ".three {padding: 5"
- text run at (144,45) width 224: "em; background-color: aqua;}"
+ text run at (0,15) width 368: ".one {padding: 0.5in; background-color: aqua;}"
+ text run at (0,30) width 360: ".two {padding: 25px; background-color: aqua;}"
+ text run at (0,45) width 368: ".three {padding: 5em; background-color: aqua;}"
text run at (0,60) width 360: ".four {padding: 25%; background-color: aqua;}"
- text run at (0,75) width 152: ".five {padding: -20"
- text run at (152,75) width 224: "px; background-color: aqua;}"
+ text run at (0,75) width 376: ".five {padding: -20px; background-color: aqua;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
1.7 +4 -8 WebCore/layout-tests/css1/box_properties/padding_bottom-expected.txt
Index: padding_bottom-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding_bottom-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- padding_bottom-expected.txt 11 Dec 2003 19:46:14 -0000 1.6
+++ padding_bottom-expected.txt 19 Jul 2005 21:18:04 -0000 1.7
@@ -9,15 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 432x90
text run at (0,0) width 416: ".zero {background-color: silver; padding-bottom: 0;}"
- text run at (0,15) width 200: ".one {padding-bottom: 0.5"
- text run at (200,15) width 224: "in; background-color: aqua;}"
- text run at (0,30) width 192: ".two {padding-bottom: 25"
- text run at (192,30) width 224: "px; background-color: aqua;}"
- text run at (0,45) width 200: ".three {padding-bottom: 5"
- text run at (200,45) width 224: "em; background-color: aqua;}"
+ text run at (0,15) width 424: ".one {padding-bottom: 0.5in; background-color: aqua;}"
+ text run at (0,30) width 416: ".two {padding-bottom: 25px; background-color: aqua;}"
+ text run at (0,45) width 424: ".three {padding-bottom: 5em; background-color: aqua;}"
text run at (0,60) width 416: ".four {padding-bottom: 25%; background-color: aqua;}"
- text run at (0,75) width 208: ".five {padding-bottom: -20"
- text run at (208,75) width 224: "px; background-color: aqua;}"
+ text run at (0,75) width 432: ".five {padding-bottom: -20px; background-color: aqua;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
1.8 +4 -8 WebCore/layout-tests/css1/box_properties/padding_bottom_inline-expected.txt
Index: padding_bottom_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding_bottom_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- padding_bottom_inline-expected.txt 26 Apr 2004 21:18:59 -0000 1.7
+++ padding_bottom_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 424x30
- text run at (0,0) width 192: ".one {padding-bottom: 25"
- text run at (192,0) width 224: "px; background-color: aqua;}"
- text run at (0,15) width 200: ".two {padding-bottom: -10"
- text run at (200,15) width 224: "px; background-color: aqua;}"
+ text run at (0,0) width 416: ".one {padding-bottom: 25px; background-color: aqua;}"
+ text run at (0,15) width 424: ".two {padding-bottom: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x72 [bgcolor=#808080]
RenderText {TEXT} at (0,0) size 477x18
@@ -25,8 +23,7 @@
text run at (620,2) width 24: "one"
RenderText {TEXT} at (644,0) size 757x36
text run at (644,0) width 113: ", giving it an aqua"
- text run at (0,18) width 133: "background and a 25"
- text run at (133,18) width 119: "px bottom padding"
+ text run at (0,18) width 252: "background and a 25px bottom padding"
RenderText {TEXT} at (252,18) size 781x54
text run at (252,18) width 8: ". "
text run at (260,18) width 505: "Padding on inline elements does not affect line-height calculations, so all lines in"
@@ -74,8 +71,7 @@
text run at (620,2) width 24: "one"
RenderText {TEXT} at (644,0) size 757x36
text run at (644,0) width 113: ", giving it an aqua"
- text run at (0,18) width 133: "background and a 25"
- text run at (133,18) width 119: "px bottom padding"
+ text run at (0,18) width 252: "background and a 25px bottom padding"
RenderText {TEXT} at (252,18) size 749x54
text run at (252,18) width 8: ". "
text run at (260,18) width 489: "Padding on inline elements does not affect line-height calculations, so all lines"
1.8 +8 -16 WebCore/layout-tests/css1/box_properties/padding_inline-expected.txt
Index: padding_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- padding_inline-expected.txt 11 Dec 2003 19:46:14 -0000 1.7
+++ padding_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,10 +9,8 @@
RenderBlock {PRE} at (0,34) size 784x60
RenderText {TEXT} at (0,0) size 368x45
text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}"
- text run at (0,15) width 136: ".one {padding: 25"
- text run at (136,15) width 224: "px; background-color: aqua;}"
- text run at (0,30) width 144: ".two {padding: -10"
- text run at (144,30) width 224: "px; background-color: aqua;}"
+ text run at (0,15) width 360: ".one {padding: 25px; background-color: aqua;}"
+ text run at (0,30) width 368: ".two {padding: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,107) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,125) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
@@ -29,18 +27,15 @@
text run at (645,2) width 24: "one"
RenderText {TEXT} at (669,0) size 782x36
text run at (669,0) width 113: ", giving it an aqua"
- text run at (0,18) width 133: "background and a 25"
- text run at (133,18) width 71: "px padding"
+ text run at (0,18) width 204: "background and a 25px padding"
RenderText {TEXT} at (229,18) size 780x90
text run at (229,18) width 8: ". "
text run at (237,18) width 531: "Padding on inline elements does not affect line-height calculations, so all lines in this"
text run at (0,36) width 267: "element should have the same line-height. "
text run at (267,36) width 488: "There may be implementation-specific limits on how much of the padding the"
text run at (0,54) width 353: "user agent is able to display above and below each line. "
- text run at (353,54) width 230: "However, there should be at least 25"
- text run at (583,54) width 197: "px of padding to the left side of"
- text run at (0,72) width 295: "the inline box in the first line it appears, and 25"
- text run at (295,72) width 483: "px of padding to the right side of the inline element box in the last line where"
+ text run at (353,54) width 427: "However, there should be at least 25px of padding to the left side of"
+ text run at (0,72) width 778: "the 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"
text run at (0,90) width 64: "it appears."
RenderBlock {P} at (0,283) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
@@ -92,18 +87,15 @@
text run at (645,2) width 24: "one"
RenderText {TEXT} at (669,0) size 748x36
text run at (669,0) width 79: ", giving it an"
- text run at (0,18) width 167: "aqua background and a 25"
- text run at (167,18) width 71: "px padding"
+ text run at (0,18) width 238: "aqua background and a 25px padding"
RenderText {TEXT} at (263,18) size 760x90
text run at (263,18) width 8: ". "
text run at (271,18) width 489: "Padding on inline elements does not affect line-height calculations, so all lines"
text run at (0,36) width 309: "in this element should have the same line-height. "
text run at (309,36) width 410: "There may be implementation-specific limits on how much of the"
text run at (0,54) width 431: "padding the user agent is able to display above and below each line. "
- text run at (431,54) width 230: "However, there should be at least 25"
- text run at (661,54) width 88: "px of padding"
- text run at (0,72) width 404: "to the left side of the inline box in the first line it appears, and 25"
- text run at (404,72) width 349: "px of padding to the right side of the inline element box"
+ text run at (431,54) width 318: "However, there should be at least 25px of padding"
+ text run at (0,72) width 753: "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 element box"
text run at (0,90) width 198: "in the last line where it appears."
RenderBlock {P} at (4,162) size 762x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
1.8 +6 -12 WebCore/layout-tests/css1/box_properties/padding_left-expected.txt
Index: padding_left-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding_left-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- padding_left-expected.txt 11 Dec 2003 19:46:14 -0000 1.7
+++ padding_left-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,15 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 416x90
text run at (0,0) width 400: ".zero {background-color: silver; padding-left: 0;}"
- text run at (0,15) width 184: ".one {padding-left: 0.5"
- text run at (184,15) width 224: "in; background-color: aqua;}"
- text run at (0,30) width 176: ".two {padding-left: 25"
- text run at (176,30) width 224: "px; background-color: aqua;}"
- text run at (0,45) width 184: ".three {padding-left: 5"
- text run at (184,45) width 224: "em; background-color: aqua;}"
+ text run at (0,15) width 408: ".one {padding-left: 0.5in; background-color: aqua;}"
+ text run at (0,30) width 400: ".two {padding-left: 25px; background-color: aqua;}"
+ text run at (0,45) width 408: ".three {padding-left: 5em; background-color: aqua;}"
text run at (0,60) width 400: ".four {padding-left: 25%; background-color: aqua;}"
- text run at (0,75) width 192: ".five {padding-left: -20"
- text run at (192,75) width 224: "px; background-color: aqua;}"
+ text run at (0,75) width 416: ".five {padding-left: -20px; background-color: aqua;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
@@ -34,8 +30,7 @@
text run at (25,18) width 356: "background and the padding should be aqua (light blue)."
RenderBlock {P} at (0,293) size 784x36 [bgcolor=#00FFFF]
RenderText {TEXT} at (80,0) size 690x36
- text run at (80,0) width 280: "This element should have a left padding of 5"
- text run at (360,0) width 306: "em, which will require extra text in order to test. "
+ 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 104: "Both the content"
text run at (80,18) width 356: "background and the padding should be aqua (light blue)."
RenderBlock {P} at (0,345) size 784x54 [bgcolor=#00FFFF]
@@ -87,8 +82,7 @@
text run at (25,18) width 356: "background and the padding should be aqua (light blue)."
RenderBlock {P} at (4,142) size 762x36 [bgcolor=#00FFFF]
RenderText {TEXT} at (80,0) size 640x36
- text run at (80,0) width 280: "This element should have a left padding of 5"
- text run at (360,0) width 306: "em, which will require extra text in order to test. "
+ 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,18) width 406: "content background and the padding should be aqua (light blue)."
RenderBlock {P} at (4,194) size 762x54 [bgcolor=#00FFFF]
1.9 +4 -8 WebCore/layout-tests/css1/box_properties/padding_left_inline-expected.txt
Index: padding_left_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding_left_inline-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- padding_left_inline-expected.txt 20 Aug 2004 23:37:46 -0000 1.8
+++ padding_left_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.9
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 408x30
- text run at (0,0) width 176: ".one {padding-left: 25"
- text run at (176,0) width 224: "px; background-color: aqua;}"
- text run at (0,15) width 184: ".two {padding-left: -10"
- text run at (184,15) width 224: "px; background-color: aqua;}"
+ text run at (0,0) width 400: ".one {padding-left: 25px; background-color: aqua;}"
+ text run at (0,15) width 408: ".two {padding-left: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x54 [bgcolor=#808080]
RenderText {TEXT} at (0,0) size 543x18
@@ -44,8 +42,7 @@
text run at (686,2) width 24: "two"
RenderText {TEXT} at (710,0) size 753x36
text run at (710,0) width 43: " which"
- text run at (0,18) width 121: "should result in -10"
- text run at (121,18) width 391: "px left padding (which should also be a light blue) only in the "
+ text run at (0,18) width 512: "should result in -10px left padding (which should also be a light blue) only in the "
RenderInline {STRONG} at (0,0) size 27x18
RenderText {TEXT} at (512,18) size 27x18
text run at (512,18) width 27: "first"
@@ -93,8 +90,7 @@
text run at (686,2) width 24: "two"
RenderText {TEXT} at (710,0) size 753x36
text run at (710,0) width 43: " which"
- text run at (0,18) width 121: "should result in -10"
- text run at (121,18) width 391: "px left padding (which should also be a light blue) only in the "
+ text run at (0,18) width 512: "should result in -10px left padding (which should also be a light blue) only in the "
RenderInline {STRONG} at (0,0) size 27x18
RenderText {TEXT} at (512,18) size 27x18
text run at (512,18) width 27: "first"
1.8 +4 -8 WebCore/layout-tests/css1/box_properties/padding_right-expected.txt
Index: padding_right-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding_right-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- padding_right-expected.txt 11 Dec 2003 19:46:14 -0000 1.7
+++ padding_right-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -9,15 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 576x90
text run at (0,0) width 408: ".zero {background-color: silver; padding-right: 0;}"
- text run at (0,15) width 192: ".one {padding-right: 0.5"
- text run at (192,15) width 376: "in; text-align: right; background-color: aqua;}"
- text run at (0,30) width 184: ".two {padding-right: 25"
- text run at (184,30) width 376: "px; text-align: right; background-color: aqua;}"
- text run at (0,45) width 192: ".three {padding-right: 5"
- text run at (192,45) width 376: "em; text-align: right; background-color: aqua;}"
+ text run at (0,15) width 568: ".one {padding-right: 0.5in; text-align: right; background-color: aqua;}"
+ text run at (0,30) width 560: ".two {padding-right: 25px; text-align: right; background-color: aqua;}"
+ text run at (0,45) width 568: ".three {padding-right: 5em; text-align: right; background-color: aqua;}"
text run at (0,60) width 560: ".four {padding-right: 25%; text-align: right; background-color: aqua;}"
- text run at (0,75) width 200: ".five {padding-right: -20"
- text run at (200,75) width 376: "px; text-align: right; background-color: aqua;}"
+ text run at (0,75) width 576: ".five {padding-right: -20px; text-align: right; background-color: aqua;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
1.9 +2 -4 WebCore/layout-tests/css1/box_properties/padding_right_inline-expected.txt
Index: padding_right_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding_right_inline-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- padding_right_inline-expected.txt 20 Aug 2004 23:37:46 -0000 1.8
+++ padding_right_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.9
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 568x30
- text run at (0,0) width 184: ".one {padding-right: 25"
- text run at (184,0) width 376: "px; text-align: right; background-color: aqua;}"
- text run at (0,15) width 192: ".two {padding-right: -10"
- text run at (192,15) width 376: "px; text-align: right; background-color: aqua;}"
+ text run at (0,0) width 560: ".one {padding-right: 25px; text-align: right; background-color: aqua;}"
+ text run at (0,15) width 568: ".two {padding-right: -10px; text-align: right; background-color: aqua;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x36 [bgcolor=#808080]
RenderText {TEXT} at (0,0) size 543x18
1.7 +4 -8 WebCore/layout-tests/css1/box_properties/padding_top-expected.txt
Index: padding_top-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding_top-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- padding_top-expected.txt 11 Dec 2003 19:46:14 -0000 1.6
+++ padding_top-expected.txt 19 Jul 2005 21:18:04 -0000 1.7
@@ -9,15 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x90
RenderText {TEXT} at (0,0) size 408x90
text run at (0,0) width 392: ".zero {background-color: silver; padding-top: 0;}"
- text run at (0,15) width 176: ".one {padding-top: 0.5"
- text run at (176,15) width 224: "in; background-color: aqua;}"
- text run at (0,30) width 168: ".two {padding-top: 25"
- text run at (168,30) width 224: "px; background-color: aqua;}"
- text run at (0,45) width 176: ".three {padding-top: 5"
- text run at (176,45) width 224: "em; background-color: aqua;}"
+ text run at (0,15) width 400: ".one {padding-top: 0.5in; background-color: aqua;}"
+ text run at (0,30) width 392: ".two {padding-top: 25px; background-color: aqua;}"
+ text run at (0,45) width 400: ".three {padding-top: 5em; background-color: aqua;}"
text run at (0,60) width 392: ".four {padding-top: 25%; background-color: aqua;}"
- text run at (0,75) width 184: ".five {padding-top: -20"
- text run at (184,75) width 224: "px; background-color: aqua;}"
+ text run at (0,75) width 408: ".five {padding-top: -20px; background-color: aqua;}"
RenderBlock {HR} at (0,137) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,155) size 784x18 [bgcolor=#C0C0C0]
RenderText {TEXT} at (0,0) size 203x18
1.8 +4 -8 WebCore/layout-tests/css1/box_properties/padding_top_inline-expected.txt
Index: padding_top_inline-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/padding_top_inline-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- padding_top_inline-expected.txt 26 Apr 2004 21:18:59 -0000 1.7
+++ padding_top_inline-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -8,10 +8,8 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 400x30
- text run at (0,0) width 168: ".one {padding-top: 25"
- text run at (168,0) width 224: "px; background-color: aqua;}"
- text run at (0,15) width 176: ".two {padding-top: -10"
- text run at (176,15) width 224: "px; background-color: aqua;}"
+ text run at (0,0) width 392: ".one {padding-top: 25px; background-color: aqua;}"
+ text run at (0,15) width 400: ".two {padding-top: -10px; background-color: aqua;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,110) size 784x72 [bgcolor=#808080]
RenderText {TEXT} at (0,0) size 477x18
@@ -25,8 +23,7 @@
text run at (620,2) width 24: "one"
RenderText {TEXT} at (644,0) size 757x36
text run at (644,0) width 113: ", giving it an aqua"
- text run at (0,18) width 133: "background and a 25"
- text run at (133,18) width 95: "px top padding"
+ text run at (0,18) width 228: "background and a 25px top padding"
RenderText {TEXT} at (228,18) size 767x54
text run at (228,18) width 8: ". "
text run at (236,18) width 531: "Padding on inline elements does not affect line-height calculations, so all lines in this"
@@ -74,8 +71,7 @@
text run at (620,2) width 24: "one"
RenderText {TEXT} at (644,0) size 757x36
text run at (644,0) width 113: ", giving it an aqua"
- text run at (0,18) width 133: "background and a 25"
- text run at (133,18) width 95: "px top padding"
+ text run at (0,18) width 228: "background and a 25px top padding"
RenderText {TEXT} at (228,18) size 758x54
text run at (228,18) width 8: ". "
text run at (236,18) width 505: "Padding on inline elements does not affect line-height calculations, so all lines in"
1.8 +1 -2 WebCore/layout-tests/css1/box_properties/width-expected.txt
Index: width-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/box_properties/width-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- width-expected.txt 10 Feb 2004 22:03:48 -0000 1.7
+++ width-expected.txt 19 Jul 2005 21:18:04 -0000 1.8
@@ -8,8 +8,7 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x45
RenderText {TEXT} at (0,0) size 152x45
- text run at (0,0) width 120: ".one {width: 50"
- text run at (120,0) width 32: "px;}"
+ text run at (0,0) width 152: ".one {width: 50px;}"
text run at (0,15) width 144: ".two {width: 50%;}"
text run at (0,30) width 152: "TABLE {width: 50%;}"
RenderBlock {HR} at (0,92) size 784x2 [border: (1px inset #000000)]
1.7 +3 -6 WebCore/layout-tests/css1/classification/display-expected.txt
Index: display-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/classification/display-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- display-expected.txt 11 Dec 2003 19:46:14 -0000 1.6
+++ display-expected.txt 19 Jul 2005 21:18:10 -0000 1.7
@@ -10,8 +10,7 @@
RenderText {TEXT} at (0,0) size 568x75
text run at (0,0) width 176: ".one {display: block;}"
text run at (0,15) width 184: ".two {display: inline;}"
- text run at (0,30) width 536: ".three {display: list-item; list-style-type: square; margin-left: 3"
- text run at (536,30) width 32: "em;}"
+ text run at (0,30) width 568: ".three {display: list-item; list-style-type: square; margin-left: 3em;}"
text run at (0,45) width 272: ".four {display: none; color: red;}"
text run at (0,60) width 152: "I {display: block;}"
RenderBlock {HR} at (0,122) size 784x2 [border: (1px inset #000000)]
@@ -44,8 +43,7 @@
text run at (0,20) width 120: "list-style-type"
RenderText {TEXT} at (120,18) size 719x36
text run at (120,18) width 359: " is supported, there will be a square for the item marker). "
- text run at (479,18) width 24: "A 3"
- text run at (503,18) width 216: "em left margin has been applied in"
+ text run at (479,18) width 240: "A 3em left margin has been applied in"
text run at (0,36) width 360: "order to ensure that there is space for the list-item marker."
RenderBlock {P} at (0,314) size 784x18
RenderText {TEXT} at (0,0) size 456x18
@@ -106,8 +104,7 @@
text run at (55,20) width 120: "list-style-type"
RenderText {TEXT} at (175,18) size 708x36
text run at (175,18) width 359: " is supported, there will be a square for the item marker). "
- text run at (534,18) width 24: "A 3"
- text run at (558,18) width 150: "em left margin has been"
+ text run at (534,18) width 174: "A 3em left margin has been"
text run at (0,36) width 426: "applied in order to ensure that there is space for the list-item marker."
RenderBlock {P} at (4,178) size 762x18
RenderText {TEXT} at (0,0) size 456x18
1.7 +1 -3 WebCore/layout-tests/css1/color_and_background/background_position-expected.txt
Index: background_position-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/color_and_background/background_position-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- background_position-expected.txt 11 Dec 2003 19:46:16 -0000 1.6
+++ background_position-expected.txt 19 Jul 2005 21:18:11 -0000 1.7
@@ -22,9 +22,7 @@
text run at (0,165) width 488: " background-repeat: no-repeat; background-color: aqua;}"
text run at (0,180) width 632: ".six {background-image: url(../resources/bg.gif); background-position: 75% 25%;"
text run at (0,195) width 488: " background-repeat: no-repeat; background-color: aqua;}"
- text run at (0,210) width 600: ".seven {background-image: url(../resources/bg.gif); background-position: 20"
- text run at (600,210) width 40: "px 20"
- text run at (640,210) width 24: "px;"
+ text run at (0,210) width 664: ".seven {background-image: url(../resources/bg.gif); background-position: 20px 20px;"
text run at (0,225) width 488: " background-repeat: no-repeat; background-color: aqua;}"
RenderBlock {HR} at (0,302) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,320) size 784x18
1.9 +5 -10 WebCore/layout-tests/css1/conformance/forward_compatible_parsing-expected.txt
Index: forward_compatible_parsing-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/conformance/forward_compatible_parsing-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- forward_compatible_parsing-expected.txt 11 May 2004 21:45:39 -0000 1.8
+++ forward_compatible_parsing-expected.txt 19 Jul 2005 21:18:11 -0000 1.9
@@ -8,8 +8,7 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x810
RenderText {TEXT} at (0,0) size 568x795
- text run at (0,0) width 264: "P.one {color: green; rotation: 70"
- text run at (264,0) width 40: "deg;}"
+ text run at (0,0) width 304: "P.one {color: green; rotation: 70deg;}"
text run at (0,15) width 176: "P.oneb {color: green;}"
text run at (0,30) width 232: "P.oneb {color: invalidValue;}"
text run at (0,45) width 272: "P.two {background-color: inherit;}"
@@ -18,15 +17,12 @@
text run at (0,90) width 264: "P.five {background-color: \"red\";}"
text run at (0,105) width 408: "P.sixa {border-width: medium; border-style: solid;}"
text run at (0,120) width 400: "P.sixb {border-width: funny; border-style: solid;}"
- text run at (0,135) width 192: "P.sixc {border-width: 50"
- text run at (192,135) width 200: "zu; border-style: solid;}"
+ text run at (0,135) width 392: "P.sixc {border-width: 50zu; border-style: solid;}"
text run at (0,150) width 376: "P.sixd {border-width: px; border-style: solid;}"
text run at (0,165) width 96: "@three-dee {"
text run at (0,180) width 184: " @background-lighting {"
- text run at (0,195) width 104: " azimuth: 30"
- text run at (104,195) width 32: "deg;"
- text run at (0,210) width 128: " elevation: 190"
- text run at (128,210) width 32: "deg;"
+ text run at (0,195) width 136: " azimuth: 30deg;"
+ text run at (0,210) width 160: " elevation: 190deg;"
text run at (0,225) width 24: " }"
text run at (0,240) width 184: " P.seven { color: red }"
text run at (0,255) width 16: " }"
@@ -60,8 +56,7 @@
text run at (0,705) width 376: " type-display: @threedee {rotation-code: '}';};"
text run at (0,720) width 112: " color: green;"
text run at (0,735) width 16: " }"
- text run at (0,750) width 248: "P.twentythree {text-indent: 0.5"
- text run at (248,750) width 32: "in;}"
+ text run at (0,750) width 280: "P.twentythree {text-indent: 0.5in;}"
text run at (0,765) width 112: " color: maroon"
text run at (0,780) width 208: "P.twentyfour {color: red;}"
RenderBlock {HR} at (0,857) size 784x2 [border: (1px inset #000000)]
1.12 +35 -86 WebCore/layout-tests/css1/font_properties/font-expected.txt
Index: font-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/font_properties/font-expected.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- font-expected.txt 6 Jul 2005 00:21:48 -0000 1.11
+++ font-expected.txt 19 Jul 2005 21:18:11 -0000 1.12
@@ -8,49 +8,38 @@
text run at (0,0) width 264: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,26) size 784x168
RenderText {TEXT} at (0,0) size 399x168
- text run at (0,0) width 133: "BODY {font-size: 12"
- text run at (133,0) width 28: "px;}"
- text run at (0,14) width 224: ".one {font: italic small-caps 13"
- text run at (224,14) width 98: "pt Helvetica;}"
+ text run at (0,0) width 161: "BODY {font-size: 12px;}"
+ text run at (0,14) width 322: ".one {font: italic small-caps 13pt Helvetica;}"
text run at (0,28) width 203: ".two {font: 150%/150% serif;}"
text run at (0,42) width 252: ".three {font: 150%/150% sans-serif;}"
text run at (0,56) width 231: ".four {font: small/200% cursive;}"
text run at (0,70) width 399: ".five {font: italic small-caps 900 150%/150% sans-serif;}"
text run at (0,84) width 392: ".six {font: italic small-caps 100 150%/300% sans-serif;}"
- text run at (0,98) width 294: ".seven {font: italic small-caps 900 150%/2"
- text run at (294,98) width 98: "em monospace;}"
- text run at (0,112) width 294: ".eight {font: italic small-caps 500 150%/1"
- text run at (294,112) width 105: "in sans-serif;}"
- text run at (0,126) width 238: ".nine {font: oblique normal 700 18"
- text run at (238,126) width 140: "px/200% sans-serif;}"
+ text run at (0,98) width 392: ".seven {font: italic small-caps 900 150%/2em monospace;}"
+ text run at (0,112) width 399: ".eight {font: italic small-caps 500 150%/1in sans-serif;}"
+ text run at (0,126) width 378: ".nine {font: oblique normal 700 18px/200% sans-serif;}"
text run at (0,140) width 301: ".ten {font: normal 400 80%/2.5 sans-serif;}"
text run at (0,154) width 266: "SPAN.color {background-color: silver;}"
RenderBlock {HR} at (0,206) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,220) size 784x14
RenderText {TEXT} at (0,0) size 706x14
- text run at (0,0) width 285: "This element is unstyled, and should inherit a font-size of 12"
- text run at (285,0) width 138: "px from the BODY element. "
+ text run at (0,0) width 423: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. "
text run at (423,0) width 283: "This is the \"base font size\" referred to in the following tests."
RenderBlock {P} at (0,251) size 784x20
RenderText {TEXT} at (0,0) size 497x20
- text run at (0,0) width 192: "This element should be 13"
- text run at (192,0) width 305: "pt. Helvetica which is in small-cap italics."
+ text run at (0,0) width 497: "This element should be 13pt. Helvetica which is in small-cap italics."
RenderBlock {P} at (0,289) size 784x81
RenderText {TEXT} at (0,2) size 773x81
text run at (0,2) width 282: "This element should be in a serif font. "
text run at (282,2) width 480: "Its font-size should be 150% the base font size, and its line-height"
- text run at (0,29) width 220: "should 150% of that value (18"
- text run at (220,29) width 72: "px and 27"
- text run at (292,29) width 131: "px, respectively). "
+ text run at (0,29) width 423: "should 150% of that value (18px and 27px, respectively). "
text run at (423,29) width 350: "Extra text is included for the purposes of testing"
text run at (0,56) width 155: "this more effectively."
RenderBlock {P} at (0,388) size 784x81
RenderText {TEXT} at (0,3) size 783x81
text run at (0,3) width 348: "This element should be in a sans-serif font. "
text run at (348,3) width 435: "Its font-size should be 150% the base font size, and its"
- text run at (0,30) width 326: "line-height should 150% of that value (18"
- text run at (326,30) width 79: "px and 27"
- text run at (405,30) width 140: "px, respectively). "
+ text run at (0,30) width 545: "line-height should 150% of that value (18px and 27px, respectively). "
text run at (545,30) width 222: "Extra text is included for the"
text run at (0,57) width 321: "purposes of testing this more effectively."
RenderBlock {P} at (0,487) size 784x79
@@ -62,9 +51,7 @@
RenderText {TEXT} at (32,33) size 35x26
text run at (32,33) width 35: "small"
RenderText {TEXT} at (67,28) size 743x53
- text run at (67,28) width 104: " is calculated at 10"
- text run at (171,28) width 199: "px, then the line-height should be 20"
- text run at (370,28) width 20: "px. "
+ text run at (67,28) width 323: " is calculated at 10px, then the line-height should be 20px. "
text run at (390,28) width 280: "The actual value of the font-size is UA-dependent. "
text run at (670,28) width 73: "Extra text is"
text run at (0,55) width 304: "included for the purposes of testing this more effectively."
@@ -72,55 +59,42 @@
RenderText {TEXT} at (0,3) size 778x81
text run at (0,3) width 711: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900. "
text run at (711,3) width 67: "Its font-"
- text run at (0,30) width 722: "size should be 150% the base font size, and its line-height should be 150% of that value (18"
- text run at (722,30) width 48: "px and"
- text run at (0,57) width 20: "27"
- text run at (20,57) width 136: "px, respectively). "
+ text run at (0,30) width 770: "size should be 150% the base font size, and its line-height should be 150% of that value (18px and"
+ text run at (0,57) width 156: "27px, respectively). "
text run at (156,57) width 559: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,683) size 784x162
RenderText {TEXT} at (0,16) size 765x162
text run at (0,16) width 698: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. "
text run at (698,16) width 67: "Its font-"
- text run at (0,70) width 711: "size should be 150% the base font size, and its line-height should be 300% of that value (18"
- text run at (711,70) width 47: "px and"
- text run at (0,124) width 20: "54"
- text run at (20,124) width 135: "px, respectively). "
+ text run at (0,70) width 758: "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 155: "54px, respectively). "
text run at (155,124) width 556: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,863) size 784x144
RenderText {TEXT} at (0,7) size 750x144
text run at (0,7) width 750: "This element should be in a monospace font, italicized and small caps, with a weight of"
text run at (0,43) width 55: "900. "
text run at (55,43) width 687: "Its font-size should be 150% the base font size, and its line-height should be"
- text run at (0,79) width 11: "2"
- text run at (11,79) width 356: "em, or twice the element's font size (18"
- text run at (367,79) width 84: "px and 36"
- text run at (451,79) width 167: "px, respectively). "
+ text run at (0,79) width 618: "2em, or twice the element's font size (18px and 36px, respectively). "
text run at (618,79) width 113: "Extra text is"
text run at (0,115) width 499: "included for the purposes of testing this more effectively."
RenderBlock {P} at (0,1025) size 784x288
RenderText {TEXT} at (0,37) size 765x288
text run at (0,37) width 698: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. "
text run at (698,37) width 67: "Its font-"
- text run at (0,133) width 351: "size should be 150% the base font size, or 18"
- text run at (351,133) width 257: "px, and its line-height should be 1"
- text run at (608,133) width 23: "in. "
+ 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,1331) size 784x108
RenderText {TEXT} at (0,7) size 774x108
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 550: "Its font-size should be 18 pixels, and its line-height should be 36"
- text run at (590,43) width 115: "px (200% this"
+ 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 598: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,1457) size 784x50
RenderText {TEXT} at (0,6) size 781x50
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 153: "Its font-size should be 80% of 12"
- text run at (454,6) width 44: "px, or 9.6"
- text run at (498,6) width 242: "px, and its line-height shoud be 2.5 times that, or 24"
- text run at (740,6) width 17: "px. "
+ text run at (301,6) width 456: "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 (757,6) width 24: "Extra"
text run at (0,31) width 291: "text is included for the purposes of testing this more effectively."
RenderBlock {P} at (0,1525) size 784x216
@@ -128,10 +102,8 @@
RenderText {TEXT} at (0,16) size 774x216
text run at (0,16) width 698: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. "
text run at (698,16) width 67: "Its font-"
- text run at (0,70) width 711: "size should be 150% the base font size, and its line-height should be 300% of that value (18"
- text run at (711,70) width 47: "px and"
- text run at (0,124) width 20: "54"
- text run at (20,124) width 754: "px, respectively). The text should have a silver background. The background color has been set on"
+ text run at (0,70) width 758: "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 774: "54px, respectively). The text should have a silver background. The background color has been set on"
text run at (0,178) width 655: "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,1759) size 784x2394 [border: (1px outset #808080)]
@@ -148,21 +120,17 @@
RenderTableCell {TD} at (12,26) size 770x2366 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderBlock {P} at (4,4) size 762x36
RenderText {TEXT} at (0,0) size 732x36
- text run at (0,0) width 379: "This element is unstyled, and should inherit a font-size of 12"
- text run at (379,0) width 185: "px from the BODY element. "
+ text run at (0,0) width 564: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. "
text run at (564,0) width 168: "This is the \"base font size\""
text run at (0,18) width 204: "referred to in the following tests."
RenderBlock {P} at (4,57) size 762x20
RenderText {TEXT} at (0,0) size 497x20
- text run at (0,0) width 192: "This element should be 13"
- text run at (192,0) width 305: "pt. Helvetica which is in small-cap italics."
+ text run at (0,0) width 497: "This element should be 13pt. Helvetica which is in small-cap italics."
RenderBlock {P} at (4,101) size 762x144
RenderText {TEXT} at (0,4) size 735x144
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 569: "font size, and its line-height should 150% of that value (18"
- text run at (569,40) width 95: "px and 27"
- text run at (664,40) width 30: "px,"
+ 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 111: "effectively."
@@ -170,10 +138,8 @@
RenderText {TEXT} at (0,4) size 761x144
text run at (0,4) width 461: "This element should be in a sans-serif font. "
text run at (461,4) width 299: "Its font-size should be 150%"
- text run at (0,40) width 707: "the base font size, and its line-height should 150% of that value (18"
- text run at (707,40) width 25: "px"
- text run at (0,76) width 72: "and 27"
- text run at (72,76) width 186: "px, respectively). "
+ text run at (0,40) width 732: "the base font size, and its line-height should 150% of that value (18px"
+ text run at (0,76) width 258: "and 27px, respectively). "
text run at (258,76) width 503: "Extra text is included for the purposes of testing"
text run at (0,112) width 218: "this more effectively."
RenderBlock {P} at (4,437) size 762x79
@@ -185,9 +151,7 @@
RenderText {TEXT} at (55,33) size 35x26
text run at (55,33) width 35: "small"
RenderText {TEXT} at (90,28) size 753x53
- text run at (90,28) width 104: " is calculated at 10"
- text run at (194,28) width 199: "px, then the line-height should be 20"
- text run at (393,28) width 20: "px. "
+ text run at (90,28) width 323: " is calculated at 10px, then the line-height should be 20px. "
text run at (413,28) width 280: "The actual value of the font-size is UA-dependent. "
text run at (693,28) width 60: "Extra text"
text run at (0,55) width 317: "is included for the purposes of testing this more effectively."
@@ -196,9 +160,7 @@
text run at (0,4) width 714: "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 495: "Its font-size should be 150% the base font size,"
- text run at (0,76) width 544: "and its line-height should be 150% of that value (18"
- text run at (544,76) width 98: "px and 27"
- text run at (642,76) width 29: "px,"
+ text run at (0,76) width 671: "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 176: "more effectively."
@@ -207,47 +169,36 @@
text run at (0,22) width 752: "This element should be in a sans-serif font, italicized and small caps, with"
text run at (0,94) width 175: "a weight of 100. "
text run at (175,94) width 566: "Its font-size should be 150% the base font size, and its"
- text run at (0,166) width 462: "line-height should be 300% of that value (18"
- text run at (462,166) width 97: "px and 54"
- text run at (559,166) width 176: "px, respectively)."
+ text run at (0,166) width 735: "line-height should be 300% of that value (18px and 54px, respectively)."
text run at (0,238) width 741: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (4,1056) size 762x192
RenderText {TEXT} at (0,12) size 740x192
text run at (0,12) width 740: "This element should be in a monospace font, italicized and small caps, with a weight"
text run at (0,60) width 88: "of 900. "
text run at (88,60) width 620: "Its font-size should be 150% the base font size, and its line-height"
- text run at (0,108) width 100: "should be 2"
- text run at (100,108) width 368: "em, or twice the element's font size (18"
- text run at (468,108) width 88: "px and 36"
- text run at (556,108) width 160: "px, respectively)."
+ text run at (0,108) width 716: "should be 2em, or twice the element's font size (18px and 36px, respectively)."
text run at (0,156) width 636: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (4,1272) size 762x384
RenderText {TEXT} at (0,34) size 760x384
text run at (0,34) width 752: "This element should be in a sans-serif font, italicized and small caps, with"
text run at (0,130) width 175: "a weight of 500. "
- text run at (175,130) width 556: "Its font-size should be 150% the base font size, or 18"
- text run at (731,130) width 29: "px,"
- text run at (0,226) width 308: "and its line-height should be 1"
- text run at (308,226) width 31: "in. "
+ text run at (175,130) width 585: "Its font-size should be 150% the base font size, or 18px,"
+ text run at (0,226) width 339: "and its line-height should be 1in. "
text run at (339,226) width 405: "Extra text is included for the purposes"
text run at (0,322) width 329: "of testing this more effectively."
RenderBlock {P} at (4,1680) size 762x144
RenderText {TEXT} at (0,7) size 752x144
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 550: "Its font-size should be 18 pixels, and its line-height should be 36"
- text run at (590,43) width 115: "px (200% this"
+ 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 93: "effectively."
RenderBlock {P} at (4,1842) size 762x64
RenderText {TEXT} at (0,8) size 749x64
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 192: "Its font-size should be 80% of 12"
- text run at (570,8) width 55: "px, or 9.6"
- text run at (625,8) width 124: "px, and its line-height"
- text run at (0,40) width 174: "shoud be 2.5 times that, or 24"
- text run at (174,40) width 22: "px. "
+ text run at (378,8) width 371: "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 405: "Extra text is included for the purposes of testing this more effectively."
RenderBlock {P} at (4,1930) size 762x432
RenderInline {SPAN} at (0,0) size 762x388 [bgcolor=#C0C0C0]
@@ -255,9 +206,7 @@
text run at (0,22) width 752: "This element should be in a sans-serif font, italicized and small caps, with"
text run at (0,94) width 175: "a weight of 100. "
text run at (175,94) width 566: "Its font-size should be 150% the base font size, and its"
- text run at (0,166) width 462: "line-height should be 300% of that value (18"
- text run at (462,166) width 97: "px and 54"
- text run at (559,166) width 176: "px, respectively)."
+ text run at (0,166) width 735: "line-height should be 300% of that value (18px and 54px, respectively)."
text run at (0,238) width 762: "The text should have a silver background. The background color has been"
text run at (0,310) width 723: "set on an inline element and should therefore only cover the text, not"
text run at (0,382) width 216: "the interline spacing."
1.9 +9 -18 WebCore/layout-tests/css1/font_properties/font_size-expected.txt
Index: font_size-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/font_properties/font_size-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- font_size-expected.txt 15 Apr 2005 21:45:53 -0000 1.8
+++ font_size-expected.txt 19 Jul 2005 21:18:11 -0000 1.9
@@ -17,25 +17,16 @@
text run at (0,90) width 208: ".seven {font-size: large;}"
text run at (0,105) width 224: ".eight {font-size: x-large;}"
text run at (0,120) width 224: ".nine {font-size: xx-large;}"
- text run at (0,135) width 144: ".a {font-size: 0.5"
- text run at (144,135) width 32: "in;}"
- text run at (0,150) width 128: ".b {font-size: 1"
- text run at (128,150) width 32: "cm;}"
- text run at (0,165) width 136: ".c {font-size: 10"
- text run at (136,165) width 32: "mm;}"
- text run at (0,180) width 136: ".d {font-size: 18"
- text run at (136,180) width 32: "pt;}"
- text run at (0,195) width 144: ".e {font-size: 1.5"
- text run at (144,195) width 32: "pc;}"
- text run at (0,210) width 128: ".f {font-size: 2"
- text run at (128,210) width 32: "em;}"
- text run at (0,225) width 128: ".g {font-size: 3"
- text run at (128,225) width 32: "ex;}"
- text run at (0,240) width 136: ".h {font-size: 25"
- text run at (136,240) width 32: "px;}"
+ text run at (0,135) width 176: ".a {font-size: 0.5in;}"
+ text run at (0,150) width 160: ".b {font-size: 1cm;}"
+ text run at (0,165) width 168: ".c {font-size: 10mm;}"
+ text run at (0,180) width 168: ".d {font-size: 18pt;}"
+ text run at (0,195) width 176: ".e {font-size: 1.5pc;}"
+ text run at (0,210) width 160: ".f {font-size: 2em;}"
+ text run at (0,225) width 160: ".g {font-size: 3ex;}"
+ text run at (0,240) width 168: ".h {font-size: 25px;}"
text run at (0,255) width 168: ".i {font-size: 200%;}"
- text run at (0,270) width 152: ".j {font-size: -0.5"
- text run at (152,270) width 32: "in;}"
+ text run at (0,270) width 184: ".j {font-size: -0.5in;}"
RenderBlock {HR} at (0,347) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,365) size 784x18
RenderText {TEXT} at (0,0) size 688x18
1.8 +1 -2 WebCore/layout-tests/css1/formatting_model/canvas-expected.txt
Index: canvas-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/formatting_model/canvas-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- canvas-expected.txt 26 Apr 2004 21:19:00 -0000 1.7
+++ canvas-expected.txt 19 Jul 2005 21:18:11 -0000 1.8
@@ -9,8 +9,7 @@
RenderBlock {PRE} at (0,34) size 750x30
RenderText {TEXT} at (0,0) size 552x30
text run at (0,0) width 240: "HTML {background-color: aqua;}"
- text run at (0,15) width 520: "BODY {background-color: green; background-image: none; margin: 25"
- text run at (520,15) width 32: "px;}"
+ text run at (0,15) width 552: "BODY {background-color: green; background-image: none; margin: 25px;}"
RenderBlock {HR} at (0,77) size 750x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,95) size 750x54
RenderText {TEXT} at (0,0) size 739x54
1.11 +5 -12 WebCore/layout-tests/css1/formatting_model/floating_elements-expected.txt
Index: floating_elements-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/formatting_model/floating_elements-expected.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- floating_elements-expected.txt 19 Oct 2004 23:28:49 -0000 1.10
+++ floating_elements-expected.txt 19 Jul 2005 21:18:12 -0000 1.11
@@ -9,18 +9,11 @@
RenderBlock {PRE} at (0,34) size 784x135
RenderText {TEXT} at (0,0) size 480x120
text run at (0,0) width 272: "HR.minor {clear: both; width: 5%;}"
- text run at (0,15) width 368: "HR.major {clear: both; width: 75%; margin: 1.5"
- text run at (368,15) width 32: "em;}"
- text run at (0,30) width 112: "DIV {border: 5"
- text run at (112,30) width 336: "px solid purple; padding: 0; margin: 0.125"
- text run at (448,30) width 32: "em;}"
- text run at (0,45) width 208: "P.left, P.right {width: 10"
- text run at (208,45) width 112: "em; padding: 1"
- text run at (320,45) width 112: "em; margin: 0;"
- text run at (0,60) width 96: " border: 1"
- text run at (96,60) width 328: "px solid lime; background-color: silver;}"
- text run at (0,75) width 328: "IMG.left, IMG.right {margin: 0; border: 3"
- text run at (328,75) width 128: "px solid black;}"
+ text run at (0,15) width 400: "HR.major {clear: both; width: 75%; margin: 1.5em;}"
+ text run at (0,30) width 480: "DIV {border: 5px solid purple; padding: 0; margin: 0.125em;}"
+ text run at (0,45) width 432: "P.left, P.right {width: 10em; padding: 1em; margin: 0;"
+ text run at (0,60) width 424: " border: 1px solid lime; background-color: silver;}"
+ text run at (0,75) width 456: "IMG.left, IMG.right {margin: 0; border: 3px solid black;}"
text run at (0,90) width 160: ".left {float: left;}"
text run at (0,105) width 176: ".right {float: right;}"
RenderBlock {HR} at (0,182) size 784x2 [border: (1px inset #000000)]
1.9 +25 -68 WebCore/layout-tests/css1/formatting_model/height_of_lines-expected.txt
Index: height_of_lines-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/formatting_model/height_of_lines-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- height_of_lines-expected.txt 5 Nov 2004 03:09:17 -0000 1.8
+++ height_of_lines-expected.txt 19 Jul 2005 21:18:12 -0000 1.9
@@ -8,50 +8,25 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x270
RenderText {TEXT} at (0,0) size 536x255
- text run at (0,0) width 160: "P.one {font-size: 14"
- text run at (160,0) width 152: "px; line-height: 20"
- text run at (312,0) width 32: "px;}"
+ text run at (0,0) width 344: "P.one {font-size: 14px; line-height: 20px;}"
text run at (0,15) width 304: "IMG.onea {vertical-align: text-bottom;"
- text run at (0,30) width 120: " width: 200"
- text run at (120,30) width 120: "px; height: 200"
- text run at (240,30) width 32: "px;}"
- text run at (0,45) width 368: "IMG.oneb {vertical-align: text-top; width: 200"
- text run at (368,45) width 120: "px; height: 200"
- text run at (488,45) width 32: "px;}"
- text run at (0,75) width 160: "P.two {font-size: 14"
- text run at (160,75) width 152: "px; line-height: 20"
- text run at (312,75) width 32: "px;}"
- text run at (0,90) width 392: "IMG.twoa {vertical-align: text-bottom; width: 100"
- text run at (392,90) width 120: "px; height: 100"
- text run at (512,90) width 24: "px;"
- text run at (0,105) width 120: " padding: 5"
- text run at (120,105) width 192: "px; border-style: solid;"
- text run at (0,120) width 168: " border-width: 10"
- text run at (168,120) width 112: "px; margin: 15"
- text run at (280,120) width 32: "px;}"
+ text run at (0,30) width 272: " width: 200px; height: 200px;}"
+ text run at (0,45) width 520: "IMG.oneb {vertical-align: text-top; width: 200px; height: 200px;}"
+ text run at (0,75) width 344: "P.two {font-size: 14px; line-height: 20px;}"
+ text run at (0,90) width 536: "IMG.twoa {vertical-align: text-bottom; width: 100px; height: 100px;"
+ text run at (0,105) width 312: " padding: 5px; border-style: solid;"
+ text run at (0,120) width 312: " border-width: 10px; margin: 15px;}"
text run at (0,135) width 280: "IMG.twob {vertical-align: text-top;"
- text run at (0,150) width 160: " width: 100"
- text run at (160,150) width 120: "px; height: 100"
- text run at (280,150) width 24: "px;"
- text run at (0,165) width 120: " padding: 5"
- text run at (120,165) width 192: "px; border-style: solid;"
- text run at (0,180) width 168: " border-width: 10"
- text run at (168,180) width 112: "px; margin: 15"
- text run at (280,180) width 32: "px;}"
- text run at (0,210) width 344: "IMG.twoc {vertical-align: middle; width: 50"
- text run at (344,210) width 112: "px; height: 50"
- text run at (456,210) width 24: "px;"
- text run at (0,225) width 120: " padding: 5"
- text run at (120,225) width 192: "px; border-style: solid;"
- text run at (0,240) width 168: " border-width: 10"
- text run at (168,240) width 120: "px; margin: -10"
- text run at (288,240) width 32: "px;}"
+ text run at (0,150) width 304: " width: 100px; height: 100px;"
+ text run at (0,165) width 312: " padding: 5px; border-style: solid;"
+ text run at (0,180) width 312: " border-width: 10px; margin: 15px;}"
+ text run at (0,210) width 480: "IMG.twoc {vertical-align: middle; width: 50px; height: 50px;"
+ text run at (0,225) width 312: " padding: 5px; border-style: solid;"
+ text run at (0,240) width 320: " border-width: 10px; margin: -10px;}"
RenderBlock {HR} at (0,317) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,333) size 784x443
RenderText {TEXT} at (0,1) size 779x242
- text run at (0,1) width 252: "This paragraph should have a font size of 14"
- text run at (252,1) width 146: "px and a line height of 20"
- text run at (398,1) width 22: "px. "
+ text run at (0,1) width 420: "This paragraph should have a font size of 14px and a line height of 20px. "
text run at (420,1) width 347: "This means that the lines of text within it should be separated"
text run at (0,21) width 374: "by six pixels, three of which are part of the line-box of each line. "
text run at (374,21) width 405: "Any images within the paragraph should increase the height of the line-"
@@ -66,16 +41,11 @@
text run at (0,424) width 780: "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 aligned."
RenderBlock {P} at (0,790) size 784x483
RenderText {TEXT} at (0,1) size 770x202
- text run at (0,1) width 252: "This paragraph should have a font size of 14"
- text run at (252,1) width 146: "px and a line height of 20"
- text run at (398,1) width 22: "px. "
+ text run at (0,1) width 420: "This paragraph should have a font size of 14px and a line height of 20px. "
text run at (420,1) width 347: "This means that the lines of text within it should be separated"
text run at (0,21) width 79: "by six pixels. "
- text run at (79,21) width 668: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding (5"
- text run at (747,21) width 23: "px),"
- text run at (0,183) width 60: "border (10"
- text run at (60,183) width 115: "px) and margins (15"
- text run at (175,183) width 182: "px) within the line box, such as "
+ text run at (79,21) width 691: "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,183) 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,183) size 28x20
text run at (517,183) width 28: " and "
@@ -85,15 +55,12 @@
text run at (713,183) width 38: "This is"
text run at (0,344) width 780: "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 aligned."
text run at (0,364) width 748: "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 bottom"
- text run at (0,384) width 206: "border of the image should begin 15"
- text run at (206,384) width 506: "px above the bottom of the text, and for the second image the top border should begin 15"
- text run at (712,384) width 52: "px below"
+ text run at (0,384) width 764: "border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin 15px below"
text run at (0,423) width 105: "the top of the text "
RenderImage {IMG} at (95,393) size 80x80 [border: (10px solid #000000)]
RenderText {TEXT} at (165,423) size 749x61
text run at (165,423) width 8: ". "
- text run at (173,423) width 227: "The last image in this paragraph has -10"
- text run at (400,423) width 349: "px margins set on it, so that should pull the text in toward the"
+ text run at (173,423) width 576: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward the"
text run at (0,464) width 379: "image in the vertical direction, and also in the horizontal direction."
RenderTable {TABLE} at (0,1287) size 784x996 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 0x994
@@ -109,9 +76,7 @@
RenderTableCell {TD} at (12,26) size 770x968 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderBlock {P} at (4,4) size 762x463
RenderText {TEXT} at (0,1) size 729x242
- text run at (0,1) width 252: "This paragraph should have a font size of 14"
- text run at (252,1) width 146: "px and a line height of 20"
- text run at (398,1) width 22: "px. "
+ text run at (0,1) width 420: "This paragraph should have a font size of 14px and a line height of 20px. "
text run at (420,1) width 291: "This means that the lines of text within it should be"
text run at (0,21) width 430: "separated by six pixels, three of which are part of the line-box of each line. "
text run at (430,21) width 299: "Any images within the paragraph should increase the"
@@ -126,16 +91,11 @@
text run at (0,444) width 285: "line does not hit the image that is text-top aligned."
RenderBlock {P} at (4,481) size 762x483
RenderText {TEXT} at (0,1) size 738x202
- text run at (0,1) width 252: "This paragraph should have a font size of 14"
- text run at (252,1) width 146: "px and a line height of 20"
- text run at (398,1) width 22: "px. "
+ text run at (0,1) width 420: "This paragraph should have a font size of 14px and a line height of 20px. "
text run at (420,1) width 291: "This means that the lines of text within it should be"
text run at (0,21) width 135: "separated by six pixels. "
text run at (135,21) 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,183) width 61: "padding (5"
- text run at (61,183) width 87: "px), border (10"
- text run at (148,183) width 115: "px) and margins (15"
- text run at (263,183) width 182: "px) within the line box, such as "
+ text run at (0,183) width 445: "padding (5px), border (10px) and margins (15px) within the line box, such as "
RenderImage {IMG} at (460,55) size 130x130 [border: (10px solid #000000)]
RenderText {TEXT} at (605,183) size 28x20
text run at (605,183) width 28: " and "
@@ -145,13 +105,10 @@
text run at (168,203) width 587: "This is additional text to make sure that there is enough room left below the image so that this line does"
text run at (0,364) width 235: "not hit the image that is text-top aligned. "
text run at (235,364) width 496: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this"
- text run at (0,384) width 458: "paragraph, so for the first image the bottom border of the image should begin 15"
- text run at (458,384) width 290: "px above the bottom of the text, and for the second"
- text run at (0,423) width 212: "image the top border should begin 15"
- text run at (212,423) width 161: "px below the top of the text "
+ text run at (0,384) width 748: "paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the second"
+ text run at (0,423) width 373: "image the top border should begin 15px below the top of the text "
RenderImage {IMG} at (363,393) size 80x80 [border: (10px solid #000000)]
RenderText {TEXT} at (433,423) size 750x61
text run at (433,423) width 8: ". "
- text run at (441,423) width 227: "The last image in this paragraph has -10"
- text run at (668,423) width 82: "px margins set"
+ text run at (441,423) width 309: "The last image in this paragraph has -10px margins set"
text run at (0,464) width 646: "on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction."
1.9 +13 -34 WebCore/layout-tests/css1/formatting_model/inline_elements-expected.txt
Index: inline_elements-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/formatting_model/inline_elements-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- inline_elements-expected.txt 6 Jul 2005 00:21:48 -0000 1.8
+++ inline_elements-expected.txt 19 Jul 2005 21:18:12 -0000 1.9
@@ -9,29 +9,19 @@
RenderBlock {PRE} at (0,34) size 784x105
RenderText {TEXT} at (0,0) size 560x90
text run at (0,0) width 208: "P.one {line-height: 200%;}"
- text run at (0,15) width 376: "SPAN.two {border-style: solid; border-width: 10"
- text run at (376,15) width 176: "px; border-color: red;"
- text run at (0,30) width 160: " padding: 2"
- text run at (160,30) width 112: "pt; margin: 30"
- text run at (272,30) width 32: "pt;}"
- text run at (0,45) width 176: "P.three {font-size: 10"
- text run at (176,45) width 152: "pt; line-height: 12"
- text run at (328,45) width 32: "pt;}"
- text run at (0,60) width 384: "SPAN.four {border-style: solid; border-width: 12"
- text run at (384,60) width 176: "px; border-color: red;"
- text run at (0,75) width 160: " padding: 2"
- text run at (160,75) width 32: "pt;}"
+ text run at (0,15) width 552: "SPAN.two {border-style: solid; border-width: 10px; border-color: red;"
+ text run at (0,30) width 304: " padding: 2pt; margin: 30pt;}"
+ text run at (0,45) width 360: "P.three {font-size: 10pt; line-height: 12pt;}"
+ text run at (0,60) width 560: "SPAN.four {border-style: solid; border-width: 12px; border-color: red;"
+ text run at (0,75) width 192: " padding: 2pt;}"
RenderBlock {HR} at (0,152) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,170) size 784x192
RenderText {TEXT} at (0,7) size 187x32
text run at (0,7) width 187: "This is a paragraph that has a "
RenderInline {SPAN} at (0,0) size 773x170 [border: (10px solid #FF0000)]
RenderText {TEXT} at (239,7) size 773x160
- text run at (239,7) width 264: "very long span in it, and the span has a 10"
- text run at (503,7) width 258: "px red border separated from the span by"
- text run at (0,39) width 8: "2"
- text run at (8,39) width 139: "pt, and a margin of 30"
- text run at (147,39) width 20: "pt. "
+ text run at (239,7) width 522: "very long span in it, and the span has a 10px red border separated from the span by"
+ text run at (0,39) width 167: "2pt, and a margin of 30pt. "
text run at (167,39) width 606: "The padding and border should be present on all sides of the span (although vertical lines should"
text run at (0,71) width 493: "appear only at the beginning and the end of the whole span, not on each line). "
text run at (493,71) width 273: "The padding, border, and margin should all"
@@ -47,18 +37,14 @@
text run at (0,0) width 159: "This is a paragraph that has a "
RenderInline {SPAN} at (0,0) size 782x91 [border: (12px solid #FF0000)]
RenderText {TEXT} at (173,0) size 782x64
- text run at (173,0) width 226: "very long span in it, and the span has a 12"
- text run at (399,0) width 229: "px red border separated from the span by 2"
- text run at (628,0) width 154: "pt of padding (the difference"
+ text run at (173,0) width 609: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the difference"
text run at (0,16) width 768: "between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the padding and border"
text run at (0,32) width 179: "should not effect the line height. "
text run at (179,32) width 569: "The span's border should have vertical lines only at the beginning and end of the whole span, not on each"
text run at (0,48) width 24: "line."
RenderText {TEXT} at (38,48) size 415x16
text run at (38,48) width 3: " "
- text run at (41,48) width 290: "The line spacing in the whole paragraph should be 12"
- text run at (331,48) width 108: "pt, with font-size 10"
- text run at (439,48) width 14: "pt."
+ text run at (41,48) width 412: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt."
RenderTable {TABLE} at (0,455) size 784x321 [border: (1px outset #808080)]
RenderTableSection {TBODY} at (1,1) size 0x319
RenderTableRow {TR} at (0,0) size 0x0
@@ -76,11 +62,8 @@
text run at (0,7) width 187: "This is a paragraph that has a "
RenderInline {SPAN} at (0,0) size 761x170 [border: (10px solid #FF0000)]
RenderText {TEXT} at (239,7) size 761x160
- text run at (239,7) width 264: "very long span in it, and the span has a 10"
- text run at (503,7) width 258: "px red border separated from the span by"
- text run at (0,39) width 8: "2"
- text run at (8,39) width 139: "pt, and a margin of 30"
- text run at (147,39) width 20: "pt. "
+ text run at (239,7) width 522: "very long span in it, and the span has a 10px red border separated from the span by"
+ text run at (0,39) width 167: "2pt, and a margin of 30pt. "
text run at (167,39) width 560: "The padding and border should be present on all sides of the span (although vertical lines"
text run at (0,71) width 539: "should appear only at the beginning and the end of the whole span, not on each line). "
text run at (539,71) width 208: "The padding, border, and margin"
@@ -96,15 +79,11 @@
text run at (0,0) width 159: "This is a paragraph that has a "
RenderInline {SPAN} at (0,0) size 760x91 [border: (12px solid #FF0000)]
RenderText {TEXT} at (173,0) size 760x64
- text run at (173,0) width 226: "very long span in it, and the span has a 12"
- text run at (399,0) width 229: "px red border separated from the span by 2"
- text run at (628,0) width 97: "pt of padding (the"
+ text run at (173,0) width 552: "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 472: "The span's border should have vertical lines only at the beginning and end of the whole"
text run at (0,48) width 121: "span, not on each line."
RenderText {TEXT} at (135,48) size 415x16
text run at (135,48) width 3: " "
- text run at (138,48) width 290: "The line spacing in the whole paragraph should be 12"
- text run at (428,48) width 108: "pt, with font-size 10"
- text run at (536,48) width 14: "pt."
+ text run at (138,48) width 412: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt."
1.7 +6 -12 WebCore/layout-tests/css1/formatting_model/replaced_elements-expected.txt
Index: replaced_elements-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/formatting_model/replaced_elements-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- replaced_elements-expected.txt 11 Dec 2003 19:46:16 -0000 1.6
+++ replaced_elements-expected.txt 19 Jul 2005 21:18:12 -0000 1.7
@@ -20,18 +20,15 @@
RenderBlock {P} at (0,185) size 784x19
RenderImage {IMG} at (0,0) size 15x15
RenderText {TEXT} at (15,1) size 434x18
- text run at (15,1) width 369: "The image at the beginning of this sentence should be a 15"
- text run at (384,1) width 65: "px square."
+ text run at (15,1) width 434: "The image at the beginning of this sentence should be a 15px square."
RenderImage {IMG} at (0,220) size 15x15
RenderBlock {P} at (0,251) size 784x18
RenderText {TEXT} at (0,0) size 489x18
- text run at (0,0) width 205: "The above image should be a 15"
- text run at (205,0) width 284: "px square with the same left edge as this text."
+ 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 (384,285) size 15x15
RenderBlock {P} at (0,316) size 784x18
RenderText {TEXT} at (0,0) size 400x18
- text run at (0,0) width 205: "The above image should be a 15"
- text run at (205,0) width 195: "px square aligned at the center."
+ text run at (0,0) width 400: "The above image should be a 15px square aligned at the center."
RenderImage {IMG} at (196,350) size 392x392
RenderBlock {P} at (0,758) size 784x36
RenderText {TEXT} at (0,0) size 766x36
@@ -59,18 +56,15 @@
RenderBlock {P} at (4,4) size 762x19
RenderImage {IMG} at (0,0) size 15x15
RenderText {TEXT} at (15,1) size 434x18
- text run at (15,1) width 369: "The image at the beginning of this sentence should be a 15"
- text run at (384,1) width 65: "px square."
+ text run at (15,1) width 434: "The image at the beginning of this sentence should be a 15px square."
RenderImage {IMG} at (4,39) size 15x15
RenderBlock {P} at (4,70) size 762x18
RenderText {TEXT} at (0,0) size 489x18
- text run at (0,0) width 205: "The above image should be a 15"
- text run at (205,0) width 284: "px square with the same left edge as this text."
+ 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,104) size 15x15
RenderBlock {P} at (4,135) size 762x18
RenderText {TEXT} at (0,0) size 400x18
- text run at (0,0) width 205: "The above image should be a 15"
- text run at (205,0) width 195: "px square aligned at the center."
+ text run at (0,0) width 400: "The above image should be a 15px square aligned at the center."
RenderImage {IMG} at (194,169) size 381x381
RenderBlock {P} at (4,566) size 762x36
RenderText {TEXT} at (0,0) size 722x36
1.7 +16 -36 WebCore/layout-tests/css1/formatting_model/vertical_formatting-expected.txt
Index: vertical_formatting-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/formatting_model/vertical_formatting-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vertical_formatting-expected.txt 11 Dec 2003 19:46:16 -0000 1.6
+++ vertical_formatting-expected.txt 19 Jul 2005 21:18:12 -0000 1.7
@@ -8,42 +8,24 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x300
RenderText {TEXT} at (0,0) size 496x285
- text run at (0,0) width 184: "P.one {margin-bottom: 2"
- text run at (184,0) width 184: "cm; padding-bottom: 0;}"
- text run at (0,15) width 160: "P.two {margin-top: 2"
- text run at (160,15) width 160: "cm; padding-top: 0;}"
+ text run at (0,0) width 368: "P.one {margin-bottom: 2cm; padding-bottom: 0;}"
+ text run at (0,15) width 320: "P.two {margin-top: 2cm; padding-top: 0;}"
text run at (0,30) width 320: "P.three {margin-top: 0; padding-top: 0;}"
- text run at (0,45) width 176: "P.four {margin-top: -1"
- text run at (176,45) width 168: "cm; margin-bottom: 0;"
+ text run at (0,45) width 344: "P.four {margin-top: -1cm; margin-bottom: 0;"
text run at (0,60) width 344: " padding-top: 0; padding-bottom: 0;}"
- text run at (0,75) width 184: "DIV.five {margin-top: 1"
- text run at (184,75) width 160: "cm; margin-bottom: 1"
- text run at (344,75) width 24: "cm;"
- text run at (0,90) width 192: " padding-top: 1"
- text run at (192,90) width 184: "cm; padding-bottom: 0;}"
- text run at (0,105) width 160: "P.six {margin-top: 1"
- text run at (160,105) width 160: "cm; margin-bottom: 1"
- text run at (320,105) width 24: "cm;"
+ text run at (0,75) width 368: "DIV.five {margin-top: 1cm; margin-bottom: 1cm;"
+ text run at (0,90) width 376: " padding-top: 1cm; padding-bottom: 0;}"
+ text run at (0,105) width 344: "P.six {margin-top: 1cm; margin-bottom: 1cm;"
text run at (0,120) width 336: " padding-top: 0; padding-bottom: 0;}"
- text run at (0,135) width 176: "P.seven {margin-top: 1"
- text run at (176,135) width 160: "cm; padding-top: 0;}"
- text run at (0,150) width 208: "P.eight {margin-bottom: -1"
- text run at (208,150) width 168: "cm; padding-bottom: 2"
- text run at (376,150) width 32: "cm;}"
- text run at (0,165) width 176: "P.nine {margin-top: -1"
- text run at (176,165) width 144: "cm; padding-top: 1"
- text run at (320,165) width 24: "cm;"
- text run at (0,180) width 344: " padding-bottom: 0; margin-bottom: 1"
- text run at (344,180) width 32: "cm;}"
- text run at (0,195) width 160: "P.ten {margin-top: 1"
- text run at (160,195) width 144: "cm;padding-top: 0;"
+ text run at (0,135) width 336: "P.seven {margin-top: 1cm; padding-top: 0;}"
+ text run at (0,150) width 408: "P.eight {margin-bottom: -1cm; padding-bottom: 2cm;}"
+ text run at (0,165) width 344: "P.nine {margin-top: -1cm; padding-top: 1cm;"
+ text run at (0,180) width 376: " padding-bottom: 0; margin-bottom: 1cm;}"
+ text run at (0,195) width 304: "P.ten {margin-top: 1cm;padding-top: 0;"
text run at (0,210) width 248: " float: left;width: 50%;}"
- text run at (0,225) width 184: "P.eleven {margin-top: 1"
- text run at (184,225) width 264: "cm; padding-top: 0; clear: none;}"
- text run at (0,240) width 360: "P.twelve {margin-bottom: 0; padding-bottom: 1"
- text run at (360,240) width 136: "cm; clear: both;}"
- text run at (0,255) width 328: "P.thirteen {margin-top: 0; padding-top: 1"
- text run at (328,255) width 32: "cm;}"
+ text run at (0,225) width 448: "P.eleven {margin-top: 1cm; padding-top: 0; clear: none;}"
+ text run at (0,240) width 496: "P.twelve {margin-bottom: 0; padding-bottom: 1cm; clear: both;}"
+ text run at (0,255) width 360: "P.thirteen {margin-top: 0; padding-top: 1cm;}"
text run at (0,270) width 160: "TABLE {clear: both;}"
RenderBlock {HR} at (0,347) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,365) size 784x36
@@ -97,8 +79,7 @@
RenderText {TEXT} at (0,0) size 750x36
text run at (0,0) width 555: "There should be two centimeters of padding between this paragraph and the one below. "
text run at (555,0) width 195: "Padding does not collapse, and"
- text run at (0,18) width 57: "there is 1"
- text run at (57,18) width 177: "cm of padding on each side."
+ text run at (0,18) width 234: "there is 1cm of padding on each side."
RenderBlock {P} at (0,1329) size 784x55
RenderText {TEXT} at (0,37) size 167x18
text run at (0,37) width 167: "This is the next paragraph."
@@ -165,8 +146,7 @@
RenderText {TEXT} at (0,0) size 750x36
text run at (0,0) width 555: "There should be two centimeters of padding between this paragraph and the one below. "
text run at (555,0) width 195: "Padding does not collapse, and"
- text run at (0,18) width 57: "there is 1"
- text run at (57,18) width 177: "cm of padding on each side."
+ text run at (0,18) width 234: "there is 1cm of padding on each side."
RenderBlock {P} at (4,968) size 762x55
RenderText {TEXT} at (0,37) size 167x18
text run at (0,37) width 167: "This is the next paragraph."
1.8 +2 -4 WebCore/layout-tests/css1/pseudo/anchor-expected.txt
Index: anchor-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/pseudo/anchor-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- anchor-expected.txt 6 Jul 2005 00:21:48 -0000 1.7
+++ anchor-expected.txt 19 Jul 2005 21:18:12 -0000 1.8
@@ -28,8 +28,7 @@
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 110x18 [color=#800080]
RenderText {TEXT} at (0,0) size 110x18
- text run at (0,0) width 23: "W3"
- text run at (23,0) width 87: "C Web server"
+ text run at (0,0) width 110: "W3C Web server"
RenderText {TEXT} at (0,0) size 0x0
RenderListItem {LI} at (40,18) size 704x18
RenderListMarker at (0,0) size 0x14
@@ -105,8 +104,7 @@
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 110x18 [color=#800080]
RenderText {TEXT} at (0,0) size 110x18
- text run at (0,0) width 23: "W3"
- text run at (23,0) width 87: "C Web server"
+ text run at (0,0) width 110: "W3C Web server"
RenderText {TEXT} at (0,0) size 0x0
RenderListItem {LI} at (40,18) size 682x18
RenderListMarker at (0,0) size 0x14
1.8 +9 -18 WebCore/layout-tests/css1/text_properties/letter_spacing-expected.txt
Index: letter_spacing-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/text_properties/letter_spacing-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- letter_spacing-expected.txt 15 Apr 2005 21:45:53 -0000 1.7
+++ letter_spacing-expected.txt 19 Jul 2005 21:18:13 -0000 1.8
@@ -8,26 +8,17 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x165
RenderText {TEXT} at (0,0) size 264x165
- text run at (0,0) width 200: ".one {letter-spacing: 0.3"
- text run at (200,0) width 32: "in;}"
- text run at (0,15) width 200: ".two {letter-spacing: 0.5"
- text run at (200,15) width 32: "cm;}"
- text run at (0,30) width 200: ".three {letter-spacing: 5"
- text run at (200,30) width 32: "mm;}"
- text run at (0,45) width 192: ".four {letter-spacing: 3"
- text run at (192,45) width 32: "pt;}"
- text run at (0,60) width 216: ".five {letter-spacing: 0.25"
- text run at (216,60) width 32: "pc;}"
- text run at (0,75) width 184: ".six {letter-spacing: 1"
- text run at (184,75) width 32: "em;}"
- text run at (0,90) width 200: ".seven {letter-spacing: 1"
- text run at (200,90) width 32: "ex;}"
- text run at (0,105) width 200: ".eight {letter-spacing: 5"
- text run at (200,105) width 32: "px;}"
+ text run at (0,0) width 232: ".one {letter-spacing: 0.3in;}"
+ text run at (0,15) width 232: ".two {letter-spacing: 0.5cm;}"
+ text run at (0,30) width 232: ".three {letter-spacing: 5mm;}"
+ text run at (0,45) width 224: ".four {letter-spacing: 3pt;}"
+ text run at (0,60) width 248: ".five {letter-spacing: 0.25pc;}"
+ text run at (0,75) width 216: ".six {letter-spacing: 1em;}"
+ text run at (0,90) width 232: ".seven {letter-spacing: 1ex;}"
+ text run at (0,105) width 232: ".eight {letter-spacing: 5px;}"
text run at (0,120) width 248: ".nine {letter-spacing: normal;}"
text run at (0,135) width 224: ".ten {letter-spacing: 300%;}"
- text run at (0,150) width 232: ".eleven {letter-spacing: -0.1"
- text run at (232,150) width 32: "em;}"
+ text run at (0,150) width 264: ".eleven {letter-spacing: -0.1em;}"
RenderBlock {HR} at (0,212) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,230) size 784x72
RenderText {TEXT} at (0,0) size 694x72
1.10 +16 -43 WebCore/layout-tests/css1/text_properties/line_height-expected.txt
Index: line_height-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/text_properties/line_height-expected.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- line_height-expected.txt 15 Apr 2005 21:45:53 -0000 1.9
+++ line_height-expected.txt 19 Jul 2005 21:18:13 -0000 1.10
@@ -8,39 +8,18 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x210
RenderText {TEXT} at (0,0) size 400x210
- text run at (0,0) width 176: ".one {line-height: 0.5"
- text run at (176,0) width 136: "in; font-size: 12"
- text run at (312,0) width 32: "px;}"
- text run at (0,15) width 160: ".two {line-height: 2"
- text run at (160,15) width 136: "cm; font-size: 12"
- text run at (296,15) width 32: "px;}"
- text run at (0,30) width 184: ".three {line-height: 20"
- text run at (184,30) width 136: "mm; font-size: 12"
- text run at (320,30) width 32: "px;}"
- text run at (0,45) width 176: ".four {line-height: 24"
- text run at (176,45) width 136: "pt; font-size: 12"
- text run at (312,45) width 32: "px;}"
- text run at (0,60) width 168: ".five {line-height: 2"
- text run at (168,60) width 136: "pc; font-size: 12"
- text run at (304,60) width 32: "px;}"
- text run at (0,75) width 160: ".six {line-height: 2"
- text run at (160,75) width 136: "em; font-size: 12"
- text run at (296,75) width 32: "px;}"
- text run at (0,90) width 176: ".seven {line-height: 3"
- text run at (176,90) width 136: "ex; font-size: 12"
- text run at (312,90) width 32: "px;}"
- text run at (0,105) width 320: ".eight {line-height: 200%; font-size: 12"
- text run at (320,105) width 32: "px;}"
- text run at (0,120) width 288: ".nine {line-height: 2; font-size: 12"
- text run at (288,120) width 32: "px;}"
- text run at (0,135) width 168: ".ten {line-height: 50"
- text run at (168,135) width 136: "px; font-size: 12"
- text run at (304,135) width 32: "px;}"
- text run at (0,150) width 192: ".eleven {line-height: -1"
- text run at (192,150) width 136: "em; font-size: 12"
- text run at (328,150) width 32: "px;}"
- text run at (0,165) width 368: "TABLE .ten {line-height: normal; font-size: 12"
- text run at (368,165) width 32: "px;}"
+ text run at (0,0) width 344: ".one {line-height: 0.5in; font-size: 12px;}"
+ text run at (0,15) width 328: ".two {line-height: 2cm; font-size: 12px;}"
+ text run at (0,30) width 352: ".three {line-height: 20mm; font-size: 12px;}"
+ text run at (0,45) width 344: ".four {line-height: 24pt; font-size: 12px;}"
+ text run at (0,60) width 336: ".five {line-height: 2pc; font-size: 12px;}"
+ text run at (0,75) width 328: ".six {line-height: 2em; font-size: 12px;}"
+ text run at (0,90) width 344: ".seven {line-height: 3ex; font-size: 12px;}"
+ text run at (0,105) width 352: ".eight {line-height: 200%; font-size: 12px;}"
+ text run at (0,120) width 320: ".nine {line-height: 2; font-size: 12px;}"
+ text run at (0,135) width 336: ".ten {line-height: 50px; font-size: 12px;}"
+ text run at (0,150) width 360: ".eleven {line-height: -1em; font-size: 12px;}"
+ text run at (0,165) width 400: "TABLE .ten {line-height: normal; font-size: 12px;}"
text run at (0,180) width 248: "DIV {background-color: silver;}"
text run at (0,195) width 304: "SPAN.color {background-color: silver;}"
RenderBlock {HR} at (0,257) size 784x2 [border: (1px inset #000000)]
@@ -74,8 +53,7 @@
text run at (0,5) width 592: "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 784x72
RenderText {TEXT} at (0,-2) size 763x72
- text run at (0,-2) width 717: "This sentence should have a line-height of twice the DIV's font size, or 28"
- text run at (717,-2) width 31: "px;"
+ 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 784x24
@@ -92,9 +70,7 @@
RenderText {TEXT} at (0,10) size 749x144
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 308: "lines, as the font-size will be 28"
- text run at (308,106) width 316: "px and the line-height will be 56"
- text run at (624,106) width 30: "px."
+ 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 784x24
RenderText {TEXT} at (0,5) size 606x24
text run at (0,5) width 606: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines."
@@ -154,8 +130,7 @@
text run at (0,5) width 592: "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 762x72
RenderText {TEXT} at (0,-2) size 748x72
- text run at (0,-2) width 717: "This sentence should have a line-height of twice the DIV's font size, or 28"
- text run at (717,-2) width 31: "px;"
+ 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 722: "this should not cause extra spacing between the lines, since the line-height"
text run at (0,46) width 405: "and font-size should have the same value."
RenderBlock (anonymous) at (0,144) size 762x24
@@ -172,9 +147,7 @@
RenderText {TEXT} at (0,10) size 749x144
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 308: "lines, as the font-size will be 28"
- text run at (308,106) width 316: "px and the line-height will be 56"
- text run at (624,106) width 30: "px."
+ 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 762x24
RenderText {TEXT} at (0,5) size 606x24
text run at (0,5) width 606: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines."
1.9 +8 -16 WebCore/layout-tests/css1/text_properties/text_indent-expected.txt
Index: text_indent-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/text_properties/text_indent-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- text_indent-expected.txt 15 Apr 2005 21:45:53 -0000 1.8
+++ text_indent-expected.txt 19 Jul 2005 21:18:13 -0000 1.9
@@ -8,23 +8,15 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x165
RenderText {TEXT} at (0,0) size 384x150
- text run at (0,0) width 176: ".one {text-indent: 0.5"
- text run at (176,0) width 176: "in; background: aqua;}"
- text run at (0,15) width 160: ".two {text-indent: 2"
- text run at (160,15) width 176: "cm; background: aqua;}"
- text run at (0,30) width 184: ".three {text-indent: 20"
- text run at (184,30) width 176: "mm; background: aqua;}"
- text run at (0,45) width 176: ".four {text-indent: 24"
- text run at (176,45) width 176: "pt; background: aqua;}"
- text run at (0,60) width 168: ".five {text-indent: 2"
- text run at (168,60) width 176: "pc; background: aqua;}"
- text run at (0,75) width 160: ".six {text-indent: 2"
- text run at (160,75) width 176: "em; background: aqua;}"
- text run at (0,90) width 176: ".seven {text-indent: 2"
- text run at (176,90) width 176: "ex; background: aqua;}"
+ text run at (0,0) width 352: ".one {text-indent: 0.5in; background: aqua;}"
+ text run at (0,15) width 336: ".two {text-indent: 2cm; background: aqua;}"
+ text run at (0,30) width 360: ".three {text-indent: 20mm; background: aqua;}"
+ text run at (0,45) width 352: ".four {text-indent: 24pt; background: aqua;}"
+ text run at (0,60) width 344: ".five {text-indent: 2pc; background: aqua;}"
+ text run at (0,75) width 336: ".six {text-indent: 2em; background: aqua;}"
+ text run at (0,90) width 352: ".seven {text-indent: 2ex; background: aqua;}"
text run at (0,105) width 352: ".eight {text-indent: 50%; background: aqua;}"
- text run at (0,120) width 176: ".nine {text-indent: 25"
- text run at (176,120) width 176: "px; background: aqua;}"
+ text run at (0,120) width 352: ".nine {text-indent: 25px; background: aqua;}"
text run at (0,135) width 384: "blockquote {text-indent: 50%; background: aqua;}"
RenderBlock {HR} at (0,212) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,230) size 784x18 [bgcolor=#00FFFF]
1.11 +21 -45 WebCore/layout-tests/css1/text_properties/vertical_align-expected.txt
Index: vertical_align-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/text_properties/vertical_align-expected.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vertical_align-expected.txt 14 Jun 2005 22:36:31 -0000 1.10
+++ vertical_align-expected.txt 19 Jul 2005 21:18:13 -0000 1.11
@@ -8,31 +8,19 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x270
RenderText {TEXT} at (0,0) size 512x255
- text run at (0,0) width 128: "P {font-size: 12"
- text run at (128,0) width 32: "pt;}"
+ text run at (0,0) width 160: "P {font-size: 12pt;}"
text run at (0,15) width 216: ".one {vertical-align: sub;}"
text run at (0,30) width 232: ".two {vertical-align: super;}"
- text run at (0,45) width 336: ".three {vertical-align: top; font-size: 12"
- text run at (336,45) width 32: "pt;}"
- text run at (0,60) width 368: ".four {vertical-align: text-top; font-size: 12"
- text run at (368,60) width 32: "pt;}"
- text run at (0,75) width 352: ".five {vertical-align: middle; font-size: 12"
- text run at (352,75) width 32: "pt;}"
- text run at (0,90) width 344: ".six {vertical-align: bottom; font-size: 12"
- text run at (344,90) width 32: "pt;}"
- text run at (0,105) width 400: ".seven {vertical-align: text-bottom; font-size: 12"
- text run at (400,105) width 32: "pt;}"
- text run at (0,120) width 376: ".eight {vertical-align: baseline; font-size: 12"
- text run at (376,120) width 32: "pt;}"
- text run at (0,135) width 328: ".nine {vertical-align: 50%; font-size: 12"
- text run at (328,135) width 152: "px; line-height: 16"
- text run at (480,135) width 32: "px;}"
- text run at (0,165) width 192: "P.example {font-size: 14"
- text run at (192,165) width 32: "pt;}"
- text run at (0,180) width 144: "BIG {font-size: 16"
- text run at (144,180) width 32: "pt;}"
- text run at (0,195) width 160: "SMALL {font-size: 12"
- text run at (160,195) width 32: "pt;}"
+ text run at (0,45) width 368: ".three {vertical-align: top; font-size: 12pt;}"
+ text run at (0,60) width 400: ".four {vertical-align: text-top; font-size: 12pt;}"
+ text run at (0,75) width 384: ".five {vertical-align: middle; font-size: 12pt;}"
+ text run at (0,90) width 376: ".six {vertical-align: bottom; font-size: 12pt;}"
+ text run at (0,105) width 432: ".seven {vertical-align: text-bottom; font-size: 12pt;}"
+ text run at (0,120) width 408: ".eight {vertical-align: baseline; font-size: 12pt;}"
+ text run at (0,135) width 512: ".nine {vertical-align: 50%; font-size: 12px; line-height: 16px;}"
+ text run at (0,165) width 224: "P.example {font-size: 14pt;}"
+ text run at (0,180) width 176: "BIG {font-size: 16pt;}"
+ text run at (0,195) width 192: "SMALL {font-size: 12pt;}"
text run at (0,210) width 304: ".ttopalign {vertical-align: text-top;}"
text run at (0,225) width 256: ".topalign {vertical-align: top;}"
text run at (0,240) width 280: ".midalign {vertical-align: middle;}"
@@ -92,8 +80,7 @@
RenderText {TEXT} at (19,32) size 126x18
text run at (19,32) width 126: "The first four words"
RenderText {TEXT} at (145,0) size 733x124
- text run at (145,0) width 375: " in this sentence should be 12"
- text run at (520,0) width 169: "pt in size and"
+ 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
@@ -107,8 +94,7 @@
RenderText {TEXT} at (19,19) size 293x18
text run at (19,19) width 293: "The first eight words (\"eight\" has a descender)"
RenderText {TEXT} at (312,0) size 745x161
- text run at (312,0) width 375: " in this sentence should be 12"
- text run at (687,0) width 58: "pt in"
+ 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."
@@ -123,8 +109,7 @@
RenderText {TEXT} at (19,36) size 126x18
text run at (19,36) width 126: "The first four words"
RenderText {TEXT} at (145,21) size 759x111
- text run at (145,21) width 375: " in this sentence should be 12"
- text run at (520,21) width 169: "pt in size and"
+ text run at (145,21) width 544: " in this sentence should be 12pt in size and"
text run at (0,58) width 759: "baseline-aligned, which should align their baseline with the"
text run at (0,95) width 522: "baseline of the rest of the text in the line."
RenderText {TEXT} at (0,0) size 0x0
@@ -134,11 +119,8 @@
RenderText {TEXT} at (15,31) size 96x16
text run at (15,31) width 96: "The first four words"
RenderText {TEXT} at (111,36) size 750x36
- text run at (111,36) width 286: " in this sentence should have a font-size of 12"
- text run at (397,36) width 162: "px and a line-height of 16"
- text run at (559,36) width 191: "px; they are also 50%-aligned,"
- text run at (0,54) width 165: "which should raise them 8"
- text run at (165,54) width 211: "px relative to the natural baseline."
+ text run at (111,36) 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,54) width 376: "which should raise them 8px relative to the natural baseline."
RenderBlock {P} at (0,1388) size 784x36
RenderText {TEXT} at (0,0) size 742x36
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"
@@ -441,8 +423,7 @@
RenderText {TEXT} at (19,32) size 126x18
text run at (19,32) width 126: "The first four words"
RenderText {TEXT} at (145,0) size 733x124
- text run at (145,0) width 375: " in this sentence should be 12"
- text run at (520,0) width 169: "pt in size and"
+ 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
@@ -456,8 +437,7 @@
RenderText {TEXT} at (19,19) size 293x18
text run at (19,19) width 293: "The first eight words (\"eight\" has a descender)"
RenderText {TEXT} at (312,0) size 745x161
- text run at (312,0) width 375: " in this sentence should be 12"
- text run at (687,0) width 58: "pt in"
+ 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."
@@ -472,8 +452,7 @@
RenderText {TEXT} at (19,36) size 126x18
text run at (19,36) width 126: "The first four words"
RenderText {TEXT} at (145,21) size 759x111
- text run at (145,21) width 375: " in this sentence should be 12"
- text run at (520,21) width 169: "pt in size and"
+ text run at (145,21) width 544: " in this sentence should be 12pt in size and"
text run at (0,58) width 759: "baseline-aligned, which should align their baseline with the"
text run at (0,95) width 522: "baseline of the rest of the text in the line."
RenderText {TEXT} at (0,0) size 0x0
@@ -483,11 +462,8 @@
RenderText {TEXT} at (15,31) size 96x16
text run at (15,31) width 96: "The first four words"
RenderText {TEXT} at (111,36) size 750x36
- text run at (111,36) width 286: " in this sentence should have a font-size of 12"
- text run at (397,36) width 162: "px and a line-height of 16"
- text run at (559,36) width 191: "px; they are also 50%-aligned,"
- text run at (0,54) width 165: "which should raise them 8"
- text run at (165,54) width 211: "px relative to the natural baseline."
+ text run at (111,36) 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,54) width 376: "which should raise them 8px relative to the natural baseline."
RenderBlock {P} at (4,1057) size 762x36
RenderText {TEXT} at (0,0) size 742x36
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"
1.8 +9 -18 WebCore/layout-tests/css1/text_properties/word_spacing-expected.txt
Index: word_spacing-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/text_properties/word_spacing-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- word_spacing-expected.txt 15 Apr 2005 21:45:53 -0000 1.7
+++ word_spacing-expected.txt 19 Jul 2005 21:18:13 -0000 1.8
@@ -8,26 +8,17 @@
text run at (0,0) width 355: "The style declarations which apply to the text below are:"
RenderBlock {PRE} at (0,34) size 784x180
RenderText {TEXT} at (0,0) size 248x165
- text run at (0,0) width 184: ".one {word-spacing: 0.3"
- text run at (184,0) width 32: "in;}"
- text run at (0,15) width 184: ".two {word-spacing: 0.5"
- text run at (184,15) width 32: "cm;}"
- text run at (0,30) width 184: ".three {word-spacing: 5"
- text run at (184,30) width 32: "mm;}"
- text run at (0,45) width 176: ".four {word-spacing: 3"
- text run at (176,45) width 32: "pt;}"
- text run at (0,60) width 200: ".five {word-spacing: 0.25"
- text run at (200,60) width 32: "pc;}"
- text run at (0,75) width 168: ".six {word-spacing: 1"
- text run at (168,75) width 32: "em;}"
- text run at (0,90) width 184: ".seven {word-spacing: 1"
- text run at (184,90) width 32: "ex;}"
- text run at (0,105) width 184: ".eight {word-spacing: 5"
- text run at (184,105) width 32: "px;}"
+ text run at (0,0) width 216: ".one {word-spacing: 0.3in;}"
+ text run at (0,15) width 216: ".two {word-spacing: 0.5cm;}"
+ text run at (0,30) width 216: ".three {word-spacing: 5mm;}"
+ text run at (0,45) width 208: ".four {word-spacing: 3pt;}"
+ text run at (0,60) width 232: ".five {word-spacing: 0.25pc;}"
+ text run at (0,75) width 200: ".six {word-spacing: 1em;}"
+ text run at (0,90) width 216: ".seven {word-spacing: 1ex;}"
+ text run at (0,105) width 216: ".eight {word-spacing: 5px;}"
text run at (0,120) width 232: ".nine {word-spacing: normal;}"
text run at (0,135) width 208: ".ten {word-spacing: 300%;}"
- text run at (0,150) width 216: ".eleven {word-spacing: -0.2"
- text run at (216,150) width 32: "em;}"
+ text run at (0,150) width 248: ".eleven {word-spacing: -0.2em;}"
RenderBlock {HR} at (0,227) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,245) size 784x18
RenderText {TEXT} at (0,0) size 701x18
1.10 +22 -45 WebCore/layout-tests/css1/units/length_units-expected.txt
Index: length_units-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/css1/units/length_units-expected.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- length_units-expected.txt 15 Apr 2005 21:45:53 -0000 1.9
+++ length_units-expected.txt 19 Jul 2005 21:18:13 -0000 1.10
@@ -9,27 +9,16 @@
RenderBlock {PRE} at (0,34) size 784x165
RenderText {TEXT} at (0,0) size 624x165
text run at (0,0) width 184: ".zero {margin-left: 0;}"
- text run at (0,15) width 160: ".one {margin-left: 3"
- text run at (160,15) width 32: "em;}"
- text run at (0,30) width 160: ".two {margin-left: 3"
- text run at (160,30) width 32: "ex;}"
- text run at (0,45) width 184: ".three {margin-left: 36"
- text run at (184,45) width 32: "px;}"
- text run at (0,60) width 184: ".four {margin-left: 0.5"
- text run at (184,60) width 32: "in;}"
- text run at (0,75) width 192: ".five {margin-left: 1.27"
- text run at (192,75) width 32: "cm;}"
- text run at (0,90) width 184: ".six {margin-left: 12.7"
- text run at (184,90) width 32: "mm;}"
- text run at (0,105) width 184: ".seven {margin-left: 36"
- text run at (184,105) width 32: "pt;}"
- text run at (0,120) width 176: ".eight {margin-left: 3"
- text run at (176,120) width 32: "pc;}"
- text run at (0,135) width 176: ".nine {margin-left: +3"
- text run at (176,135) width 32: "pc;}"
- text run at (0,150) width 152: ".ten {font-size: 40"
- text run at (152,150) width 144: "px; border-left: 1"
- text run at (296,150) width 328: "ex solid purple; background-color: aqua;}"
+ text run at (0,15) width 192: ".one {margin-left: 3em;}"
+ text run at (0,30) width 192: ".two {margin-left: 3ex;}"
+ text run at (0,45) width 216: ".three {margin-left: 36px;}"
+ text run at (0,60) width 216: ".four {margin-left: 0.5in;}"
+ text run at (0,75) width 224: ".five {margin-left: 1.27cm;}"
+ text run at (0,90) width 216: ".six {margin-left: 12.7mm;}"
+ text run at (0,105) width 216: ".seven {margin-left: 36pt;}"
+ text run at (0,120) width 208: ".eight {margin-left: 3pc;}"
+ text run at (0,135) width 208: ".nine {margin-left: +3pc;}"
+ text run at (0,150) width 624: ".ten {font-size: 40px; border-left: 1ex solid purple; background-color: aqua;}"
RenderBlock {HR} at (0,212) size 784x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,230) size 784x36
RenderText {TEXT} at (0,0) size 761x36
@@ -42,12 +31,10 @@
text run at (369,18) width 138: " paragraph's left edge."
RenderBlock {P} at (48,282) size 736x18
RenderText {TEXT} at (0,0) size 310x18
- text run at (0,0) width 287: "This paragraph should have a left margin of 3"
- text run at (287,0) width 23: "em."
+ text run at (0,0) width 310: "This paragraph should have a left margin of 3em."
RenderBlock {P} at (23,316) size 761x18
RenderText {TEXT} at (0,0) size 306x18
- text run at (0,0) width 287: "This paragraph should have a left margin of 3"
- text run at (287,0) width 19: "ex."
+ text run at (0,0) width 306: "This paragraph should have a left margin of 3ex."
RenderBlock {P} at (36,350) size 748x18
RenderText {TEXT} at (0,0) size 340x18
text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels."
@@ -56,12 +43,10 @@
text run at (0,0) width 357: "This paragraph should have a left margin of half an inch."
RenderBlock {P} at (48,418) size 736x18
RenderText {TEXT} at (0,0) size 330x18
- text run at (0,0) width 307: "This paragraph should have a left margin of 1.27"
- text run at (307,0) width 23: "cm."
+ text run at (0,0) width 330: "This paragraph should have a left margin of 1.27cm."
RenderBlock {P} at (48,452) size 736x18
RenderText {TEXT} at (0,0) size 335x18
- text run at (0,0) width 307: "This paragraph should have a left margin of 12.7"
- text run at (307,0) width 28: "mm."
+ text run at (0,0) width 335: "This paragraph should have a left margin of 12.7mm."
RenderBlock {P} at (48,486) size 736x18
RenderText {TEXT} at (0,0) size 341x18
text run at (0,0) width 341: "This paragraph should have a left margin of 36 points."
@@ -81,8 +66,7 @@
text run at (545,0) width 53: " of "
RenderInline {CODE} at (0,0) size 96x46
RenderText {TEXT} at (598,0) size 96x46
- text run at (598,0) width 48: "40"
- text run at (646,0) width 48: "px"
+ text run at (598,0) width 96: "40px"
RenderText {TEXT} at (694,0) size 743x92
text run at (694,0) width 68: " and"
text run at (19,46) width 28: "a "
@@ -93,8 +77,7 @@
text run at (311,46) width 53: " of "
RenderInline {CODE} at (0,0) size 384x46
RenderText {TEXT} at (364,46) size 384x46
- text run at (364,46) width 24: "1"
- text run at (388,46) width 360: "ex solid purple"
+ text run at (364,46) width 384: "1ex solid purple"
RenderText {TEXT} at (748,46) size 739x184
text run at (748,46) width 10: "."
text run at (19,92) width 673: "This should make the left border the same"
@@ -123,12 +106,10 @@
text run at (369,18) width 138: " paragraph's left edge."
RenderBlock {P} at (52,56) size 714x18
RenderText {TEXT} at (0,0) size 310x18
- text run at (0,0) width 287: "This paragraph should have a left margin of 3"
- text run at (287,0) width 23: "em."
+ text run at (0,0) width 310: "This paragraph should have a left margin of 3em."
RenderBlock {P} at (27,90) size 739x18
RenderText {TEXT} at (0,0) size 306x18
- text run at (0,0) width 287: "This paragraph should have a left margin of 3"
- text run at (287,0) width 19: "ex."
+ text run at (0,0) width 306: "This paragraph should have a left margin of 3ex."
RenderBlock {P} at (40,124) size 726x18
RenderText {TEXT} at (0,0) size 340x18
text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels."
@@ -137,12 +118,10 @@
text run at (0,0) width 357: "This paragraph should have a left margin of half an inch."
RenderBlock {P} at (52,192) size 714x18
RenderText {TEXT} at (0,0) size 330x18
- text run at (0,0) width 307: "This paragraph should have a left margin of 1.27"
- text run at (307,0) width 23: "cm."
+ text run at (0,0) width 330: "This paragraph should have a left margin of 1.27cm."
RenderBlock {P} at (52,226) size 714x18
RenderText {TEXT} at (0,0) size 335x18
- text run at (0,0) width 307: "This paragraph should have a left margin of 12.7"
- text run at (307,0) width 28: "mm."
+ text run at (0,0) width 335: "This paragraph should have a left margin of 12.7mm."
RenderBlock {P} at (52,260) size 714x18
RenderText {TEXT} at (0,0) size 341x18
text run at (0,0) width 341: "This paragraph should have a left margin of 36 points."
@@ -162,8 +141,7 @@
text run at (545,0) width 53: " of "
RenderInline {CODE} at (0,0) size 96x46
RenderText {TEXT} at (598,0) size 96x46
- text run at (598,0) width 48: "40"
- text run at (646,0) width 48: "px"
+ text run at (598,0) width 96: "40px"
RenderText {TEXT} at (694,0) size 743x92
text run at (694,0) width 68: " and"
text run at (19,46) width 28: "a "
@@ -174,8 +152,7 @@
text run at (311,46) width 53: " of "
RenderInline {CODE} at (0,0) size 384x46
RenderText {TEXT} at (364,46) size 384x46
- text run at (364,46) width 24: "1"
- text run at (388,46) width 360: "ex solid purple"
+ text run at (364,46) width 384: "1ex solid purple"
RenderText {TEXT} at (748,46) size 739x184
text run at (748,46) width 10: "."
text run at (19,92) width 673: "This should make the left border the same"
1.5 +3 -6 WebCore/layout-tests/editing/style/relative-font-size-change-001-expected.txt
Index: relative-font-size-change-001-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/editing/style/relative-font-size-change-001-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- relative-font-size-change-001-expected.txt 6 Jul 2005 00:21:50 -0000 1.4
+++ relative-font-size-change-001-expected.txt 19 Jul 2005 21:18:14 -0000 1.5
@@ -5,17 +5,14 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #0000FF)]
RenderText {TEXT} at (14,14) size 715x56
- text run at (14,14) width 250: "Size check should say: 30"
- text run at (264,14) width 465: "px. All text in the red boxes should appear to be"
- text run at (14,42) width 24: "30"
- text run at (38,42) width 30: "px."
+ text run at (14,14) width 715: "Size check should say: 30px. All text in the red boxes should appear to be"
+ text run at (14,42) width 54: "30px."
RenderBlock {DIV} at (0,108) size 784x28
RenderText {TEXT} at (0,0) size 118x28
text run at (0,0) width 118: "Size check: "
RenderInline {SPAN} at (0,0) size 48x28
RenderText {TEXT} at (118,0) size 48x28
- text run at (118,0) width 24: "30"
- text run at (142,0) width 24: "px"
+ text run at (118,0) width 48: "30px"
RenderBlock {DIV} at (0,152) size 784x164
RenderBlock {DIV} at (0,0) size 784x164 [border: (2px solid #FF0000)]
RenderBlock (anonymous) at (14,14) size 756x36
1.4 +3 -6 WebCore/layout-tests/editing/style/relative-font-size-change-002-expected.txt
Index: relative-font-size-change-002-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/editing/style/relative-font-size-change-002-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- relative-font-size-change-002-expected.txt 14 Jun 2005 22:37:01 -0000 1.3
+++ relative-font-size-change-002-expected.txt 19 Jul 2005 21:18:14 -0000 1.4
@@ -5,17 +5,14 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x84 [border: (2px solid #0000FF)]
RenderText {TEXT} at (14,14) size 748x56
- text run at (14,14) width 250: "Size check should say: 30"
- text run at (264,14) width 498: "px. All text on the first line, and the first two words"
- text run at (14,42) width 403: "of the second line, should appear to be 30"
- text run at (417,42) width 30: "px."
+ text run at (14,14) width 748: "Size check should say: 30px. All text on the first line, and the first two words"
+ text run at (14,42) width 433: "of the second line, should appear to be 30px."
RenderBlock {DIV} at (0,108) size 784x28
RenderText {TEXT} at (0,0) size 118x28
text run at (0,0) width 118: "Size check: "
RenderInline {SPAN} at (0,0) size 48x28
RenderText {TEXT} at (118,0) size 48x28
- text run at (118,0) width 24: "30"
- text run at (142,0) width 24: "px"
+ text run at (118,0) width 48: "30px"
RenderBlock {DIV} at (0,152) size 784x156
RenderBlock {DIV} at (0,0) size 784x156 [border: (2px solid #FF0000)]
RenderBlock (anonymous) at (14,14) size 756x36
1.4 +4 -8 WebCore/layout-tests/editing/style/relative-font-size-change-003-expected.txt
Index: relative-font-size-change-003-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/editing/style/relative-font-size-change-003-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- relative-font-size-change-003-expected.txt 14 Jun 2005 22:37:01 -0000 1.3
+++ relative-font-size-change-003-expected.txt 19 Jul 2005 21:18:14 -0000 1.4
@@ -5,20 +5,16 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #0000FF)]
RenderText {TEXT} at (14,14) size 738x84
- text run at (14,14) width 250: "Size check should say: 24"
- text run at (264,14) width 473: "px. The first two words of the second line should"
- text run at (14,42) width 149: "appear to be 24"
- text run at (163,42) width 183: "px. The rest of the "
+ text run at (14,14) width 723: "Size check should say: 24px. The first two words of the second line should"
+ text run at (14,42) width 332: "appear to be 24px. The rest of the "
text run at (346,42) width 406: "words on the second line should appear to"
- text run at (14,70) width 53: "be 30"
- text run at (67,70) width 30: "px."
+ text run at (14,70) width 83: "be 30px."
RenderBlock {DIV} at (0,136) size 784x28
RenderText {TEXT} at (0,0) size 118x28
text run at (0,0) width 118: "Size check: "
RenderInline {SPAN} at (0,0) size 48x28
RenderText {TEXT} at (118,0) size 48x28
- text run at (118,0) width 24: "24"
- text run at (142,0) width 24: "px"
+ text run at (118,0) width 48: "24px"
RenderBlock {DIV} at (0,180) size 784x148
RenderBlock {DIV} at (0,0) size 784x148 [border: (2px solid #FF0000)]
RenderBlock (anonymous) at (14,14) size 756x28
1.5 +3 -6 WebCore/layout-tests/editing/style/relative-font-size-change-004-expected.txt
Index: relative-font-size-change-004-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/editing/style/relative-font-size-change-004-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- relative-font-size-change-004-expected.txt 6 Jul 2005 00:21:50 -0000 1.4
+++ relative-font-size-change-004-expected.txt 19 Jul 2005 21:18:14 -0000 1.5
@@ -5,18 +5,15 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #0000FF)]
RenderText {TEXT} at (14,14) size 715x84
- text run at (14,14) width 250: "Size check should say: 30"
- text run at (264,14) width 465: "px. All text in the red boxes should appear to be"
- text run at (14,42) width 24: "24"
- text run at (38,42) width 664: "px. This test checks removing font size tags when they are no longer"
+ text run at (14,14) width 715: "Size check should say: 30px. All text in the red boxes should appear to be"
+ text run at (14,42) width 688: "24px. This test checks removing font size tags when they are no longer"
text run at (14,70) width 100: "necessary."
RenderBlock {DIV} at (0,136) size 784x28
RenderText {TEXT} at (0,0) size 118x28
text run at (0,0) width 118: "Size check: "
RenderInline {SPAN} at (0,0) size 48x28
RenderText {TEXT} at (118,0) size 48x28
- text run at (118,0) width 24: "30"
- text run at (142,0) width 24: "px"
+ text run at (118,0) width 48: "30px"
RenderBlock {DIV} at (0,180) size 784x140
RenderBlock {DIV} at (0,0) size 784x140 [border: (2px solid #FF0000)]
RenderBlock (anonymous) at (14,14) size 756x28
1.4 +1 -2 WebCore/layout-tests/editing/style/smoosh-styles-003-expected.txt
Index: smoosh-styles-003-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/editing/style/smoosh-styles-003-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smoosh-styles-003-expected.txt 14 Jun 2005 22:37:01 -0000 1.3
+++ smoosh-styles-003-expected.txt 19 Jul 2005 21:18:14 -0000 1.4
@@ -15,8 +15,7 @@
RenderText {TEXT} at (152,56) size 260x28
text run at (152,56) width 260: "<rdar://problem/3972665>"
RenderText {TEXT} at (412,56) size 740x56
- text run at (412,56) width 18: " 8"
- text run at (430,56) width 310: "A360: HTML message partially"
+ text run at (412,56) width 328: " 8A360: HTML message partially"
text run at (0,84) width 560: "truncated on left hand side, text-indent from Script Editor"
RenderBlock {DIV} at (14,142) size 756x84
RenderText {TEXT} at (0,0) size 189x28
1.4 +1 -2 WebCore/layout-tests/fast/block/basic/018-expected.txt
Index: 018-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/basic/018-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 018-expected.txt 6 Jul 2005 00:21:51 -0000 1.3
+++ 018-expected.txt 19 Jul 2005 21:18:15 -0000 1.4
@@ -21,8 +21,7 @@
RenderBlock {HR} at (293,190) size 198x2 [border: (1px inset #000000)]
RenderBlock {P} at (0,208) size 784x18
RenderText {TEXT} at (0,0) size 54x18
- text run at (0,0) width 28: "(W3"
- text run at (28,0) width 26: "C: \x{201C}"
+ text run at (0,0) width 54: "(W3C: \x{201C}"
RenderInline {A} at (0,0) size 196x18 [color=#0000EE]
RenderText {TEXT} at (54,0) size 196x18
text run at (54,0) width 196: "By default, the rule is centered."
1.4 +1 -2 WebCore/layout-tests/fast/block/float/002-expected.txt
Index: 002-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/float/002-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 002-expected.txt 26 Apr 2004 21:19:00 -0000 1.3
+++ 002-expected.txt 19 Jul 2005 21:18:15 -0000 1.4
@@ -6,8 +6,7 @@
RenderImage {IMG} at (643,10) size 121x84
RenderInline {A} at (0,0) size 377x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 377x18
- text run at (0,0) width 282: "http://www.apple.com/pr/library/2003/jan/02"
- text run at (282,0) width 95: "ical_isync.html"
+ text run at (0,0) width 377: "http://www.apple.com/pr/library/2003/jan/02ical_isync.html"
RenderBR {BR} at (0,0) size 0x0
RenderInline {A} at (0,0) size 171x18 [color=#0000EE]
RenderText {TEXT} at (0,18) size 171x18
1.8 +1 -2 WebCore/layout-tests/fast/block/float/021-expected.txt
Index: 021-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/float/021-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 021-expected.txt 19 Oct 2004 23:28:49 -0000 1.7
+++ 021-expected.txt 19 Jul 2005 21:18:15 -0000 1.8
@@ -7,8 +7,7 @@
RenderText {TEXT} at (0,0) size 783x36
text run at (0,0) width 750: "In all of the examples, you should be able to see blue and green rectangles that spill way out of their containing blocks. "
text run at (750,0) width 33: "They"
- text run at (0,18) width 89: "should be 100"
- text run at (89,18) width 476: "px tall and not overlap one another at all. They should be stacked vertically."
+ text run at (0,18) width 565: "should be 100px tall and not overlap one another at all. They should be stacked vertically."
RenderBlock {DIV} at (0,52) size 720x240 [border: (10px solid #000000)]
RenderText {TEXT} at (10,10) size 309x18
text run at (10,10) width 309: "You should see blue and green rectangles below."
1.5 +1 -2 WebCore/layout-tests/fast/block/float/023-expected.txt
Index: 023-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/float/023-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 023-expected.txt 19 Oct 2004 23:28:49 -0000 1.4
+++ 023-expected.txt 19 Jul 2005 21:18:15 -0000 1.5
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x576
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 572x18
- text run at (0,0) width 178: "You should see a single 100"
- text run at (178,0) width 161: "x100 green block below. "
+ text run at (0,0) width 339: "You should see a single 100x100 green block below. "
text run at (339,0) width 233: "If you see any red, the test has failed."
RenderBlock {UL} at (0,34) size 784x0
RenderBlock (floating) {LI} at (100,0) size 100x100 [bgcolor=#FF0000]
1.8 +2 -4 WebCore/layout-tests/fast/block/float/024-expected.txt
Index: 024-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/float/024-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 024-expected.txt 19 Oct 2004 23:28:49 -0000 1.7
+++ 024-expected.txt 19 Jul 2005 21:18:15 -0000 1.8
@@ -15,12 +15,10 @@
RenderBlock {DIV} at (2,34) size 796x0
RenderBlock (anonymous) at (2,34) size 796x18
RenderText {TEXT} at (0,0) size 483x18
- text run at (0,0) width 376: "This text should be inside a black rectangle and below the 2"
- text run at (376,0) width 107: "em white square."
+ text run at (0,0) width 483: "This text should be inside a black rectangle and below the 2em white square."
RenderBlock {DIV} at (0,291) size 800x54 [bgcolor=#DDDDDD] [border: (2px solid #000000)]
RenderBlock (floating) {DIV} at (2,2) size 32x32 [bgcolor=#FFFFFF]
RenderBlock {DIV} at (2,34) size 796x0
RenderBlock (anonymous) at (2,34) size 796x18
RenderText {TEXT} at (0,0) size 512x18
- text run at (0,0) width 405: "This text should also be inside a black rectangle and below the 2"
- text run at (405,0) width 107: "em white square."
+ text run at (0,0) width 512: "This text should also be inside a black rectangle and below the 2em white square."
1.5 +2 -4 WebCore/layout-tests/fast/block/float/029-expected.txt
Index: 029-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/float/029-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 029-expected.txt 19 Oct 2004 23:28:49 -0000 1.4
+++ 029-expected.txt 19 Jul 2005 21:18:15 -0000 1.5
@@ -11,12 +11,10 @@
text run at (1,19) width 65: "float:right;"
RenderBR {BR} at (66,19) size 0x18
RenderText {TEXT} at (1,37) size 88x18
- text run at (1,37) width 68: "width: 250"
- text run at (69,37) width 20: "px;"
+ text run at (1,37) width 88: "width: 250px;"
RenderBR {BR} at (89,37) size 0x18
RenderText {TEXT} at (1,55) size 87x18
- text run at (1,55) width 67: "height:100"
- text run at (68,55) width 20: "px;"
+ text run at (1,55) width 87: "height:100px;"
RenderBlock {DIV} at (0,0) size 394x38 [border: (1px solid #FF0000)]
RenderText {TEXT} at (1,1) size 31x18
text run at (1,1) width 31: "TOP"
1.3 +1 -2 WebCore/layout-tests/fast/block/float/030-expected.txt
Index: 030-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/float/030-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 030-expected.txt 19 Oct 2004 23:28:49 -0000 1.2
+++ 030-expected.txt 19 Jul 2005 21:18:15 -0000 1.3
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x576
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 750x18
- text run at (0,0) width 137: "You should see a 500"
- text run at (137,0) width 326: "x300 rectangle with orange, yellow and olive rects. "
+ text run at (0,0) width 463: "You should see a 500x300 rectangle with orange, yellow and olive rects. "
text run at (463,0) width 287: "No red should be visible or the test has failed."
RenderBlock (floating) {DIV} at (0,34) size 500x300 [bgcolor=#FF0000]
RenderBlock (floating) {DIV} at (0,0) size 250x300 [bgcolor=#FFA500]
1.6 +1 -3 WebCore/layout-tests/fast/block/margin-collapse/043-expected.txt
Index: 043-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/margin-collapse/043-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 043-expected.txt 26 Apr 2004 21:19:01 -0000 1.5
+++ 043-expected.txt 19 Jul 2005 21:18:16 -0000 1.6
@@ -6,9 +6,7 @@
RenderBlock {DIV} at (0,0) size 784x35 [bgcolor=#008000] [border: (1px solid #000000) none]
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 400x18
- text run at (0,0) width 129: "This div should be 2"
- text run at (129,0) width 97: "em tall with a 1"
- text run at (226,0) width 174: "em gap underneath the text."
+ text run at (0,0) width 400: "This div should be 2em tall with a 1em gap underneath the text."
RenderBlock {DIV} at (0,35) size 784x18 [bgcolor=#008000]
RenderText {TEXT} at (0,0) size 400x18
text run at (0,0) width 400: "I should also be green and flush with the other green div above."
1.3 +1 -2 WebCore/layout-tests/fast/block/margin-collapse/101-expected.txt
Index: 101-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/margin-collapse/101-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 101-expected.txt 26 Apr 2004 21:19:01 -0000 1.2
+++ 101-expected.txt 19 Jul 2005 21:18:16 -0000 1.3
@@ -6,7 +6,6 @@
RenderBlock {DIV} at (0,0) size 385x347
RenderBlock {P} at (0,0) size 385x40 [border: (2px solid #0000FF)]
RenderText {TEXT} at (2,2) size 365x36
- text run at (2,2) width 146: "There should be only 2"
- text run at (148,2) width 219: "em between this paragraph and the"
+ text run at (2,2) width 365: "There should be only 2em between this paragraph and the"
text run at (2,20) width 85: "image below."
RenderImage {IMG} at (0,72) size 395x275
1.5 +1 -2 WebCore/layout-tests/fast/block/positioning/060-expected.txt
Index: 060-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/positioning/060-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 060-expected.txt 26 Apr 2004 21:19:01 -0000 1.4
+++ 060-expected.txt 19 Jul 2005 21:18:16 -0000 1.5
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {TEXT} at (0,0) size 546x18
- text run at (0,0) width 158: "There should be two 100"
- text run at (158,0) width 173: "x100 green squares below. "
+ text run at (0,0) width 331: "There should be two 100x100 green squares below. "
text run at (331,0) width 215: "They should be vertically stacked."
RenderText {TEXT} at (0,0) size 0x0
layer at (10,40) size 100x100
1.6 +1 -2 WebCore/layout-tests/fast/block/positioning/auto/001-expected.txt
Index: 001-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/positioning/auto/001-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 001-expected.txt 26 Apr 2004 21:19:01 -0000 1.5
+++ 001-expected.txt 19 Jul 2005 21:18:17 -0000 1.6
@@ -8,8 +8,7 @@
text run at (0,0) width 561: "In this test, you should see three blocks that are centered horizontally within a black box. "
text run at (561,0) width 211: "They should be stacked vertically"
text run at (0,18) width 303: "with the green box in between two olive boxes. "
- text run at (303,18) width 311: "The olive boxes and the green box should be 100"
- text run at (614,18) width 163: "x100, and there should be"
+ text run at (303,18) width 474: "The olive boxes and the green box should be 100x100, and there should be"
text run at (0,36) width 325: "50 pixels of padding on either side of the box stack."
layer at (8,78) size 240x340
RenderBlock (positioned) {DIV} at (8,78) size 240x340 [border: (20px solid #000000)]
1.6 +1 -2 WebCore/layout-tests/fast/block/positioning/auto/002-expected.txt
Index: 002-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/positioning/auto/002-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 002-expected.txt 26 Apr 2004 21:19:01 -0000 1.5
+++ 002-expected.txt 19 Jul 2005 21:18:17 -0000 1.6
@@ -8,8 +8,7 @@
text run at (0,0) width 508: "In this test, you should see three blocks that are aligned right within a black box. "
text run at (508,0) width 266: "They should be stacked vertically with the"
text run at (0,18) width 248: "green box in between two olive boxes. "
- text run at (248,18) width 311: "The olive boxes and the green box should be 100"
- text run at (559,18) width 191: "x100, and there should be 100"
+ text run at (248,18) width 502: "The olive boxes and the green box should be 100x100, and there should be 100"
text run at (0,36) width 322: "pixels of padding on the right side of the box stack."
layer at (8,78) size 240x340
RenderBlock (positioned) {DIV} at (8,78) size 240x340 [border: (20px solid #000000)]
1.6 +1 -2 WebCore/layout-tests/fast/block/positioning/auto/003-expected.txt
Index: 003-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/positioning/auto/003-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 003-expected.txt 26 Apr 2004 21:19:01 -0000 1.5
+++ 003-expected.txt 19 Jul 2005 21:18:17 -0000 1.6
@@ -8,8 +8,7 @@
text run at (0,0) width 508: "In this test, you should see three blocks that are aligned right within a black box. "
text run at (508,0) width 266: "They should be stacked vertically with the"
text run at (0,18) width 248: "green box in between two olive boxes. "
- text run at (248,18) width 311: "The olive boxes and the green box should be 100"
- text run at (559,18) width 191: "x100, and there should be 100"
+ text run at (248,18) width 502: "The olive boxes and the green box should be 100x100, and there should be 100"
text run at (0,36) width 322: "pixels of padding on the right side of the box stack."
layer at (8,78) size 240x340
RenderBlock (positioned) {DIV} at (8,78) size 240x340 [border: (20px solid #000000)]
1.6 +1 -2 WebCore/layout-tests/fast/block/positioning/auto/004-expected.txt
Index: 004-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/positioning/auto/004-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 004-expected.txt 26 Apr 2004 21:19:01 -0000 1.5
+++ 004-expected.txt 19 Jul 2005 21:18:17 -0000 1.6
@@ -8,8 +8,7 @@
text run at (0,0) width 508: "In this test, you should see three blocks that are aligned right within a black box. "
text run at (508,0) width 266: "They should be stacked vertically with the"
text run at (0,18) width 248: "green box in between two olive boxes. "
- text run at (248,18) width 311: "The olive boxes and the green box should be 100"
- text run at (559,18) width 191: "x100, and there should be 100"
+ text run at (248,18) width 502: "The olive boxes and the green box should be 100x100, and there should be 100"
text run at (0,36) width 322: "pixels of padding on the right side of the box stack."
layer at (8,78) size 240x340
RenderBlock (positioned) {DIV} at (8,78) size 240x340 [border: (20px solid #000000)]
1.9 +1 -2 WebCore/layout-tests/fast/block/positioning/auto/005-expected.txt
Index: 005-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/positioning/auto/005-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- 005-expected.txt 19 Oct 2004 23:28:50 -0000 1.8
+++ 005-expected.txt 19 Jul 2005 21:18:17 -0000 1.9
@@ -7,8 +7,7 @@
text run at (0,0) width 508: "In this test, you should see three blocks that are aligned right within a black box. "
text run at (508,0) width 266: "They should be stacked vertically with the"
text run at (0,18) width 248: "green box in between two olive boxes. "
- text run at (248,18) width 311: "The olive boxes and the green box should be 100"
- text run at (559,18) width 191: "x100, and there should be 100"
+ text run at (248,18) width 502: "The olive boxes and the green box should be 100x100, and there should be 100"
text run at (0,36) width 326: "pixels of padding on the right side of the box stack. "
text run at (326,36) width 455: "The black box's top should be aligned with the end of the last line in this"
text run at (0,54) width 470: "parargaph and its left side should begin right after the end of this sentence. "
1.8 +1 -2 WebCore/layout-tests/fast/block/positioning/auto/006-expected.txt
Index: 006-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/block/positioning/auto/006-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 006-expected.txt 19 Oct 2004 23:28:50 -0000 1.7
+++ 006-expected.txt 19 Jul 2005 21:18:17 -0000 1.8
@@ -8,8 +8,7 @@
text run at (0,0) width 508: "In this test, you should see three blocks that are aligned right within a black box. "
text run at (508,0) width 266: "They should be stacked vertically with the"
text run at (0,18) width 248: "green box in between two olive boxes. "
- text run at (248,18) width 311: "The olive boxes and the green box should be 100"
- text run at (559,18) width 191: "x100, and there should be 100"
+ text run at (248,18) width 502: "The olive boxes and the green box should be 100x100, and there should be 100"
text run at (0,36) width 322: "pixels of padding on the right side of the box stack."
RenderBlock {P} at (0,70) size 784x36
RenderText {TEXT} at (14,0) size 770x36
1.3 +1 -2 WebCore/layout-tests/fast/clip/001-expected.txt
Index: 001-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/001-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 001-expected.txt 24 Oct 2003 21:20:29 -0000 1.2
+++ 001-expected.txt 19 Jul 2005 21:18:17 -0000 1.3
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x34
RenderBody {BODY} at (8,8) size 784x18
RenderText {TEXT} at (0,0) size 541x18
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
layer at (8,26) size 200x200 backgroundClip at (108,126) size 100x100 clip at (108,126) size 100x100
RenderBlock (positioned) {DIV} at (8,26) size 200x200 [bgcolor=#008000]
1.4 +1 -2 WebCore/layout-tests/fast/clip/002-expected.txt
Index: 002-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/002-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 002-expected.txt 21 Oct 2004 00:23:33 -0000 1.3
+++ 002-expected.txt 19 Jul 2005 21:18:17 -0000 1.4
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x118
RenderBlock (anonymous) at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 537x18
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 233: "If you see any red, the test has failed."
layer at (8,26) size 100x100 scrollHeight 200
RenderBlock {DIV} at (0,18) size 100x100 [bgcolor=#008000]
1.4 +1 -2 WebCore/layout-tests/fast/clip/003-expected.txt
Index: 003-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/003-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 003-expected.txt 21 Oct 2004 00:23:33 -0000 1.3
+++ 003-expected.txt 19 Jul 2005 21:18:17 -0000 1.4
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x118
RenderBlock (anonymous) at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 537x18
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 233: "If you see any red, the test has failed."
layer at (8,26) size 100x100 scrollWidth 200 scrollHeight 200
RenderBlock {DIV} at (0,18) size 100x100
1.4 +1 -2 WebCore/layout-tests/fast/clip/004-expected.txt
Index: 004-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/004-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 004-expected.txt 21 Oct 2004 00:23:33 -0000 1.3
+++ 004-expected.txt 19 Jul 2005 21:18:17 -0000 1.4
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x52
RenderBody {BODY} at (8,8) size 784x36
RenderText {TEXT} at (0,0) size 753x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 212: "This test is checking to make sure"
text run at (0,18) width 148: "overflow is done using "
1.4 +1 -2 WebCore/layout-tests/fast/clip/005-expected.txt
Index: 005-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/005-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 005-expected.txt 21 Oct 2004 00:23:33 -0000 1.3
+++ 005-expected.txt 19 Jul 2005 21:18:17 -0000 1.4
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x136
RenderBlock (anonymous) at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 753x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 212: "This test is checking to make sure"
text run at (0,18) width 148: "overflow is done using "
1.4 +1 -2 WebCore/layout-tests/fast/clip/006-expected.txt
Index: 006-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/006-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 006-expected.txt 21 Oct 2004 00:23:33 -0000 1.3
+++ 006-expected.txt 19 Jul 2005 21:18:17 -0000 1.4
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x70
RenderBody {BODY} at (8,8) size 784x54
RenderText {TEXT} at (0,0) size 771x54
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 364: "If you see nothing at all or see any red, the test has failed. "
text run at (668,0) width 67: "This test is"
text run at (0,18) width 293: "checking to make sure overflow is done using "
1.5 +1 -2 WebCore/layout-tests/fast/clip/007-expected.txt
Index: 007-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/007-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 007-expected.txt 19 Oct 2004 23:28:50 -0000 1.4
+++ 007-expected.txt 19 Jul 2005 21:18:17 -0000 1.5
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x70
RenderBody {BODY} at (8,8) size 784x54
RenderText {TEXT} at (0,0) size 739x54
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 364: "If you see nothing at all or see any red, the test has failed. "
text run at (668,0) width 67: "This test is"
text run at (0,18) width 293: "checking to make sure overflow is done using "
1.5 +1 -2 WebCore/layout-tests/fast/clip/008-expected.txt
Index: 008-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/008-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 008-expected.txt 19 Oct 2004 23:28:50 -0000 1.4
+++ 008-expected.txt 19 Jul 2005 21:18:17 -0000 1.5
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x70
RenderBody {BODY} at (8,8) size 784x54
RenderText {TEXT} at (0,0) size 739x54
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 364: "If you see nothing at all or see any red, the test has failed. "
text run at (668,0) width 67: "This test is"
text run at (0,18) width 293: "checking to make sure overflow is done using "
1.3 +1 -2 WebCore/layout-tests/fast/clip/009-expected.txt
Index: 009-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/009-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 009-expected.txt 24 Oct 2003 21:20:29 -0000 1.2
+++ 009-expected.txt 19 Jul 2005 21:18:17 -0000 1.3
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x52
RenderBody {BODY} at (8,8) size 784x36
RenderText {TEXT} at (0,0) size 780x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 239: "This test is checking to make sure clip"
text run at (0,18) width 192: "is applying to all descendants. "
1.3 +1 -2 WebCore/layout-tests/fast/clip/010-expected.txt
Index: 010-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/010-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 010-expected.txt 24 Oct 2003 21:20:29 -0000 1.2
+++ 010-expected.txt 19 Jul 2005 21:18:17 -0000 1.3
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x52
RenderBody {BODY} at (8,8) size 784x36
RenderText {TEXT} at (0,0) size 780x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 239: "This test is checking to make sure clip"
text run at (0,18) width 192: "is applying to all descendants. "
1.3 +1 -2 WebCore/layout-tests/fast/clip/011-expected.txt
Index: 011-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/011-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 011-expected.txt 24 Oct 2003 21:20:29 -0000 1.2
+++ 011-expected.txt 19 Jul 2005 21:18:17 -0000 1.3
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x52
RenderBody {BODY} at (8,8) size 784x36
RenderText {TEXT} at (0,0) size 780x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 239: "This test is checking to make sure clip"
text run at (0,18) width 192: "is applying to all descendants. "
1.3 +1 -2 WebCore/layout-tests/fast/clip/012-expected.txt
Index: 012-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/012-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 012-expected.txt 24 Oct 2003 21:20:29 -0000 1.2
+++ 012-expected.txt 19 Jul 2005 21:18:18 -0000 1.3
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x52
RenderBody {BODY} at (8,8) size 784x36
RenderText {TEXT} at (0,0) size 780x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 239: "This test is checking to make sure clip"
text run at (0,18) width 192: "is applying to all descendants. "
1.4 +1 -2 WebCore/layout-tests/fast/clip/013-expected.txt
Index: 013-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/013-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 013-expected.txt 16 Nov 2003 23:02:17 -0000 1.3
+++ 013-expected.txt 19 Jul 2005 21:18:18 -0000 1.4
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x52
RenderBody {BODY} at (8,8) size 784x36
RenderText {TEXT} at (0,0) size 780x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 239: "This test is checking to make sure clip"
text run at (0,18) width 377: "applies to the element itself and starts from the border edge. "
1.6 +1 -2 WebCore/layout-tests/fast/clip/014-expected.txt
Index: 014-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/014-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 014-expected.txt 21 Oct 2004 00:23:33 -0000 1.5
+++ 014-expected.txt 19 Jul 2005 21:18:18 -0000 1.6
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x70
RenderBody {BODY} at (8,8) size 784x54
RenderText {TEXT} at (0,0) size 770x54
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 268: "x100 green square with a scrollbar below. "
+ text run at (0,0) width 405: "You should see a 100x100 green square with a scrollbar below. "
text run at (405,0) width 237: "If you see any red, the test has failed. "
text run at (642,0) width 128: "This test is checking"
text run at (0,18) width 617: "to make sure clip applies to the element itself, starts from the border edge, and clips out scrollbars. "
1.4 +1 -2 WebCore/layout-tests/fast/clip/015-expected.txt
Index: 015-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/015-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 015-expected.txt 21 Oct 2004 00:23:33 -0000 1.3
+++ 015-expected.txt 19 Jul 2005 21:18:18 -0000 1.4
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x118
RenderBlock (anonymous) at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 736x18
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 432: "This test makes sure overflow uses containing blocks when clipping."
layer at (8,26) size 100x100 scrollWidth 200 scrollHeight 200
RenderBlock {DIV} at (0,18) size 100x100 [bgcolor=#008000]
1.3 +1 -2 WebCore/layout-tests/fast/clip/016-expected.txt
Index: 016-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/clip/016-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 016-expected.txt 26 Apr 2004 21:19:01 -0000 1.2
+++ 016-expected.txt 19 Jul 2005 21:18:18 -0000 1.3
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {TEXT} at (0,0) size 300x18
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 163: "x100 green square below."
+ text run at (0,0) width 300: "You should see a 100x100 green square below."
RenderText {TEXT} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
layer at (50,50) size 100x500 backgroundClip at (50,50) size 100x100 clip at (50,50) size 100x100
1.3 +1 -3 WebCore/layout-tests/fast/css/008-expected.txt
Index: 008-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/css/008-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 008-expected.txt 7 Jan 2005 20:38:19 -0000 1.2
+++ 008-expected.txt 19 Jul 2005 21:18:19 -0000 1.3
@@ -5,6 +5,4 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x48 [border: (10px solid #808000)]
RenderText {TEXT} at (10,10) size 563x28
- text run at (10,10) width 178: "You should see 24"
- text run at (188,10) width 178: "px text inside a 10"
- text run at (366,10) width 207: "px solid olive border."
+ text run at (10,10) width 563: "You should see 24px text inside a 10px solid olive border."
1.3 +4 -9 WebCore/layout-tests/fast/css/MarqueeLayoutTest-expected.txt
Index: MarqueeLayoutTest-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/css/MarqueeLayoutTest-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MarqueeLayoutTest-expected.txt 12 Jul 2005 20:26:42 -0000 1.2
+++ MarqueeLayoutTest-expected.txt 19 Jul 2005 21:18:19 -0000 1.3
@@ -15,15 +15,12 @@
text run at (0,18) width 773: "Because marquee is a WinIE element, we are honoring their treatment of the heigh attribute by making sure it is overridden"
text run at (0,36) width 101: "when the given "
text run at (101,36) width 645: "height is smaller than the font height. We also make sure that the default height of a vertical marquee is"
- text run at (0,54) width 24: "200"
- text run at (24,54) width 20: "px."
+ text run at (0,54) width 44: "200px."
RenderBlock {P} at (0,122) size 784x36
RenderText {TEXT} at (0,0) size 773x36
text run at (0,0) width 773: "If successful, in the horizontal group, the pink marquee should be large, and the others should all be the same size. None of"
text run at (0,18) width 50: "the text "
- text run at (50,18) width 453: "should be cut off. In the vertical group, the aqua marquee should be 200"
- text run at (503,18) width 205: "px, and the others should be 100"
- text run at (708,18) width 20: "px."
+ text run at (50,18) width 678: "should be cut off. In the vertical group, the aqua marquee should be 200px, and the others should be 100px."
RenderBlock {HR} at (0,174) size 784x2 [border: (1px inset #000000)]
RenderBlock (anonymous) at (0,184) size 784x508
RenderText {TEXT} at (0,0) size 0x0
@@ -39,8 +36,7 @@
RenderBR {BR} at (0,186) size 0x18
RenderBlock {DIV} at (0,204) size 113x200 [bgcolor=#008000]
RenderText {TEXT} at (0,0) size 113x18
- text run at (0,0) width 70: "This is 200"
- text run at (70,0) width 43: "px tall."
+ text run at (0,0) width 113: "This is 200px tall."
RenderText {TEXT} at (113,390) size 4x18
text run at (113,390) width 4: " "
RenderText {TEXT} at (317,390) size 4x18
@@ -50,8 +46,7 @@
RenderText {TEXT} at (0,0) size 0x0
RenderBlock {DIV} at (0,408) size 113x100 [bgcolor=#008000]
RenderText {TEXT} at (0,0) size 113x18
- text run at (0,0) width 70: "This is 100"
- text run at (70,0) width 43: "px tall."
+ text run at (0,0) width 113: "This is 100px tall."
RenderText {TEXT} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
layer at (8,192) size 784x16 scrollX -769 scrollWidth 1692 scrollHeight 18
1.2 +1 -2 WebCore/layout-tests/fast/css/apple-prefix-expected.txt
Index: apple-prefix-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/css/apple-prefix-expected.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apple-prefix-expected.txt 22 Jun 2005 21:05:59 -0000 1.1
+++ apple-prefix-expected.txt 19 Jul 2005 21:18:19 -0000 1.2
@@ -16,8 +16,7 @@
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 781x36
text run at (0,0) width 771: "It was just last night, I think, that I was IM'ing with a friend and I said, \"Next week Simon starts going to school for 3 days"
- text run at (0,18) width 106: "extended (until 3"
- text run at (106,18) width 675: "pm) and Sophia starts swim camp! I won't know what to do with my free time! But I'm willing to find out.\""
+ text run at (0,18) width 781: "extended (until 3pm) and Sophia starts swim camp! I won't know what to do with my free time! But I'm willing to find out.\""
RenderBlock {P} at (0,52) size 784x18
RenderText {TEXT} at (0,0) size 333x18
text run at (0,0) width 333: "You know the old saying: \"Man plans, God laughs.\""
1.3 +1 -2 WebCore/layout-tests/fast/css-generated-content/012-expected.txt
Index: 012-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/css-generated-content/012-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 012-expected.txt 26 Apr 2004 21:19:01 -0000 1.2
+++ 012-expected.txt 19 Jul 2005 21:18:20 -0000 1.3
@@ -13,8 +13,7 @@
RenderText {TEXT} at (55,45) size 780x123
text run at (55,45) width 726: "ere is the first paragraph. Here the CSS :first-line rule sets the text to"
text run at (1,84) width 232: "a green, sans-serif font. "
- text run at (233,84) width 505: "Then, the CSS :first-letter rule sets the font size to 3"
- text run at (738,84) width 36: "em,"
+ text run at (233,84) width 541: "Then, the CSS :first-letter rule sets the font size to 3em,"
text run at (1,112) width 743: "and makes the text bold. And here's some more text to pad out the paragraph"
text run at (1,140) width 723: "and make things look nice (or, at least, to illustrate the problem correctly)."
RenderBlock {P} at (0,280) size 784x142 [bgcolor=#EEEEEE] [border: (1px solid #000000)]
1.6 +1 -2 WebCore/layout-tests/fast/dom/quadraticCurveTo-expected.txt
Index: quadraticCurveTo-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/dom/quadraticCurveTo-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quadraticCurveTo-expected.txt 6 Jul 2005 18:49:04 -0000 1.5
+++ quadraticCurveTo-expected.txt 19 Jul 2005 21:18:20 -0000 1.6
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,16) size 784x18
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 420x18
- text run at (0,0) width 358: "\x{9}\x{9}\x{9}This test case should produce a sine-wave stroked with 1"
- text run at (358,0) width 62: "px black. "
+ text run at (0,0) width 420: "\x{9}\x{9}\x{9}This test case should produce a sine-wave stroked with 1px black. "
text run at (420,0) width 0: "\x{9}\x{9}"
RenderBlock (anonymous) at (0,50) size 800x364
RenderCanvasImage {CANVAS} at (0,0) size 480x360
1.2 +1 -2 WebCore/layout-tests/fast/dynamic/noninlinebadness-expected.txt
Index: noninlinebadness-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/dynamic/noninlinebadness-expected.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- noninlinebadness-expected.txt 22 Oct 2004 01:08:56 -0000 1.1
+++ noninlinebadness-expected.txt 19 Jul 2005 21:18:20 -0000 1.2
@@ -8,7 +8,6 @@
RenderBlock {DIV} at (0,0) size 200x200 [bgcolor=#00FF00]
RenderBlock (anonymous) at (0,200) size 784x36
RenderText {TEXT} at (0,0) size 725x36
- text run at (0,0) width 233: "This text should be underneath a 200"
- text run at (233,0) width 103: "x200 lime float. "
+ text run at (0,0) width 336: "This text should be underneath a 200x200 lime float. "
text run at (336,0) width 389: "We are making sure that the code that wraps inline children in"
text run at (0,18) width 608: "anonymous blocks does the right thing when blocks are inserted in between a float and an inline."
1.17 +2 -4 WebCore/layout-tests/fast/encoding/utf-16-big-endian-expected.txt
Index: utf-16-big-endian-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/encoding/utf-16-big-endian-expected.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- utf-16-big-endian-expected.txt 14 Jun 2005 22:37:08 -0000 1.16
+++ utf-16-big-endian-expected.txt 19 Jul 2005 21:18:20 -0000 1.17
@@ -192,8 +192,7 @@
text run at (2,2) width 94: "HAO,SCOTT"
RenderTableCell {TD} at (98,22) size 37x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {TEXT} at (2,2) size 29x18
- text run at (2,2) width 18: "08"
- text run at (20,2) width 11: "A"
+ text run at (2,2) width 29: "08A"
RenderTableCell {TD} at (135,22) size 78x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {TEXT} at (2,2) size 74x18
text run at (2,2) width 74: "confirmed "
@@ -289,8 +288,7 @@
text run at (2,2) width 94: "HAO,SCOTT"
RenderTableCell {TD} at (98,22) size 37x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {TEXT} at (2,2) size 28x18
- text run at (2,2) width 18: "13"
- text run at (20,2) width 10: "F"
+ text run at (2,2) width 28: "13F"
RenderTableCell {TD} at (135,22) size 78x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {TEXT} at (2,2) size 74x18
text run at (2,2) width 74: "confirmed "
1.17 +2 -4 WebCore/layout-tests/fast/encoding/utf-16-little-endian-expected.txt
Index: utf-16-little-endian-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/encoding/utf-16-little-endian-expected.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- utf-16-little-endian-expected.txt 14 Jun 2005 22:37:08 -0000 1.16
+++ utf-16-little-endian-expected.txt 19 Jul 2005 21:18:20 -0000 1.17
@@ -192,8 +192,7 @@
text run at (2,2) width 94: "HAO,SCOTT"
RenderTableCell {TD} at (98,22) size 37x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {TEXT} at (2,2) size 29x18
- text run at (2,2) width 18: "08"
- text run at (20,2) width 11: "A"
+ text run at (2,2) width 29: "08A"
RenderTableCell {TD} at (135,22) size 78x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {TEXT} at (2,2) size 74x18
text run at (2,2) width 74: "confirmed "
@@ -289,8 +288,7 @@
text run at (2,2) width 94: "HAO,SCOTT"
RenderTableCell {TD} at (98,22) size 37x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
RenderText {TEXT} at (2,2) size 28x18
- text run at (2,2) width 18: "13"
- text run at (20,2) width 10: "F"
+ text run at (2,2) width 28: "13F"
RenderTableCell {TD} at (135,22) size 78x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1]
RenderText {TEXT} at (2,2) size 74x18
text run at (2,2) width 74: "confirmed "
1.4 +1 -2 WebCore/layout-tests/fast/flexbox/001-expected.txt
Index: 001-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/001-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 001-expected.txt 26 Apr 2004 21:19:01 -0000 1.3
+++ 001-expected.txt 19 Jul 2005 21:18:21 -0000 1.4
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x576
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 609x18
- text run at (0,0) width 178: "You should see a single 100"
- text run at (178,0) width 431: "x100 green square below. If you see any red, then the test has failed."
+ text run at (0,0) width 609: "You should see a single 100x100 green square below. If you see any red, then the test has failed."
layer at (10,42) size 100x100
RenderFlexibleBox (positioned) {DIV} at (10,42) size 100x100 [bgcolor=#FF0000]
RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
1.4 +1 -2 WebCore/layout-tests/fast/flexbox/004-expected.txt
Index: 004-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/004-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 004-expected.txt 26 Apr 2004 21:19:01 -0000 1.3
+++ 004-expected.txt 19 Jul 2005 21:18:21 -0000 1.4
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 757x36
- text run at (0,0) width 176: "You should see a green 100"
- text run at (176,0) width 111: "x100 box below. "
+ text run at (0,0) width 287: "You should see a green 100x100 box below. "
text run at (287,0) width 470: "If you see a red box, then the inner block is not properly growing to fill the"
text run at (0,18) width 175: "height of the enclosing box."
RenderFlexibleBox {DIV} at (0,52) size 100x100 [bgcolor=#FF0000]
1.7 +1 -2 WebCore/layout-tests/fast/flexbox/007-expected.txt
Index: 007-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/007-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 007-expected.txt 19 Oct 2004 23:28:50 -0000 1.6
+++ 007-expected.txt 19 Jul 2005 21:18:21 -0000 1.7
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 752x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 345: "x100 green square below enclosed by an olive border. "
+ text run at (0,0) width 482: "You should see a 100x100 green square below enclosed by an olive border. "
text run at (482,0) width 270: "If you see any red, the test has failed. If the"
text run at (0,18) width 440: "border does not fully enclose the green square, then the test has failed."
RenderBlock {P} at (0,52) size 784x36
1.8 +1 -2 WebCore/layout-tests/fast/flexbox/008-expected.txt
Index: 008-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/008-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 008-expected.txt 19 Oct 2004 23:28:50 -0000 1.7
+++ 008-expected.txt 19 Jul 2005 21:18:21 -0000 1.8
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 780x36
- text run at (0,0) width 137: "You should see a 200"
- text run at (137,0) width 167: "x200 green square below. "
+ text run at (0,0) width 304: "You should see a 200x200 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 239: "This test is checking to make sure that"
text run at (0,18) width 517: "boxes will shift to avoid floats that try to intrude into their space (just as tables do)."
1.7 +2 -4 WebCore/layout-tests/fast/flexbox/009-expected.txt
Index: 009-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/009-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 009-expected.txt 21 Oct 2004 00:23:33 -0000 1.6
+++ 009-expected.txt 19 Jul 2005 21:18:21 -0000 1.7
@@ -5,11 +5,9 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 754x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 414: "x100 olive-bordered green square below with a vertical scrollbar. "
+ text run at (0,0) width 551: "You should see a 100x100 olive-bordered green square below with a vertical scrollbar. "
text run at (551,0) width 203: "The scrollable area should all be"
- text run at (0,18) width 202: "green and should be about 1000"
- text run at (202,18) width 47: "px tall. "
+ text run at (0,18) width 249: "green and should be about 1000px tall. "
text run at (249,18) width 326: "If you do not see a scrollbar, then the test has failed."
layer at (8,60) size 104x104 clip at (10,62) size 85x100 scrollHeight 1000
RenderFlexibleBox {DIV} at (0,52) size 104x104 [bgcolor=#008000] [border: (2px solid #808000)]
1.5 +1 -2 WebCore/layout-tests/fast/flexbox/010-expected.txt
Index: 010-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/010-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 010-expected.txt 26 Apr 2004 21:19:01 -0000 1.4
+++ 010-expected.txt 19 Jul 2005 21:18:21 -0000 1.5
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 765x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 268: "If you see any red, then the test has failed. "
text run at (572,0) width 193: "This test is ensuring that boxes"
text run at (0,18) width 330: "can act as containing blocks for positioned elements."
1.5 +1 -2 WebCore/layout-tests/fast/flexbox/012-expected.txt
Index: 012-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/012-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 012-expected.txt 26 Apr 2004 21:19:01 -0000 1.4
+++ 012-expected.txt 19 Jul 2005 21:18:21 -0000 1.5
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x54
RenderText {TEXT} at (0,0) size 784x54
- text run at (0,0) width 137: "You should see a 300"
- text run at (137,0) width 183: "x100 green rectangle below. "
+ text run at (0,0) width 320: "You should see a 300x100 green rectangle below. "
text run at (320,0) width 464: "If you see any red, the test has failed. This test makes a positioned vertical"
text run at (0,18) width 154: "box with three children. "
text run at (154,18) width 482: "The first and third children are absolutely positioned at the edges of the box. "
1.4 +1 -2 WebCore/layout-tests/fast/flexbox/013-expected.txt
Index: 013-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/013-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 013-expected.txt 26 Apr 2004 21:19:01 -0000 1.3
+++ 013-expected.txt 19 Jul 2005 21:18:21 -0000 1.4
@@ -5,7 +5,6 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 609x18
- text run at (0,0) width 178: "You should see a single 100"
- text run at (178,0) width 431: "x100 green square below. If you see any red, then the test has failed."
+ text run at (0,0) width 609: "You should see a single 100x100 green square below. If you see any red, then the test has failed."
RenderFlexibleBox {DIV} at (0,34) size 100x100 [bgcolor=#FF0000]
RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
1.4 +1 -2 WebCore/layout-tests/fast/flexbox/014-expected.txt
Index: 014-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/014-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 014-expected.txt 26 Apr 2004 21:19:01 -0000 1.3
+++ 014-expected.txt 19 Jul 2005 21:18:21 -0000 1.4
@@ -5,7 +5,6 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 609x18
- text run at (0,0) width 178: "You should see a single 100"
- text run at (178,0) width 431: "x100 green square below. If you see any red, then the test has failed."
+ text run at (0,0) width 609: "You should see a single 100x100 green square below. If you see any red, then the test has failed."
RenderFlexibleBox {DIV} at (0,34) size 100x100 [bgcolor=#FF0000]
RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]
1.4 +1 -2 WebCore/layout-tests/fast/flexbox/015-expected.txt
Index: 015-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/015-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 015-expected.txt 26 Apr 2004 21:19:01 -0000 1.3
+++ 015-expected.txt 19 Jul 2005 21:18:21 -0000 1.4
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 609x18
- text run at (0,0) width 178: "You should see a single 100"
- text run at (178,0) width 431: "x100 green square below. If you see any red, then the test has failed."
+ text run at (0,0) width 609: "You should see a single 100x100 green square below. If you see any red, then the test has failed."
RenderFlexibleBox {DIV} at (0,34) size 300x100
RenderFlexibleBox {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
RenderFlexibleBox {DIV} at (0,0) size 0x100
1.5 +1 -2 WebCore/layout-tests/fast/flexbox/018-expected.txt
Index: 018-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/018-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 018-expected.txt 26 Apr 2004 21:19:01 -0000 1.4
+++ 018-expected.txt 19 Jul 2005 21:18:21 -0000 1.5
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 770x36
- text run at (0,0) width 137: "You should see a 350"
- text run at (137,0) width 385: "x350 pixel (7 by 7) black/white checkerboard pattern below. "
+ text run at (0,0) width 522: "You should see a 350x350 pixel (7 by 7) black/white checkerboard pattern below. "
text run at (522,0) width 248: "This test is checking to see if box-pack:"
text run at (0,18) width 123: "justify is supported."
RenderFlexibleBox {DIV} at (0,52) size 358x358 [border: (4px solid #800000)]
1.5 +1 -2 WebCore/layout-tests/fast/flexbox/019-expected.txt
Index: 019-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/019-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 019-expected.txt 26 Apr 2004 21:19:01 -0000 1.4
+++ 019-expected.txt 19 Jul 2005 21:18:21 -0000 1.5
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 770x36
- text run at (0,0) width 137: "You should see a 350"
- text run at (137,0) width 385: "x350 pixel (7 by 7) black/white checkerboard pattern below. "
+ text run at (0,0) width 522: "You should see a 350x350 pixel (7 by 7) black/white checkerboard pattern below. "
text run at (522,0) width 248: "This test is checking to see if box-pack:"
text run at (0,18) width 123: "justify is supported."
RenderFlexibleBox {DIV} at (0,52) size 358x358 [border: (4px solid #800000)]
1.5 +1 -2 WebCore/layout-tests/fast/flexbox/020-expected.txt
Index: 020-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/020-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 020-expected.txt 26 Apr 2004 21:19:01 -0000 1.4
+++ 020-expected.txt 19 Jul 2005 21:18:21 -0000 1.5
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 753x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 212: "This test is checking for box-flex-"
text run at (0,18) width 92: "group support."
1.5 +1 -2 WebCore/layout-tests/fast/flexbox/021-expected.txt
Index: 021-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/021-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 021-expected.txt 3 Sep 2004 17:14:06 -0000 1.4
+++ 021-expected.txt 19 Jul 2005 21:18:21 -0000 1.5
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 691x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 150: "This test is checking for"
text run at (0,18) width 164: "visibility:collapse support."
1.6 +1 -2 WebCore/layout-tests/fast/flexbox/022-expected.txt
Index: 022-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/022-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 022-expected.txt 26 Apr 2004 21:19:01 -0000 1.5
+++ 022-expected.txt 19 Jul 2005 21:18:21 -0000 1.6
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x36
RenderText {TEXT} at (0,0) size 753x36
- text run at (0,0) width 137: "You should see a 100"
- text run at (137,0) width 167: "x100 green square below. "
+ text run at (0,0) width 304: "You should see a 100x100 green square below. "
text run at (304,0) width 237: "If you see any red, the test has failed. "
text run at (541,0) width 212: "This test is checking to make sure"
text run at (0,18) width 431: "inlines get wrapped in anonymous blocks when placed inside boxes."
1.4 +1 -2 WebCore/layout-tests/fast/flexbox/023-expected.txt
Index: 023-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/023-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 023-expected.txt 26 Apr 2004 21:19:01 -0000 1.3
+++ 023-expected.txt 19 Jul 2005 21:18:21 -0000 1.4
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x54
RenderText {TEXT} at (0,0) size 783x54
- text run at (0,0) width 178: "You should see a single 100"
- text run at (178,0) width 599: "x100 green square below. If your browser supports the display of ALT text, you should see the"
+ text run at (0,0) width 777: "You should see a single 100x100 green square below. If your browser supports the display of ALT text, you should see the"
text run at (0,18) width 246: "word \"Image\" inside the green square. "
text run at (246,18) width 268: "If you see any red, then the test has failed. "
text run at (514,18) width 269: "This test is checking to make sure replaced"
1.4 +1 -2 WebCore/layout-tests/fast/flexbox/024-expected.txt
Index: 024-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/flexbox/024-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 024-expected.txt 26 Apr 2004 21:19:01 -0000 1.3
+++ 024-expected.txt 19 Jul 2005 21:18:21 -0000 1.4
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x54
RenderText {TEXT} at (0,0) size 783x54
- text run at (0,0) width 178: "You should see a single 100"
- text run at (178,0) width 599: "x100 green square below. If your browser supports the display of ALT text, you should see the"
+ text run at (0,0) width 777: "You should see a single 100x100 green square below. If your browser supports the display of ALT text, you should see the"
text run at (0,18) width 246: "word \"Image\" inside the green square. "
text run at (246,18) width 268: "If you see any red, then the test has failed. "
text run at (514,18) width 269: "This test is checking to make sure replaced"
1.4 +1 -2 WebCore/layout-tests/fast/invalid/012-expected.txt
Index: 012-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/invalid/012-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 012-expected.txt 26 Apr 2004 21:19:02 -0000 1.3
+++ 012-expected.txt 19 Jul 2005 21:18:23 -0000 1.4
@@ -6,8 +6,7 @@
RenderBlock {CENTER} at (0,0) size 784x18
RenderInline {FONT} at (0,0) size 298x18
RenderText {TEXT} at (243,0) size 298x18
- text run at (243,0) width 137: "You should see a 100"
- text run at (380,0) width 161: "x100 green Image below."
+ text run at (243,0) width 298: "You should see a 100x100 green Image below."
RenderBlock (anonymous) at (0,18) size 784x100
RenderInline {FONT} at (0,0) size 100x14
RenderText {TEXT} at (0,0) size 0x0
1.5 +1 -2 WebCore/layout-tests/fast/invalid/016-expected.txt
Index: 016-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/invalid/016-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 016-expected.txt 26 Apr 2004 21:19:02 -0000 1.4
+++ 016-expected.txt 19 Jul 2005 21:18:23 -0000 1.5
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x576
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 734x18
- text run at (0,0) width 154: "You should see two 100"
- text run at (154,0) width 294: "x100 green squares with black borders below. "
+ text run at (0,0) width 448: "You should see two 100x100 green squares with black borders below. "
text run at (448,0) width 286: "If you see only one square, the test has failed."
RenderBlock {P} at (0,34) size 784x104
RenderImage {IMG} at (0,0) size 104x104 [bgcolor=#008000] [border: (2px solid #000000)]
1.3 +2 -4 WebCore/layout-tests/fast/invalid/nestedh3s-expected.txt
Index: nestedh3s-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/invalid/nestedh3s-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nestedh3s-expected.txt 6 Jul 2005 00:21:51 -0000 1.2
+++ nestedh3s-expected.txt 19 Jul 2005 21:18:23 -0000 1.3
@@ -5,12 +5,10 @@
RenderBody {BODY} at (8,8) size 784x574
RenderBlock (anonymous) at (0,0) size 784x54
RenderText {TEXT} at (0,0) size 758x54
- text run at (0,0) width 138: "In this sample, the H3"
- text run at (138,0) width 147: "s should not be nested. "
+ text run at (0,0) width 285: "In this sample, the H3s should not be nested. "
text run at (285,0) width 347: "While WinIE does allow the nesting, Firefox does not. "
text run at (632,0) width 120: "We have chosen to"
- text run at (0,18) width 203: "match Firefox, since we size H3"
- text run at (203,18) width 555: "s based off the current font size, and therefore nesting would lead to ever-increasing font"
+ text run at (0,18) width 758: "match Firefox, since we size H3s based off the current font size, and therefore nesting would lead to ever-increasing font"
text run at (0,36) width 34: "sizes."
RenderBlock {H3} at (0,72) size 784x30 [border: (2px solid #FF0000)]
RenderInline {I} at (0,0) size 33x22
1.8 +1 -2 WebCore/layout-tests/fast/lists/003-expected.txt
Index: 003-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/lists/003-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 003-expected.txt 6 Jul 2005 00:21:52 -0000 1.7
+++ 003-expected.txt 19 Jul 2005 21:18:23 -0000 1.8
@@ -190,8 +190,7 @@
RenderListMarker at (646,0) size 0x14
RenderInline {A} at (0,0) size 98x18 [color=#0000EE]
RenderText {TEXT} at (646,0) size 98x18
- text run at (646,0) width 78: "Dive Into J2"
- text run at (724,0) width 20: "EE"
+ text run at (646,0) width 98: "Dive Into J2EE"
RenderListItem {LI} at (40,72) size 744x18
RenderListMarker at (635,0) size 0x14
RenderInline {A} at (0,0) size 109x18 [color=#0000EE]
1.5 +1 -2 WebCore/layout-tests/fast/replaced/004-expected.txt
Index: 004-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/replaced/004-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 004-expected.txt 11 Dec 2003 19:46:18 -0000 1.4
+++ 004-expected.txt 19 Jul 2005 21:18:24 -0000 1.5
@@ -6,8 +6,7 @@
RenderBlock {P} at (0,0) size 784x18
RenderText {TEXT} at (0,0) size 756x18
text run at (0,0) width 386: "There should be no red below, just two 300\x{D7}100 pixel green "
- text run at (386,0) width 282: "rectangles of different shades, seperated by 1"
- text run at (668,0) width 88: "em of margin."
+ text run at (386,0) width 370: "rectangles of different shades, seperated by 1em of margin."
RenderBlock {DIV} at (0,34) size 300x100 [bgcolor=#FF0000]
RenderBlock {P} at (0,0) size 600x100
RenderImage {IMG} at (0,0) size 300x100
1.4 +54 -108 WebCore/layout-tests/fast/selectors/166-expected.txt
Index: 166-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/selectors/166-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 166-expected.txt 6 Jul 2005 00:21:52 -0000 1.3
+++ 166-expected.txt 19 Jul 2005 21:18:24 -0000 1.4
@@ -323,8 +323,7 @@
RenderText {TEXT} at (0,0) size 178x18
text run at (0,0) width 178: "Attribute multivalue selector"
RenderText {TEXT} at (178,0) size 38x18
- text run at (178,0) width 25: " (#7"
- text run at (203,0) width 13: "b)"
+ text run at (178,0) width 38: " (#7b)"
RenderListItem {LI} at (40,126) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 338x18 [color=#0000EE]
@@ -408,8 +407,7 @@
RenderText {TEXT} at (0,0) size 124x18
text run at (0,0) width 124: ":hover pseudo-class"
RenderText {TEXT} at (124,0) size 46x18
- text run at (124,0) width 33: " (#18"
- text run at (157,0) width 13: "b)"
+ text run at (124,0) width 46: " (#18b)"
RenderListItem {LI} at (40,342) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 125x18 [color=#0000EE]
@@ -437,16 +435,14 @@
RenderText {TEXT} at (0,0) size 123x18
text run at (0,0) width 123: ":target pseudo-class"
RenderText {TEXT} at (123,0) size 46x18
- text run at (123,0) width 33: " (#21"
- text run at (156,0) width 13: "b)"
+ text run at (123,0) width 46: " (#21b)"
RenderListItem {LI} at (40,414) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 123x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 123x18
text run at (0,0) width 123: ":target pseudo-class"
RenderText {TEXT} at (123,0) size 45x18
- text run at (123,0) width 33: " (#21"
- text run at (156,0) width 12: "c)"
+ text run at (123,0) width 45: " (#21c)"
RenderListItem {LI} at (40,432) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 125x18 [color=#0000EE]
@@ -495,8 +491,7 @@
RenderText {TEXT} at (0,0) size 154x18
text run at (0,0) width 154: ":nth-child() pseudo-class"
RenderText {TEXT} at (154,0) size 46x18
- text run at (154,0) width 33: " (#28"
- text run at (187,0) width 13: "b)"
+ text run at (154,0) width 46: " (#28b)"
RenderListItem {LI} at (40,558) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 180x18 [color=#0000EE]
@@ -510,8 +505,7 @@
RenderText {TEXT} at (0,0) size 180x18
text run at (0,0) width 180: ":nth-last-child() pseudo-class"
RenderText {TEXT} at (180,0) size 46x18
- text run at (180,0) width 33: " (#29"
- text run at (213,0) width 13: "b)"
+ text run at (180,0) width 46: " (#29b)"
RenderListItem {LI} at (40,594) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 168x18 [color=#0000EE]
@@ -588,24 +582,21 @@
RenderText {TEXT} at (0,0) size 358x18
text run at (0,0) width 358: "::first-letter pseudo-element with ::before pseudo-element"
RenderText {TEXT} at (358,0) size 45x18
- text run at (358,0) width 33: " (#39"
- text run at (391,0) width 12: "a)"
+ text run at (358,0) width 45: " (#39a)"
RenderListItem {LI} at (40,792) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 358x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 358x18
text run at (0,0) width 358: "::first-letter pseudo-element with ::before pseudo-element"
RenderText {TEXT} at (358,0) size 45x18
- text run at (358,0) width 33: " (#39"
- text run at (391,0) width 12: "a)"
+ text run at (358,0) width 45: " (#39a)"
RenderListItem {LI} at (40,810) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 171x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 171x18
text run at (0,0) width 171: "::first-letter pseudo-element"
RenderText {TEXT} at (171,0) size 46x18
- text run at (171,0) width 33: " (#39"
- text run at (204,0) width 13: "b)"
+ text run at (171,0) width 46: " (#39b)"
RenderListItem {LI} at (40,828) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 166x18 [color=#0000EE]
@@ -640,8 +631,7 @@
RenderText {TEXT} at (0,0) size 149x18
text run at (0,0) width 149: "Descendant combinator"
RenderText {TEXT} at (149,0) size 46x18
- text run at (149,0) width 33: " (#43"
- text run at (182,0) width 13: "b)"
+ text run at (149,0) width 46: " (#43b)"
RenderListItem {LI} at (40,918) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 110x18 [color=#0000EE]
@@ -655,24 +645,21 @@
RenderText {TEXT} at (0,0) size 110x18
text run at (0,0) width 110: "Child combinator"
RenderText {TEXT} at (110,0) size 46x18
- text run at (110,0) width 33: " (#44"
- text run at (143,0) width 13: "b)"
+ text run at (110,0) width 46: " (#44b)"
RenderListItem {LI} at (40,954) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 184x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 184x18
text run at (0,0) width 184: "Child combinator and classes"
RenderText {TEXT} at (184,0) size 45x18
- text run at (184,0) width 33: " (#44"
- text run at (217,0) width 12: "c)"
+ text run at (184,0) width 45: " (#44c)"
RenderListItem {LI} at (40,972) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 168x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 168x18
text run at (0,0) width 168: "Child combinatior and IDs"
RenderText {TEXT} at (168,0) size 46x18
- text run at (168,0) width 33: " (#44"
- text run at (201,0) width 13: "d)"
+ text run at (168,0) width 46: " (#44d)"
RenderListItem {LI} at (40,990) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 170x18 [color=#0000EE]
@@ -686,16 +673,14 @@
RenderText {TEXT} at (0,0) size 170x18
text run at (0,0) width 170: "Direct adjacent combinator"
RenderText {TEXT} at (170,0) size 46x18
- text run at (170,0) width 33: " (#45"
- text run at (203,0) width 13: "b)"
+ text run at (170,0) width 46: " (#45b)"
RenderListItem {LI} at (40,1026) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 244x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 244x18
text run at (0,0) width 244: "Direct adjacent combinator and classes"
RenderText {TEXT} at (244,0) size 45x18
- text run at (244,0) width 33: " (#45"
- text run at (277,0) width 12: "c)"
+ text run at (244,0) width 45: " (#45c)"
RenderListItem {LI} at (40,1044) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 179x18 [color=#0000EE]
@@ -709,8 +694,7 @@
RenderText {TEXT} at (0,0) size 179x18
text run at (0,0) width 179: "Indirect adjacent combinator"
RenderText {TEXT} at (179,0) size 46x18
- text run at (179,0) width 33: " (#46"
- text run at (212,0) width 13: "b)"
+ text run at (179,0) width 46: " (#46b)"
RenderListItem {LI} at (40,1080) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 395x18 [color=#0000EE]
@@ -801,8 +785,7 @@
RenderText {TEXT} at (0,0) size 205x18
text run at (0,0) width 205: "NEGATED :target pseudo-class"
RenderText {TEXT} at (205,0) size 46x18
- text run at (205,0) width 33: " (#66"
- text run at (238,0) width 13: "b)"
+ text run at (205,0) width 46: " (#66b)"
RenderListItem {LI} at (40,1314) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 207x18 [color=#0000EE]
@@ -830,8 +813,7 @@
RenderText {TEXT} at (0,0) size 195x18
text run at (0,0) width 195: "NEGATED :root pseudo-class"
RenderText {TEXT} at (195,0) size 46x18
- text run at (195,0) width 33: " (#72"
- text run at (228,0) width 13: "b)"
+ text run at (195,0) width 46: " (#72b)"
RenderListItem {LI} at (40,1386) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 236x18 [color=#0000EE]
@@ -845,8 +827,7 @@
RenderText {TEXT} at (0,0) size 236x18
text run at (0,0) width 236: "NEGATED :nth-child() pseudo-class"
RenderText {TEXT} at (236,0) size 46x18
- text run at (236,0) width 33: " (#73"
- text run at (269,0) width 13: "b)"
+ text run at (236,0) width 46: " (#73b)"
RenderListItem {LI} at (40,1422) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 262x18 [color=#0000EE]
@@ -860,8 +841,7 @@
RenderText {TEXT} at (0,0) size 262x18
text run at (0,0) width 262: "NEGATED :nth-last-child() pseudo-class"
RenderText {TEXT} at (262,0) size 46x18
- text run at (262,0) width 33: " (#74"
- text run at (295,0) width 13: "b)"
+ text run at (262,0) width 46: " (#74b)"
RenderListItem {LI} at (40,1458) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 250x18 [color=#0000EE]
@@ -875,8 +855,7 @@
RenderText {TEXT} at (0,0) size 250x18
text run at (0,0) width 250: "NEGATED :nth-of-type() pseudo-class"
RenderText {TEXT} at (250,0) size 46x18
- text run at (250,0) width 33: " (#75"
- text run at (283,0) width 13: "b)"
+ text run at (250,0) width 46: " (#75b)"
RenderListItem {LI} at (40,1494) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 276x18 [color=#0000EE]
@@ -890,8 +869,7 @@
RenderText {TEXT} at (0,0) size 276x18
text run at (0,0) width 276: "NEGATED :nth-last-of-type() pseudo-class"
RenderText {TEXT} at (276,0) size 46x18
- text run at (276,0) width 33: " (#76"
- text run at (309,0) width 13: "b)"
+ text run at (276,0) width 46: " (#76b)"
RenderListItem {LI} at (40,1530) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 230x18 [color=#0000EE]
@@ -905,8 +883,7 @@
RenderText {TEXT} at (0,0) size 230x18
text run at (0,0) width 230: "NEGATED :first-child pseudo-class"
RenderText {TEXT} at (230,0) size 46x18
- text run at (230,0) width 33: " (#77"
- text run at (263,0) width 13: "b)"
+ text run at (230,0) width 46: " (#77b)"
RenderListItem {LI} at (40,1566) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 227x18 [color=#0000EE]
@@ -920,8 +897,7 @@
RenderText {TEXT} at (0,0) size 227x18
text run at (0,0) width 227: "NEGATED :last-child pseudo-class"
RenderText {TEXT} at (227,0) size 46x18
- text run at (227,0) width 33: " (#78"
- text run at (260,0) width 13: "b)"
+ text run at (227,0) width 46: " (#78b)"
RenderListItem {LI} at (40,1602) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 244x18 [color=#0000EE]
@@ -949,8 +925,7 @@
RenderText {TEXT} at (0,0) size 234x18
text run at (0,0) width 234: "NEGATED :only-child pseudo-class"
RenderText {TEXT} at (234,0) size 46x18
- text run at (234,0) width 33: " (#81"
- text run at (267,0) width 13: "b)"
+ text run at (234,0) width 46: " (#81b)"
RenderListItem {LI} at (40,1674) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 248x18 [color=#0000EE]
@@ -964,8 +939,7 @@
RenderText {TEXT} at (0,0) size 248x18
text run at (0,0) width 248: "NEGATED :only-of-type pseudo-class"
RenderText {TEXT} at (248,0) size 46x18
- text run at (248,0) width 33: " (#82"
- text run at (281,0) width 13: "b)"
+ text run at (248,0) width 46: " (#82b)"
RenderListItem {LI} at (40,1710) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 340x18 [color=#0000EE]
@@ -986,8 +960,7 @@
RenderText {TEXT} at (0,0) size 150x18
text run at (0,0) width 150: ":contains() pseudo-class"
RenderText {TEXT} at (150,0) size 46x18
- text run at (150,0) width 33: " (#84"
- text run at (183,0) width 13: "b)"
+ text run at (150,0) width 46: " (#84b)"
RenderListItem {LI} at (40,1764) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 232x18 [color=#0000EE]
@@ -1008,8 +981,7 @@
RenderText {TEXT} at (0,0) size 441x18
text run at (0,0) width 441: "Nondeterministic matching of direct and indirect adjacent combinators"
RenderText {TEXT} at (441,0) size 46x18
- text run at (441,0) width 33: " (#87"
- text run at (474,0) width 13: "b)"
+ text run at (441,0) width 46: " (#87b)"
RenderListItem {LI} at (40,1818) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 464x18 [color=#0000EE]
@@ -1023,8 +995,7 @@
RenderText {TEXT} at (0,0) size 464x18
text run at (0,0) width 464: "Nondeterministic matching of descendant and direct adjacent combinators"
RenderText {TEXT} at (464,0) size 46x18
- text run at (464,0) width 33: " (#88"
- text run at (497,0) width 13: "b)"
+ text run at (464,0) width 46: " (#88b)"
RenderListItem {LI} at (40,1854) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 360x18 [color=#0000EE]
@@ -1045,8 +1016,7 @@
RenderText {TEXT} at (0,0) size 397x18
text run at (0,0) width 397: "Simple combination of direct and indirect adjacent combinators"
RenderText {TEXT} at (397,0) size 46x18
- text run at (397,0) width 33: " (#90"
- text run at (430,0) width 13: "b)"
+ text run at (397,0) width 46: " (#90b)"
RenderListItem {LI} at (40,1908) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 288x18 [color=#0000EE]
@@ -1074,8 +1044,7 @@
RenderText {TEXT} at (0,0) size 256x18
text run at (0,0) width 256: ":empty pseudo-class and empty elements"
RenderText {TEXT} at (256,0) size 54x18
- text run at (256,0) width 41: " (#149"
- text run at (297,0) width 13: "b)"
+ text run at (256,0) width 54: " (#149b)"
RenderListItem {LI} at (40,1980) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 228x18 [color=#0000EE]
@@ -1110,32 +1079,28 @@
RenderText {TEXT} at (0,0) size 121x18
text run at (0,0) width 121: "Syntax and parsing"
RenderText {TEXT} at (121,0) size 53x18
- text run at (121,0) width 41: " (#155"
- text run at (162,0) width 12: "a)"
+ text run at (121,0) width 53: " (#155a)"
RenderListItem {LI} at (40,2070) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 121x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 121x18
text run at (0,0) width 121: "Syntax and parsing"
RenderText {TEXT} at (121,0) size 54x18
- text run at (121,0) width 41: " (#155"
- text run at (162,0) width 13: "b)"
+ text run at (121,0) width 54: " (#155b)"
RenderListItem {LI} at (40,2088) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 121x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 121x18
text run at (0,0) width 121: "Syntax and parsing"
RenderText {TEXT} at (121,0) size 53x18
- text run at (121,0) width 41: " (#155"
- text run at (162,0) width 12: "c)"
+ text run at (121,0) width 53: " (#155c)"
RenderListItem {LI} at (40,2106) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 121x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 121x18
text run at (0,0) width 121: "Syntax and parsing"
RenderText {TEXT} at (121,0) size 54x18
- text run at (121,0) width 41: " (#155"
- text run at (162,0) width 13: "d)"
+ text run at (121,0) width 54: " (#155d)"
RenderListItem {LI} at (40,2124) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 121x18 [color=#0000EE]
@@ -1149,16 +1114,14 @@
RenderText {TEXT} at (0,0) size 121x18
text run at (0,0) width 121: "Syntax and parsing"
RenderText {TEXT} at (121,0) size 54x18
- text run at (121,0) width 41: " (#156"
- text run at (162,0) width 13: "b)"
+ text run at (121,0) width 54: " (#156b)"
RenderListItem {LI} at (40,2160) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 121x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 121x18
text run at (0,0) width 121: "Syntax and parsing"
RenderText {TEXT} at (121,0) size 53x18
- text run at (121,0) width 41: " (#156"
- text run at (162,0) width 12: "c)"
+ text run at (121,0) width 53: " (#156c)"
RenderListItem {LI} at (40,2178) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 121x18 [color=#0000EE]
@@ -1235,8 +1198,7 @@
RenderText {TEXT} at (0,0) size 168x18
text run at (0,0) width 168: ":first-letter with ::first-letter"
RenderText {TEXT} at (168,0) size 53x18
- text run at (168,0) width 41: " (#166"
- text run at (209,0) width 12: "a)"
+ text run at (168,0) width 53: " (#166a)"
RenderListItem {LI} at (40,2376) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 152x18 [color=#0000EE]
@@ -1250,8 +1212,7 @@
RenderText {TEXT} at (0,0) size 152x18
text run at (0,0) width 152: ":first-line with ::first-line"
RenderText {TEXT} at (152,0) size 53x18
- text run at (152,0) width 41: " (#167"
- text run at (193,0) width 12: "a)"
+ text run at (152,0) width 53: " (#167a)"
RenderListItem {LI} at (40,2412) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 128x18 [color=#0000EE]
@@ -1265,8 +1226,7 @@
RenderText {TEXT} at (0,0) size 128x18
text run at (0,0) width 128: ":before with ::before"
RenderText {TEXT} at (128,0) size 53x18
- text run at (128,0) width 41: " (#168"
- text run at (169,0) width 12: "a)"
+ text run at (128,0) width 53: " (#168a)"
RenderListItem {LI} at (40,2448) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 104x18 [color=#0000EE]
@@ -1280,8 +1240,7 @@
RenderText {TEXT} at (0,0) size 104x18
text run at (0,0) width 104: ":after with ::after"
RenderText {TEXT} at (104,0) size 53x18
- text run at (104,0) width 41: " (#169"
- text run at (145,0) width 12: "a)"
+ text run at (104,0) width 53: " (#169a)"
RenderListItem {LI} at (40,2484) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 153x18 [color=#0000EE]
@@ -1295,56 +1254,49 @@
RenderText {TEXT} at (0,0) size 153x18
text run at (0,0) width 153: "Long chains of selectors"
RenderText {TEXT} at (153,0) size 53x18
- text run at (153,0) width 41: " (#170"
- text run at (194,0) width 12: "a)"
+ text run at (153,0) width 53: " (#170a)"
RenderListItem {LI} at (40,2520) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 153x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 153x18
text run at (0,0) width 153: "Long chains of selectors"
RenderText {TEXT} at (153,0) size 54x18
- text run at (153,0) width 41: " (#170"
- text run at (194,0) width 13: "b)"
+ text run at (153,0) width 54: " (#170b)"
RenderListItem {LI} at (40,2538) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 153x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 153x18
text run at (0,0) width 153: "Long chains of selectors"
RenderText {TEXT} at (153,0) size 53x18
- text run at (153,0) width 41: " (#170"
- text run at (194,0) width 12: "c)"
+ text run at (153,0) width 53: " (#170c)"
RenderListItem {LI} at (40,2556) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 153x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 153x18
text run at (0,0) width 153: "Long chains of selectors"
RenderText {TEXT} at (153,0) size 54x18
- text run at (153,0) width 41: " (#170"
- text run at (194,0) width 13: "d)"
+ text run at (153,0) width 54: " (#170d)"
RenderListItem {LI} at (40,2574) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 176x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 176x18
text run at (0,0) width 176: "Parsing: Numbers in classes"
RenderText {TEXT} at (176,0) size 53x18
- text run at (176,0) width 41: " (#175"
- text run at (217,0) width 12: "a)"
+ text run at (176,0) width 53: " (#175a)"
RenderListItem {LI} at (40,2592) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 176x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 176x18
text run at (0,0) width 176: "Parsing: Numbers in classes"
RenderText {TEXT} at (176,0) size 54x18
- text run at (176,0) width 41: " (#175"
- text run at (217,0) width 13: "b)"
+ text run at (176,0) width 54: " (#175b)"
RenderListItem {LI} at (40,2610) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 176x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 176x18
text run at (0,0) width 176: "Parsing: Numbers in classes"
RenderText {TEXT} at (176,0) size 53x18
- text run at (176,0) width 41: " (#175"
- text run at (217,0) width 12: "c)"
+ text run at (176,0) width 53: " (#175c)"
RenderListItem {LI} at (40,2628) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 263x18 [color=#0000EE]
@@ -1358,8 +1310,7 @@
RenderText {TEXT} at (0,0) size 263x18
text run at (0,0) width 263: "NEGATED Dynamic handling of :empty"
RenderText {TEXT} at (263,0) size 46x18
- text run at (263,0) width 33: " (#d1"
- text run at (296,0) width 13: "b)"
+ text run at (263,0) width 46: " (#d1b)"
RenderListItem {LI} at (40,2664) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 215x18 [color=#0000EE]
@@ -1387,40 +1338,35 @@
RenderText {TEXT} at (0,0) size 176x18
text run at (0,0) width 176: ":indeterminate and :checked"
RenderText {TEXT} at (176,0) size 45x18
- text run at (176,0) width 33: " (#d5"
- text run at (209,0) width 12: "a)"
+ text run at (176,0) width 45: " (#d5a)"
RenderListItem {LI} at (40,2736) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 258x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 258x18
text run at (0,0) width 258: "NEGATED :indeterminate and :checked"
RenderText {TEXT} at (258,0) size 46x18
- text run at (258,0) width 33: " (#d5"
- text run at (291,0) width 13: "b)"
+ text run at (258,0) width 46: " (#d5b)"
RenderListItem {LI} at (40,2754) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 176x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 176x18
text run at (0,0) width 176: ":indeterminate and :checked"
RenderText {TEXT} at (176,0) size 45x18
- text run at (176,0) width 33: " (#d5"
- text run at (209,0) width 12: "c)"
+ text run at (176,0) width 45: " (#d5c)"
RenderListItem {LI} at (40,2772) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 181x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 181x18
text run at (0,0) width 181: ":indeterminate with :checked"
RenderText {TEXT} at (181,0) size 46x18
- text run at (181,0) width 33: " (#d5"
- text run at (214,0) width 13: "d)"
+ text run at (181,0) width 46: " (#d5d)"
RenderListItem {LI} at (40,2790) size 744x18
RenderListMarker at (0,0) size 0x14
RenderInline {A} at (0,0) size 263x18 [color=#0000EE]
RenderText {TEXT} at (0,0) size 263x18
text run at (0,0) width 263: "NEGATED :indeterminate with :checked"
RenderText {TEXT} at (263,0) size 45x18
- text run at (263,0) width 33: " (#d5"
- text run at (296,0) width 12: "e)"
+ text run at (263,0) width 45: " (#d5e)"
RenderBlock {P} at (0,3264) size 784x18
RenderText {TEXT} at (0,0) size 60x18
text run at (0,0) width 60: "See also: "
1.7 +1 -2 WebCore/layout-tests/fast/table/032-expected.txt
Index: 032-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/table/032-expected.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 032-expected.txt 19 Oct 2004 23:28:51 -0000 1.6
+++ 032-expected.txt 19 Jul 2005 21:18:24 -0000 1.7
@@ -4,8 +4,7 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {TEXT} at (0,0) size 771x36
- text run at (0,0) width 330: "Because we're in quirks mode, you should see a 100"
- text run at (330,0) width 167: "x100 green square below. "
+ text run at (0,0) width 497: "Because we're in quirks mode, you should see a 100x100 green square below. "
text run at (497,0) width 274: "If the square is only a couple of pixels wide"
text run at (0,18) width 187: "or tall, then the test has failed."
layer at (8,50) size 100x50
1.9 +14 -28 WebCore/layout-tests/fast/table/border-collapsing/004-expected.txt
Index: 004-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/table/border-collapsing/004-expected.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- 004-expected.txt 6 Jul 2005 18:49:06 -0000 1.8
+++ 004-expected.txt 19 Jul 2005 21:18:24 -0000 1.9
@@ -17,20 +17,14 @@
text run at (333,0) width 172: "The styles applied here are:"
RenderBlock {PRE} at (0,92) size 784x180
RenderText {TEXT} at (0,0) size 688x180
- text run at (0,0) width 152: "TABLE { margin: 1"
- text run at (152,0) width 256: "em; border: medium solid blue; }"
- text run at (0,15) width 368: "TD { border: thin solid green; padding: 5"
- text run at (368,15) width 40: "px; }"
- text run at (0,30) width 352: "TH { border: medium solid purple; padding: 5"
- text run at (352,30) width 40: "px; }"
- text run at (0,45) width 320: "TABLE.one, TABLE.two { border-spacing: 1"
- text run at (320,45) width 40: "em; }"
+ text run at (0,0) width 408: "TABLE { margin: 1em; border: medium solid blue; }"
+ text run at (0,15) width 408: "TD { border: thin solid green; padding: 5px; }"
+ text run at (0,30) width 392: "TH { border: medium solid purple; padding: 5px; }"
+ text run at (0,45) width 360: "TABLE.one, TABLE.two { border-spacing: 1em; }"
text run at (0,60) width 320: "TABLE.one { border-collapse: collapse; }"
text run at (0,75) width 320: "TABLE.two { border-collapse: separate; }"
- text run at (0,90) width 496: "TABLE.three { border-collapse: separate; border-spacing: 0 0.5"
- text run at (496,90) width 40: "em; }"
- text run at (0,105) width 472: "TABLE.four { border-collapse: separate; border-spacing: 0.5"
- text run at (472,105) width 56: "em 0; }"
+ text run at (0,90) width 536: "TABLE.three { border-collapse: separate; border-spacing: 0 0.5em; }"
+ text run at (0,105) width 528: "TABLE.four { border-collapse: separate; border-spacing: 0.5em 0; }"
text run at (0,120) width 328: "TABLE.five { border-collapse: separate; }"
text run at (0,135) width 464: "TABLE.five, TABLE.five TD, TABLE.five TH { border: none; }"
text run at (0,150) width 688: "TABLE.five TR, TABLE.five COL, TABLE.five COLGROUP, TABLE.five TBODY, TABLE.five THEAD"
@@ -76,8 +70,7 @@
text run at (6,42) width 204: "ones) should be thin solid green."
RenderTableCell {TD} at (489,97) size 263x66 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
RenderText {TEXT} at (6,6) size 232x54
- text run at (6,6) width 165: "This table should have a 1"
- text run at (171,6) width 67: "em margin"
+ text run at (6,6) width 232: "This table should have a 1em margin"
text run at (6,24) width 111: "around all edges. "
text run at (117,24) width 80: "This margin "
text run at (197,24) width 10: "is"
@@ -109,8 +102,7 @@
RenderText {TEXT} at (6,6) size 173x54
text run at (6,6) width 158: "This means that elements"
text run at (6,24) width 173: "within the cell have border-"
- text run at (6,42) width 77: "spacing of 1"
- text run at (83,42) width 23: "em."
+ text run at (6,42) width 100: "spacing of 1em."
RenderTableCell {TD} at (410,75) size 320x48 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
RenderText {TEXT} at (6,6) size 279x36
text run at (6,6) width 205: "The borders on the header cells, "
@@ -128,8 +120,7 @@
text run at (6,24) width 166: "should be thin solid green."
RenderTableCell {TD} at (410,148) size 320x66 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
RenderText {TEXT} at (6,6) size 299x36
- text run at (6,6) width 165: "This table should have a 1"
- text run at (171,6) width 134: "em margin around all"
+ text run at (6,6) width 299: "This table should have a 1em margin around all"
text run at (6,24) width 44: "edges. "
text run at (50,24) width 80: "This margin "
text run at (130,24) width 135: "is measured from the "
@@ -163,8 +154,7 @@
text run at (193,24) width 46: "vertical"
text run at (6,42) width 144: "lines) of 0 and vertical "
text run at (150,42) width 94: "border-spacing"
- text run at (6,60) width 234: "(i.e., height of horizontal lines) of 0.5"
- text run at (240,60) width 23: "em."
+ text run at (6,60) width 257: "(i.e., height of horizontal lines) of 0.5em."
RenderTableCell {TD} at (465,68) size 281x48 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
RenderText {TEXT} at (6,6) size 240x36
text run at (6,6) width 205: "The borders on the header cells, "
@@ -181,8 +171,7 @@
text run at (6,78) width 39: "green."
RenderTableCell {TD} at (193,151) size 272x84 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
RenderText {TEXT} at (6,6) size 232x54
- text run at (6,6) width 165: "This table should have a 1"
- text run at (171,6) width 67: "em margin"
+ text run at (6,6) width 232: "This table should have a 1em margin"
text run at (6,24) width 111: "around all edges. "
text run at (117,24) width 80: "This margin "
text run at (197,24) width 10: "is"
@@ -224,8 +213,7 @@
RenderText {TEXT} at (6,6) size 185x72
text run at (6,6) width 185: "Elements within the cell have"
text run at (6,24) width 178: "horizontal border-spacing of"
- text run at (6,42) width 20: "0.5"
- text run at (26,42) width 100: "em and vertical "
+ text run at (6,42) width 120: "0.5em and vertical "
text run at (126,42) width 46: "border-"
text run at (6,60) width 81: "spacing of 0."
RenderTableCell {TD} at (438,52) size 300x48 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
@@ -242,8 +230,7 @@
text run at (6,60) width 166: "should be thin solid green."
RenderTableCell {TD} at (221,118) size 209x84 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
RenderText {TEXT} at (6,6) size 187x54
- text run at (6,6) width 165: "This table should have a 1"
- text run at (171,6) width 19: "em"
+ text run at (6,6) width 184: "This table should have a 1em"
text run at (6,24) width 159: "margin around all edges. "
text run at (165,24) width 28: "This"
text run at (6,42) width 48: "margin "
@@ -313,8 +300,7 @@
text run at (5,41) width 212: "other than what this test is testing."
RenderTableCell {TD} at (455,68) size 295x64 [r=1 c=2 rs=1 cs=1]
RenderText {TEXT} at (5,5) size 280x36
- text run at (5,5) width 165: "This table should have a 1"
- text run at (170,5) width 115: "em margin around"
+ text run at (5,5) width 280: "This table should have a 1em margin around"
text run at (5,23) width 63: "all edges. "
text run at (68,23) width 80: "This margin "
text run at (148,23) width 131: "is measured from the"
1.6 +1 -2 WebCore/layout-tests/fast/text/basic/003-expected.txt
Index: 003-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/text/basic/003-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 003-expected.txt 19 Oct 2004 23:28:51 -0000 1.5
+++ 003-expected.txt 19 Jul 2005 21:18:25 -0000 1.6
@@ -5,5 +5,4 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock (floating) {P} at (0,16) size 718x22 [border: (2px solid #0000FF)]
RenderText {TEXT} at (2,2) size 714x18
- text run at (2,2) width 338: "There should be 12"
- text run at (340,2) width 376: "px of letter spacing."
+ text run at (2,2) width 714: "There should be 12px of letter spacing."
1.8 +2 -4 WebCore/layout-tests/fast/text/basic/004-expected.txt
Index: 004-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/text/basic/004-expected.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 004-expected.txt 6 Jul 2005 00:21:53 -0000 1.7
+++ 004-expected.txt 19 Jul 2005 21:18:25 -0000 1.8
@@ -5,8 +5,7 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock (floating) {P} at (0,16) size 649x22 [border: (2px solid #008000)]
RenderText {TEXT} at (2,2) size 645x18
- text run at (2,2) width 212: "There should be 30"
- text run at (214,2) width 433: "px of word spacing between each word."
+ text run at (2,2) width 645: "There should be 30px of word spacing between each word."
RenderBlock {DIV} at (0,0) size 784x100
RenderTable {TABLE} at (0,100) size 100x130
RenderTableSection {TBODY} at (0,0) size 0x130
@@ -16,8 +15,7 @@
RenderText {TEXT} at (2,2) size 85x126
text run at (2,2) width 37: "There"
text run at (2,20) width 76: "should be"
- text run at (2,38) width 16: "15"
- text run at (18,38) width 48: "px of"
+ text run at (2,38) width 64: "15px of"
text run at (2,56) width 33: "word"
text run at (2,74) width 48: "spacing"
text run at (2,92) width 53: "between"
1.5 +1 -2 WebCore/layout-tests/fast/text/basic/005-expected.txt
Index: 005-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/text/basic/005-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 005-expected.txt 26 Apr 2004 21:19:02 -0000 1.4
+++ 005-expected.txt 19 Jul 2005 21:18:25 -0000 1.5
@@ -5,5 +5,4 @@
RenderBody {BODY} at (8,8) size 784x584
RenderBlock (floating) {DIV} at (0,0) size 260x22 [border: (2px solid #008000)]
RenderText {TEXT} at (2,2) size 256x18
- text run at (2,2) width 236: "Words should have a negative spacing of 5"
- text run at (238,2) width 20: "px."
+ text run at (2,2) width 256: "Words should have a negative spacing of 5px."
1.5 +1 -2 WebCore/layout-tests/fast/text/basic/009-expected.txt
Index: 009-expected.txt
===================================================================
RCS file: /cvs/root/WebCore/layout-tests/fast/text/basic/009-expected.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 009-expected.txt 26 Apr 2004 21:19:02 -0000 1.4
+++ 009-expected.txt 19 Jul 2005 21:18:25 -0000 1.5
@@ -10,5 +10,4 @@
RenderText {TEXT} at (177,0) size 154x28
text run at (177,0) width 154: "As is this."
RenderText {TEXT} at (331,0) size 344x28
- text run at (331,0) width 276: " All of this text should be 24"
- text run at (607,0) width 68: "px tall."
+ text run at (331,0) width 344: " All of this text should be 24px tall."
More information about the webkit-changes
mailing list