diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 10bae3f..01d3946 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,514 @@
 
         [EFL] Unreviewed gardening.
 
+        Rebaseline after enabling subpixel layout and updating freetype (2/26).
+
+        * platform/efl/css2.1/20110323/absolute-replaced-height-007-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.txt:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.png:
+        * platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.txt:
+        * platform/efl/css2.1/20110323/abspos-containing-block-initial-001-expected.png:
+        * platform/efl/css2.1/20110323/abspos-containing-block-initial-007-expected.png:
+        * platform/efl/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png:
+        * platform/efl/css2.1/20110323/abspos-replaced-width-margin-000-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-001-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-001-expected.txt:
+        * platform/efl/css2.1/20110323/background-intrinsic-002-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-002-expected.txt:
+        * platform/efl/css2.1/20110323/background-intrinsic-003-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-003-expected.txt:
+        * platform/efl/css2.1/20110323/background-intrinsic-004-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-004-expected.txt:
+        * platform/efl/css2.1/20110323/background-intrinsic-005-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-005-expected.txt:
+        * platform/efl/css2.1/20110323/background-intrinsic-006-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-006-expected.txt:
+        * platform/efl/css2.1/20110323/background-intrinsic-007-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-007-expected.txt:
+        * platform/efl/css2.1/20110323/background-intrinsic-008-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-008-expected.txt:
+        * platform/efl/css2.1/20110323/background-intrinsic-009-expected.png:
+        * platform/efl/css2.1/20110323/background-intrinsic-009-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.png:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.txt:
+        * platform/efl/css2.1/20110323/block-non-replaced-width-008-expected.png:
+        * platform/efl/css2.1/20110323/block-replaced-height-001-expected.png:
+        * platform/efl/css2.1/20110323/block-replaced-height-001-expected.txt:
+        * platform/efl/css2.1/20110323/block-replaced-height-002-expected.png:
+        * platform/efl/css2.1/20110323/block-replaced-height-002-expected.txt:
+        * platform/efl/css2.1/20110323/block-replaced-height-003-expected.png:
+        * platform/efl/css2.1/20110323/block-replaced-height-003-expected.txt:
+        * platform/efl/css2.1/20110323/block-replaced-height-004-expected.png:
+        * platform/efl/css2.1/20110323/block-replaced-height-004-expected.txt:
+        * platform/efl/css2.1/20110323/block-replaced-height-005-expected.png:
+        * platform/efl/css2.1/20110323/block-replaced-height-005-expected.txt:
+        * platform/efl/css2.1/20110323/block-replaced-height-007-expected.png:
+        * platform/efl/css2.1/20110323/block-replaced-height-007-expected.txt:
+        * platform/efl/css2.1/20110323/block-replaced-width-001-expected.png:
+        * platform/efl/css2.1/20110323/block-replaced-width-001-expected.txt:
+        * platform/efl/css2.1/20110323/block-replaced-width-006-expected.png:
+        * platform/efl/css2.1/20110323/block-replaced-width-006-expected.txt:
+        * platform/efl/css2.1/20110323/border-collapse-offset-002-expected.png:
+        * platform/efl/css2.1/20110323/border-collapse-offset-002-expected.txt:
+        * platform/efl/css2.1/20110323/border-conflict-style-079-expected.png:
+        * platform/efl/css2.1/20110323/border-conflict-style-079-expected.txt:
+        * platform/efl/css2.1/20110323/border-conflict-style-088-expected.png:
+        * platform/efl/css2.1/20110323/border-conflict-style-088-expected.txt:
+        * platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.png:
+        * platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.txt:
+        * platform/efl/css2.1/20110323/c543-txt-decor-000-expected.png:
+        * platform/efl/css2.1/20110323/c543-txt-decor-000-expected.txt:
+        * platform/efl/css2.1/20110323/dynamic-top-change-001-expected.png:
+        * platform/efl/css2.1/20110323/dynamic-top-change-001-expected.txt:
+        * platform/efl/css2.1/20110323/dynamic-top-change-002-expected.png:
+        * platform/efl/css2.1/20110323/dynamic-top-change-002-expected.txt:
+        * platform/efl/css2.1/20110323/dynamic-top-change-003-expected.png:
+        * platform/efl/css2.1/20110323/dynamic-top-change-003-expected.txt:
+        * platform/efl/css2.1/20110323/dynamic-top-change-004-expected.png:
+        * platform/efl/css2.1/20110323/dynamic-top-change-004-expected.txt:
+        * platform/efl/css2.1/20110323/empty-inline-001-expected.png:
+        * platform/efl/css2.1/20110323/empty-inline-001-expected.txt:
+        * platform/efl/css2.1/20110323/empty-inline-002-expected.png:
+        * platform/efl/css2.1/20110323/empty-inline-002-expected.txt:
+        * platform/efl/css2.1/20110323/empty-inline-003-expected.png:
+        * platform/efl/css2.1/20110323/empty-inline-003-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.txt:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.png:
+        * platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-height-001-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-height-001-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-height-002-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-height-002-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-height-003-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-height-003-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-height-004-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-height-004-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-height-005-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-height-005-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-height-007-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-height-007-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-width-001-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-width-001-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-width-002-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-width-002-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-width-003-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-width-003-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-width-004-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-width-004-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-width-005-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-width-005-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-width-006-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-width-006-expected.txt:
+        * platform/efl/css2.1/20110323/float-replaced-width-011-expected.png:
+        * platform/efl/css2.1/20110323/float-replaced-width-011-expected.txt:
+        * platform/efl/css2.1/20110323/floating-replaced-height-008-expected.png:
+        * platform/efl/css2.1/20110323/floating-replaced-height-008-expected.txt:
+        * platform/efl/css2.1/20110323/height-width-inline-table-001-expected.png:
+        * platform/efl/css2.1/20110323/height-width-inline-table-001-expected.txt:
+        * platform/efl/css2.1/20110323/height-width-table-001-expected.png:
+        * platform/efl/css2.1/20110323/height-width-table-001-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.txt:
+        * platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.png:
+        * platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.txt:
+        * platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.png:
+        * platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.txt:
+        * platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.png:
+        * platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.txt:
+        * platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.png:
+        * platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.txt:
+        * platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.png:
+        * platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-height-001-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-height-001-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-height-002-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-height-002-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-height-003-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-height-003-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-height-004-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-height-004-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-height-005-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-height-005-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-height-007-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-height-007-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-height-008-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-height-008-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-width-001-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-width-001-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-width-006-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-width-006-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-width-011-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-width-012-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-width-012-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-width-013-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-width-013-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-width-014-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-width-014-expected.txt:
+        * platform/efl/css2.1/20110323/inline-replaced-width-015-expected.png:
+        * platform/efl/css2.1/20110323/inline-replaced-width-015-expected.txt:
+        * platform/efl/css2.1/20110323/inline-table-001-expected.png:
+        * platform/efl/css2.1/20110323/inline-table-001-expected.txt:
+        * platform/efl/css2.1/20110323/inline-table-002a-expected.png:
+        * platform/efl/css2.1/20110323/inline-table-002a-expected.txt:
+        * platform/efl/css2.1/20110323/inline-table-003-expected.png:
+        * platform/efl/css2.1/20110323/inline-table-003-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-001-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-001-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-002-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-002-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-003-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-003-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-004-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-004-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-005-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-005-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-006-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-006-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-007-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-007-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-008-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-009-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-009-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-010-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-010-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-012-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-012-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-013-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-013-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-014-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-014-expected.txt:
+        * platform/efl/css2.1/20110323/margin-applies-to-015-expected.png:
+        * platform/efl/css2.1/20110323/margin-applies-to-015-expected.txt:
+        * platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.png:
+        * platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.txt:
+        * platform/efl/css2.1/20110323/replaced-elements-001-expected.png:
+        * platform/efl/css2.1/20110323/replaced-elements-001-expected.txt:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.png:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.txt:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.png:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.txt:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.png:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.txt:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.png:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.txt:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.png:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.txt:
+        * platform/efl/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png:
+        * platform/efl/css2.1/20110323/replaced-min-max-001-expected.png:
+        * platform/efl/css2.1/20110323/replaced-min-max-001-expected.txt:
+        * platform/efl/css2.1/20110323/table-caption-001-expected.png:
+        * platform/efl/css2.1/20110323/table-caption-001-expected.txt:
+        * platform/efl/css2.1/20110323/table-caption-002-expected.png:
+        * platform/efl/css2.1/20110323/table-caption-002-expected.txt:
+        * platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png:
+        * platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt:
+        * platform/efl/css2.1/20110323/table-caption-margins-001-expected.png:
+        * platform/efl/css2.1/20110323/table-caption-margins-001-expected.txt:
+        * platform/efl/css2.1/20110323/table-caption-optional-001-expected.png:
+        * platform/efl/css2.1/20110323/table-caption-optional-001-expected.txt:
+        * platform/efl/css2.1/20110323/table-caption-optional-002-expected.png:
+        * platform/efl/css2.1/20110323/table-caption-optional-002-expected.txt:
+        * platform/efl/css2.1/20110323/table-height-algorithm-023-expected.png:
+        * platform/efl/css2.1/20110323/table-height-algorithm-023-expected.txt:
+        * platform/efl/css2.1/20110323/table-height-algorithm-024-expected.png:
+        * platform/efl/css2.1/20110323/table-height-algorithm-024-expected.txt:
+        * platform/efl/css2.1/20110323/width-non-replaced-inline-001-expected.png:
+        * platform/efl/css2.1/20110323/width-replaced-element-001-expected.png:
+        * platform/efl/css2.1/20110323/width-replaced-element-001-expected.txt:
+        * platform/efl/css2.1/t010403-shand-border-00-c-expected.png:
+        * platform/efl/css2.1/t010403-shand-border-00-c-expected.txt:
+        * platform/efl/css2.1/t010403-shand-font-00-b-expected.png:
+        * platform/efl/css2.1/t010403-shand-font-00-b-expected.txt:
+        * platform/efl/css2.1/t010403-shand-font-01-b-expected.png:
+        * platform/efl/css2.1/t010403-shand-font-01-b-expected.txt:
+        * platform/efl/css2.1/t010403-shand-font-02-b-expected.png:
+        * platform/efl/css2.1/t010403-shand-font-02-b-expected.txt:
+        * platform/efl/css2.1/t010403-shand-font-03-b-expected.png:
+        * platform/efl/css2.1/t010403-shand-font-03-b-expected.txt:
+        * platform/efl/css2.1/t040102-keywords-00-b-expected.png:
+        * platform/efl/css2.1/t040102-keywords-00-b-expected.txt:
+        * platform/efl/css2.1/t040102-keywords-01-b-expected.png:
+        * platform/efl/css2.1/t040102-keywords-01-b-expected.txt:
+        * platform/efl/css2.1/t040103-case-00-b-expected.png:
+        * platform/efl/css2.1/t040103-case-00-b-expected.txt:
+        * platform/efl/css2.1/t040103-case-01-c-expected.png:
+        * platform/efl/css2.1/t040103-case-01-c-expected.txt:
+        * platform/efl/css2.1/t040103-escapes-00-b-expected.png:
+        * platform/efl/css2.1/t040103-escapes-00-b-expected.txt:
+        * platform/efl/css2.1/t040103-escapes-01-b-expected.png:
+        * platform/efl/css2.1/t040103-escapes-01-b-expected.txt:
+        * platform/efl/css2.1/t040103-escapes-02-d-expected.png:
+        * platform/efl/css2.1/t040103-escapes-02-d-expected.txt:
+        * platform/efl/css2.1/t040103-escapes-03-b-expected.png:
+        * platform/efl/css2.1/t040103-escapes-03-b-expected.txt:
+        * platform/efl/css2.1/t040103-escapes-04-b-expected.png:
+        * platform/efl/css2.1/t040103-escapes-04-b-expected.txt:
+        * platform/efl/css2.1/t040103-escapes-05-c-expected.png:
+        * platform/efl/css2.1/t040103-escapes-05-c-expected.txt:
+        * platform/efl/css2.1/t040103-escapes-06-b-expected.png:
+        * platform/efl/css2.1/t040103-escapes-06-b-expected.txt:
+        * platform/efl/css2.1/t040103-escapes-07-b-expected.png:
+        * platform/efl/css2.1/t040103-escapes-07-b-expected.txt:
+        * platform/efl/css2.1/t040103-escapes-08-b-expected.png:
+        * platform/efl/css2.1/t040103-escapes-08-b-expected.txt:
+        * platform/efl/css2.1/t040103-ident-00-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-00-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-01-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-01-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-02-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-02-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-03-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-03-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-04-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-04-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-05-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-05-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-06-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-06-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-07-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-07-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-08-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-08-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-09-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-09-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-10-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-10-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-11-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-11-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-12-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-12-c-expected.txt:
+        * platform/efl/css2.1/t040103-ident-13-c-expected.png:
+        * platform/efl/css2.1/t040103-ident-13-c-expected.txt:
+        * platform/efl/css2.1/t040105-atkeyw-00-b-expected.png:
+        * platform/efl/css2.1/t040105-atkeyw-00-b-expected.txt:
+        * platform/efl/css2.1/t040105-atkeyw-01-b-expected.png:
+        * platform/efl/css2.1/t040105-atkeyw-01-b-expected.txt:
+        * platform/efl/css2.1/t040105-atkeyw-02-b-expected.png:
+        * platform/efl/css2.1/t040105-atkeyw-02-b-expected.txt:
+        * platform/efl/css2.1/t040105-atrule-00-b-expected.png:
+        * platform/efl/css2.1/t040105-atrule-00-b-expected.txt:
+        * platform/efl/css2.1/t040105-atrule-01-b-expected.png:
+        * platform/efl/css2.1/t040105-atrule-01-b-expected.txt:
+        * platform/efl/css2.1/t040105-atrule-02-b-expected.png:
+        * platform/efl/css2.1/t040105-atrule-02-b-expected.txt:
+        * platform/efl/css2.1/t040105-atrule-03-b-expected.png:
+        * platform/efl/css2.1/t040105-atrule-03-b-expected.txt:
+        * platform/efl/css2.1/t040105-atrule-04-b-expected.png:
+        * platform/efl/css2.1/t040105-atrule-04-b-expected.txt:
+        * platform/efl/css2.1/t040105-import-00-b-expected.png:
+        * platform/efl/css2.1/t040105-import-00-b-expected.txt:
+        * platform/efl/css2.1/t040105-import-01-b-expected.png:
+        * platform/efl/css2.1/t040105-import-01-b-expected.txt:
+        * platform/efl/css2.1/t040105-import-10-b-expected.png:
+        * platform/efl/css2.1/t040105-import-10-b-expected.txt:
+        * platform/efl/css2.1/t040109-c17-comments-00-b-expected.png:
+        * platform/efl/css2.1/t040109-c17-comments-00-b-expected.txt:
+        * platform/efl/css2.1/t040109-c17-comments-01-b-expected.png:
+        * platform/efl/css2.1/t040109-c17-comments-01-b-expected.txt:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.png:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.png:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.png:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.png:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.png:
+        * platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt:
+        * platform/efl/css2.1/t0402-syntax-01-f-expected.png:
+        * platform/efl/css2.1/t0402-syntax-01-f-expected.txt:
+        * platform/efl/css2.1/t0402-syntax-02-f-expected.png:
+        * platform/efl/css2.1/t0402-syntax-02-f-expected.txt:
+        * platform/efl/css2.1/t0402-syntax-03-f-expected.png:
+        * platform/efl/css2.1/t0402-syntax-03-f-expected.txt:
+        * platform/efl/css2.1/t0402-syntax-04-f-expected.png:
+        * platform/efl/css2.1/t0402-syntax-04-f-expected.txt:
+        * platform/efl/css2.1/t0402-syntax-05-f-expected.png:
+        * platform/efl/css2.1/t0402-syntax-05-f-expected.txt:
+        * platform/efl/css2.1/t0402-syntax-06-f-expected.png:
+        * platform/efl/css2.1/t0402-syntax-06-f-expected.txt:
+        * platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.png:
+        * platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.txt:
+        * platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.png:
+
+2013-01-17  Dominik Röttsches  <dominik.rottsches@intel.com>
+
+        [EFL] Unreviewed gardening.
+
         Rebaseline after enabling subpixel layout and updating freetype (1/26).
 
         * platform/efl/TestExpectations:
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-007-expected.txt
index 0c6bd60..bed22f4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-007-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 306x6
   RenderPartObject {IFRAME} at (0,0) size 306x6 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.png
index b866abe..56f1ac6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.txt
index 3acbe1b..390ae85 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-008-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x76
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x18
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x18 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.png
index b866abe..56f1ac6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.txt
index 71c617f..c7ce3a3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-009-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x61
     RenderBody {BODY} at (8,16) size 784x37
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x3
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.png
index 8b1fcef..9e7dd4e5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.txt
index f06a8b4..0954556 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-010-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x61
     RenderBody {BODY} at (8,16) size 784x37
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x3
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.png
index e7c234e..3e2d978 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.txt
index 1440bd0..a908676 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-011-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,146) size 306x156
   RenderPartObject {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.png
index 81df362..34e5a9b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.txt
index 0b87615..2576122 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-012-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.png
index db7bc6b..c3d7537 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.txt
index 101e004..ce9ad63 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-014-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,146) size 306x6
   RenderPartObject {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.png
index b866abe..56f1ac6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.txt
index 71c617f..c7ce3a3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-016-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x61
     RenderBody {BODY} at (8,16) size 784x37
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x3
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.png
index 8b1fcef..9e7dd4e5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.txt
index f06a8b4..0954556 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-017-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x61
     RenderBody {BODY} at (8,16) size 784x37
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x3
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.png
index e7c234e..3e2d978 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.txt
index 1440bd0..a908676 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-018-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,146) size 306x156
   RenderPartObject {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.png
index 81df362..34e5a9b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.txt
index 0b87615..2576122 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-019-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.png
index db7bc6b..c3d7537 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.txt
index 101e004..ce9ad63 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-021-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,146) size 306x6
   RenderPartObject {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.png
index b866abe..56f1ac6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.txt
index 3acbe1b..390ae85 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-022-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x76
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x18
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x18 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.png
index b866abe..56f1ac6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.txt
index 71c617f..c7ce3a3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-023-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x61
     RenderBody {BODY} at (8,16) size 784x37
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x3
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.png
index 8b1fcef..9e7dd4e5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.txt
index f06a8b4..0954556 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-024-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x61
     RenderBody {BODY} at (8,16) size 784x37
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x3
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.png
index e7c234e..3e2d978 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt
index 1440bd0..a908676 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-025-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,146) size 306x156
   RenderPartObject {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.png
index 81df362..34e5a9b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.txt
index 0b87615..2576122 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-026-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.png
index db7bc6b..c3d7537 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.txt
index 101e004..ce9ad63 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-028-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,146) size 306x6
   RenderPartObject {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.png
index b866abe..56f1ac6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.txt
index 3acbe1b..390ae85 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-029-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x76
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x18
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x18 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.png
index b866abe..56f1ac6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.txt
index 71c617f..c7ce3a3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-030-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x61
     RenderBody {BODY} at (8,16) size 784x37
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x3
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.png
index 8b1fcef..9e7dd4e5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.txt
index f06a8b4..0954556 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-031-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x61
     RenderBody {BODY} at (8,16) size 784x37
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 514x19
+        RenderText {#text} at (0,0) size 514x17
           text run at (0,0) width 514: "Test passes if there is a single blue box below and it does not touch the black line."
 layer at (8,50) size 784x3
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x3 [border: (3px solid #000000) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.png
index e7c234e..3e2d978 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.txt
index 1440bd0..a908676 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-032-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,146) size 306x156
   RenderPartObject {IFRAME} at (0,96) size 306x156 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.png
index 81df362..34e5a9b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.txt
index 0b87615..2576122 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-033-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.png
index db7bc6b..c3d7537 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.txt
index 101e004..ce9ad63 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-035-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,146) size 306x6
   RenderPartObject {IFRAME} at (0,96) size 306x6 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.png
index 89d3dc0..6ad60d7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-height-036-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.png
index bbcfb5b..cefaffe 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.txt
index 794d399..c8aa1cd 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
       RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.png
index 130acde..9d43453 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.txt
index 928824e..8e919d4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-006-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.png
index bbcfb5b..cefaffe 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.txt
index 794d399..c8aa1cd 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-008-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
       RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.png
index 130acde..9d43453 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.txt
index 928824e..8e919d4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-013-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.png
index 941fee3..218414f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.txt
index 4e4d1a6..0b24238 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-015-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 780x37
+        RenderText {#text} at (0,0) size 780x35
           text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.png
index 5d7f863..8a2da8c 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.txt
index 81ea476..cf10b0d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-020-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 780x37
+        RenderText {#text} at (0,0) size 780x35
           text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.png
index 54d4062..1d1b098 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.txt
index cb01ae1..77c17f7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-022-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 780x37
+        RenderText {#text} at (0,0) size 780x35
           text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.png
index 5d7f863..8a2da8c 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt
index 81ea476..cf10b0d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-027-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 780x37
+        RenderText {#text} at (0,0) size 780x35
           text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.png
index 54d4062..1d1b098 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.txt
index cb01ae1..77c17f7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-029-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 780x37
+        RenderText {#text} at (0,0) size 780x35
           text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.png
index 5d7f863..8a2da8c 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.txt
index 81ea476..cf10b0d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-034-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 780x37
+        RenderText {#text} at (0,0) size 780x35
           text run at (0,0) width 780: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-right corner of the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.png
index fe62b56..a053721 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.txt
index f7d76ac..b8e9ebb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-036-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.png
index 990c267..a7993c5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.txt
index 46c206e..7559e13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-041-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.png
index fe62b56..a053721 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.txt
index f7d76ac..b8e9ebb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-043-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.png
index 990c267..a7993c5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.txt
index 46c206e..7559e13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-048-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.png
index fe62b56..a053721 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.txt
index f7d76ac..b8e9ebb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-050-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.png
index 990c267..a7993c5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.txt
index 46c206e..7559e13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-055-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.png
index fe62b56..a053721 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.txt
index f7d76ac..b8e9ebb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-057-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.png
index 990c267..a7993c5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.txt
index 46c206e..7559e13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-062-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.png
index fe62b56..a053721 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.txt
index f7d76ac..b8e9ebb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-064-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.png
index 990c267..a7993c5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.txt
index 46c206e..7559e13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-069-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.png
index fe62b56..a053721 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.txt
index f7d76ac..b8e9ebb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-071-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x198
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.png b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.png
index 990c267..a7993c5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.txt
index 46c206e..7559e13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/absolute-replaced-width-076-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 774x37
+        RenderText {#text} at (0,0) size 774x35
           text run at (0,0) width 774: "Test passes if the blue and orange boxes below are the same width, and the boxes are horizontally centered inside the black"
           text run at (0,18) width 28: "box."
 layer at (8,68) size 198x294
diff --git a/LayoutTests/platform/efl/css2.1/20110323/abspos-containing-block-initial-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/abspos-containing-block-initial-001-expected.png
index 0c2fac7..b5daba5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/abspos-containing-block-initial-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/abspos-containing-block-initial-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/abspos-containing-block-initial-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/abspos-containing-block-initial-007-expected.png
index fece567..51628b8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/abspos-containing-block-initial-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/abspos-containing-block-initial-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png b/LayoutTests/platform/efl/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png
index df5262b..ed87613 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/abspos-replaced-width-margin-000-expected.png b/LayoutTests/platform/efl/css2.1/20110323/abspos-replaced-width-margin-000-expected.png
index 29bd3a6..49c8f56 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/abspos-replaced-width-margin-000-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/abspos-replaced-width-margin-000-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-001-expected.png
index f01990a..0431cea 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-001-expected.txt
index 963f8c4..043c324 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x306
     RenderBody {BODY} at (8,16) size 784x282
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "There must be two green boxes below and no red."
 layer at (16,50) size 120x120
   RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-002-expected.png
index f01990a..0431cea 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-002-expected.txt
index 2a45821..6dee2a4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x306
     RenderBody {BODY} at (8,16) size 784x282
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "There must be two green boxes below and no red."
 layer at (16,50) size 120x120
   RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-003-expected.png
index f01990a..0431cea 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-003-expected.txt
index b061c2f..d5700a8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x306
     RenderBody {BODY} at (8,16) size 784x282
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "There must be two green boxes below and no red."
 layer at (16,50) size 120x120
   RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-004-expected.png
index 6e0eed7..4ad4932 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-004-expected.txt
index f31cf74..f5d75dc 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-004-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x306
     RenderBody {BODY} at (8,16) size 784x282
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "There must be two green boxes below and no red."
 layer at (16,50) size 120x120
   RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-005-expected.png
index 63f860a..d86a812 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-005-expected.txt
index 86d4462..343551b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-005-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x306
     RenderBody {BODY} at (8,16) size 784x282
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "There must be two green boxes below and no red."
 layer at (16,50) size 120x120
   RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-006-expected.png
index f01990a..0431cea 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-006-expected.txt
index 85408d7..c09194b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-006-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x306
     RenderBody {BODY} at (8,16) size 784x282
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "There must be two green boxes below and no red."
 layer at (16,50) size 120x120
   RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-007-expected.png
index f01990a..0431cea 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-007-expected.txt
index 71cf6d5..a45ec0b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-007-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x306
     RenderBody {BODY} at (8,16) size 784x282
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "There must be two green boxes below and no red."
 layer at (16,50) size 120x120
   RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-008-expected.png
index f01990a..0431cea 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-008-expected.txt
index 71cf6d5..a45ec0b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-008-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x306
     RenderBody {BODY} at (8,16) size 784x282
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "There must be two green boxes below and no red."
 layer at (16,50) size 120x120
   RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-009-expected.png b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-009-expected.png
index f01990a..0431cea 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-009-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-009-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-009-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-009-expected.txt
index 71cf6d5..a45ec0b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-009-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/background-intrinsic-009-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x306
     RenderBody {BODY} at (8,16) size 784x282
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "There must be two green boxes below and no red."
 layer at (16,50) size 120x120
   RenderBlock (relative positioned) {DIV} at (8,34) size 120x120 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.png
index eb89ded..0c62817 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.txt
index f262f75..0bd5404 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-001-expected.txt
@@ -4,9 +4,9 @@
   RenderBlock {HTML} at (0,0) size 800x82
     RenderBody {BODY} at (8,16) size 784x58
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 547x19
+        RenderText {#text} at (0,0) size 547x17
           text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines."
       RenderBlock {DIV} at (0,34) size 96x24 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
         RenderBlock {DIV} at (0,3) size 96x18 [bgcolor=#0000FF]
-          RenderText {#text} at (0,0) size 66x19
+          RenderText {#text} at (0,0) size 66x17
             text run at (0,0) width 66: "Filler Text"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.png
index 74e0a0b..21e4d36 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.txt
index 0c162e1..f8c8ea3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-002-expected.txt
@@ -5,9 +5,9 @@
 layer at (8,8) size 769x89 clip at (8,8) size 754x74
   RenderBody {BODY} at (8,8) size 769x89
     RenderBlock {P} at (0,16) size 754x18
-      RenderText {#text} at (0,0) size 547x19
+      RenderText {#text} at (0,0) size 547x17
         text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines."
     RenderBlock {DIV} at (0,50) size 96x24 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
       RenderBlock {DIV} at (0,3) size 96x18 [bgcolor=#0000FF]
-        RenderText {#text} at (0,0) size 66x19
+        RenderText {#text} at (0,0) size 66x17
           text run at (0,0) width 66: "Filler Text"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.png
index 4ff58a4..8f6e7ee 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.txt
index 0e77a8d..1f3f1ca 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.png
index 8ca30b2..78b0af9 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.txt
index fccca4e..81aa8fa 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-004-expected.txt
@@ -5,7 +5,7 @@
 layer at (8,8) size 769x257 clip at (8,8) size 754x242
   RenderBody {BODY} at (8,8) size 769x257
     RenderBlock {P} at (0,16) size 754x18
-      RenderText {#text} at (0,0) size 425x19
+      RenderText {#text} at (0,0) size 425x17
         text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,58) size 754x192
   RenderBlock (relative positioned) {DIV} at (0,50) size 754x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.png
index 926ece2..33feb32 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.txt
index 9c916eb..1299ac9 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-005-expected.txt
@@ -4,14 +4,14 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 667x19
+        RenderText {#text} at (0,0) size 667x17
           text run at (0,0) width 667: "Test passes if the blue and orange boxes below are the same height and there is no red visible on the page."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
 layer at (8,50) size 192x192
   RenderBlock (relative positioned) {DIV} at (0,0) size 192x192 [bgcolor=#FF0000]
-    RenderInline {SPAN} at (0,0) size 192x193 [color=#0000FF]
-      RenderText {#text} at (0,0) size 192x193
+    RenderInline {SPAN} at (0,0) size 192x192 [color=#0000FF]
+      RenderText {#text} at (0,0) size 192x192
         text run at (0,0) width 192: "XX"
         text run at (0,96) width 192: "XX"
     RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.png
index b424515..e1242f2 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.txt
index e54f7cd..ec596b0 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-006-expected.txt
@@ -2,17 +2,17 @@
   RenderView at (0,0) size 785x585
 layer at (0,0) size 785x273
   RenderBlock {HTML} at (0,0) size 785x273
-layer at (8,8) size 769x257 clip at (8,8) size 754x242 scrollHeight 243
+layer at (8,8) size 769x257 clip at (8,8) size 754x242
   RenderBody {BODY} at (8,8) size 769x257
     RenderBlock {P} at (0,16) size 754x18
-      RenderText {#text} at (0,0) size 667x19
+      RenderText {#text} at (0,0) size 667x17
         text run at (0,0) width 667: "Test passes if the blue and orange boxes below are the same height and there is no red visible on the page."
 layer at (8,58) size 754x192
   RenderBlock (relative positioned) {DIV} at (0,50) size 754x192
 layer at (8,58) size 192x192
   RenderBlock (relative positioned) {DIV} at (0,0) size 192x192 [bgcolor=#FF0000]
-    RenderInline {SPAN} at (0,0) size 192x193 [color=#0000FF]
-      RenderText {#text} at (0,0) size 192x193
+    RenderInline {SPAN} at (0,0) size 192x192 [color=#0000FF]
+      RenderText {#text} at (0,0) size 192x192
         text run at (0,0) width 192: "XX"
         text run at (0,96) width 192: "XX"
     RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.png
index 40f77fa..6be61da 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.png
index c4d29cb..08e62c6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.png
index dd5c93a..c5c94ea 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-009-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.png
index 8240e46..e6367d2 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-010-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.png
index 8ba45f8..a440794 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.txt
index 4d8d772..f51eb7d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-011-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x146
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
       RenderBlock {DIV} at (0,34) size 784x0 [bgcolor=#FF0000]
         RenderBlock (floating) {DIV} at (0,0) size 96x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.png
index 4306244..6a7c080 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.txt
index cc1ffab..56764ba 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-012-expected.txt
@@ -5,7 +5,7 @@
 layer at (8,8) size 769x161 clip at (8,8) size 754x146
   RenderBody {BODY} at (8,8) size 769x161
     RenderBlock {P} at (0,16) size 754x18
-      RenderText {#text} at (0,0) size 303x19
+      RenderText {#text} at (0,0) size 303x17
         text run at (0,0) width 303: "Test passes if there is no red visible on the page."
     RenderBlock {DIV} at (0,50) size 754x0 [bgcolor=#FF0000]
       RenderBlock (floating) {DIV} at (0,0) size 96x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.png
index 8ba45f8..a440794 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.txt
index 075e00b..7594774 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-013-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
       RenderBlock {DIV} at (0,34) size 784x0 [bgcolor=#FF0000]
 layer at (8,50) size 96x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.png
index 28b2c17..5099702 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.txt
index 82401d3..dc69583 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-014-expected.txt
@@ -5,7 +5,7 @@
 layer at (8,8) size 769x65 clip at (8,8) size 754x50
   RenderBody {BODY} at (8,8) size 769x65
     RenderBlock {P} at (0,16) size 754x18
-      RenderText {#text} at (0,0) size 303x19
+      RenderText {#text} at (0,0) size 303x17
         text run at (0,0) width 303: "Test passes if there is no red visible on the page."
     RenderBlock {DIV} at (0,50) size 754x0 [bgcolor=#FF0000]
 layer at (8,58) size 96x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.png
index a92ee2e..8e066b4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.txt
index 0b942c5..96b9dfb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-015-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x154
     RenderBody {BODY} at (8,16) size 784x130
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x96
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.png
index 01e8447..b8e3a2a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.txt
index 8e87d5f..c13f6bd 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-height-016-expected.txt
@@ -5,7 +5,7 @@
 layer at (8,8) size 769x161 clip at (8,8) size 754x146 scrollHeight 242
   RenderBody {BODY} at (8,8) size 769x161
     RenderBlock {P} at (0,16) size 754x18
-      RenderText {#text} at (0,0) size 425x19
+      RenderText {#text} at (0,0) size 425x17
         text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,58) size 754x96
   RenderBlock (relative positioned) {DIV} at (0,50) size 754x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.png
index 0b53bfc..74ff03a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.png
index 0b53bfc..74ff03a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.png
index 0b53bfc..74ff03a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.png
index 55da31a..3823e3d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.png
index 466f46f..c6060aa 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.txt
index 63e414d..99d2693 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-005-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x90
     RenderBody {BODY} at (0,16) size 800x74
       RenderBlock {P} at (0,0) size 800x18
-        RenderText {#text} at (0,0) size 639x19
+        RenderText {#text} at (0,0) size 639x17
           text run at (0,0) width 639: "Test passes if the box below spans the entire width of the page and there is no red visible on the page."
       RenderBlock {DIV} at (0,34) size 800x40 [bgcolor=#FF0000]
         RenderBlock {DIV} at (0,0) size 800x40 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.png
index 466f46f..c6060aa 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.txt
index aabc148..f11a1e1 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-006-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x90
     RenderBody {BODY} at (0,16) size 800x74
       RenderBlock {P} at (0,0) size 800x18
-        RenderText {#text} at (0,0) size 639x19
+        RenderText {#text} at (0,0) size 639x17
           text run at (0,0) width 639: "Test passes if the box below spans the entire width of the page and there is no red visible on the page."
       RenderBlock {DIV} at (0,34) size 800x40 [bgcolor=#FF0000]
         RenderBlock {DIV} at (0,0) size 800x40 [bgcolor=#008000] [border: (10px solid #008000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.png
index 8cc7934..2e6a692 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.txt
index ae65353..3b32d02 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-007-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 694x19
+        RenderText {#text} at (0,0) size 694x17
           text run at (0,0) width 694: "Test passes if the blue and orange boxes are the same width and the blue box is directly below the orange box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderBlock {DIV} at (51,3) size 96x96 [bgcolor=#FFA500] [border: none (24px solid #FFA500) none (24px solid #FFA500)]
         RenderBlock {DIV} at (3,99) size 192x96 [color=#0000FF]
-          RenderText {#text} at (48,0) size 96x97
+          RenderText {#text} at (48,0) size 96x96
             text run at (48,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-008-expected.png
index d668294..c1049db 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-non-replaced-width-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-001-expected.png
index d092cdf..0356189e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-001-expected.txt
index 6ebc90c..8f45dc7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x79
     RenderBody {BODY} at (8,16) size 784x55
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 547x19
+        RenderText {#text} at (0,0) size 547x17
           text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines."
       RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
         RenderImage {IMG} at (0,3) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-002-expected.png
index 18ad8b3..7d23868 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-002-expected.txt
index 6f353af..3dbd56d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x73
     RenderBody {BODY} at (8,16) size 784x49
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x15
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x15
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-003-expected.png
index a92ee2e..8e066b4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-003-expected.txt
index 3af584d..c4fe783 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x154
     RenderBody {BODY} at (8,16) size 784x130
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x96
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-004-expected.png
index f740da23..2bb44bf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-004-expected.txt
index 0044447..3244369 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-004-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x214
     RenderBody {BODY} at (8,16) size 784x190
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x156
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-005-expected.png
index 93b286f..6eb3b4f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-005-expected.txt
index 0064f9f..32fb2b0 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-005-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-007-expected.png
index f740da23..2bb44bf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-007-expected.txt
index 0044447..3244369 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-height-007-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x214
     RenderBody {BODY} at (8,16) size 784x190
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x156
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-001-expected.png
index 9215e15..a3e296f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-001-expected.txt
index a228e91..46cee35 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-001-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 773x19
+        RenderText {#text} at (0,0) size 773x17
           text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and they are horizontally centered inside the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
-        RenderImage {IMG} at (91,3) size 15x15
+        RenderImage {IMG} at (91,3) size 16x15
         RenderBlock {DIV} at (3,18) size 192x15 [color=#FFA500]
           RenderText {#text} at (88,0) size 16x15
             text run at (88,0) width 16: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-006-expected.png
index e0f31ec..1dfc765 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-006-expected.txt
index 16bc0e0..48ceece 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/block-replaced-width-006-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x352
     RenderBody {BODY} at (8,16) size 784x328
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 773x19
+        RenderText {#text} at (0,0) size 773x17
           text run at (0,0) width 773: "Test passes if the blue and orange boxes below are the same width, and they are horizontally centered inside the black box."
       RenderBlock {DIV} at (0,34) size 198x294 [border: (3px solid #000000)]
         RenderImage {IMG} at (51,3) size 96x96
         RenderBlock {DIV} at (3,99) size 192x96 [color=#FFA500]
-          RenderText {#text} at (48,0) size 96x97
+          RenderText {#text} at (48,0) size 96x96
             text run at (48,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/border-collapse-offset-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/border-collapse-offset-002-expected.png
index d26b64e..a8c1a6a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/border-collapse-offset-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/border-collapse-offset-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/border-collapse-offset-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/border-collapse-offset-002-expected.txt
index 68d63a6..51879bb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/border-collapse-offset-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/border-collapse-offset-002-expected.txt
@@ -5,10 +5,10 @@
     RenderBody {BODY} at (8,8) size 784x66
       RenderTable {TABLE} at (0,0) size 110x66 [border: (2px none #808080)]
         RenderBlock {CAPTION} at (0,0) size 110x26 [border: (4px solid #008000)]
-          RenderText {#text} at (32,4) size 46x19
+          RenderText {#text} at (32,4) size 46x17
             text run at (32,4) width 46: "caption"
         RenderTableSection {TBODY} at (2,28) size 106x36
           RenderTableRow {TR} at (0,0) size 106x36
             RenderTableCell {TD} at (0,6) size 106x24 [border: (2px solid #FFA500)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (36,3) size 34x19
+              RenderText {#text} at (36,3) size 34x17
                 text run at (36,3) width 34: "cell 1"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-079-expected.png b/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-079-expected.png
index 1614df1..2ab06e7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-079-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-079-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-079-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-079-expected.txt
index 1da52c7..caea4a5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-079-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-079-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x308
     RenderBody {BODY} at (8,16) size 784x284
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 466x19
+        RenderText {#text} at (0,0) size 466x17
           text run at (0,0) width 466: "Test passes if the center box in the table below has a border similar to this:"
       RenderTable {TABLE} at (0,34) size 60x60 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 55x55
@@ -14,31 +14,31 @@
         RenderTableSection {TBODY} at (2,2) size 165x165
           RenderTableRow {TR} at (0,0) size 165x55
             RenderTableCell {TD} at (0,15) size 55x25 [border: (3px outset #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 37x19
+              RenderText {#text} at (4,4) size 37x17
                 text run at (4,4) width 37: "outset"
             RenderTableCell {TD} at (55,15) size 55x25 [border: (3px outset #00FF00) (2px outset #FF0000) (3px outset #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 37x19
+              RenderText {#text} at (4,4) size 37x17
                 text run at (4,4) width 37: "outset"
             RenderTableCell {TD} at (110,15) size 55x25 [border: (3px outset #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 37x19
+              RenderText {#text} at (4,4) size 37x17
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,55) size 165x55
             RenderTableCell {TD} at (0,70) size 55x25 [border: (3px outset #00FF00) (2px outset #FF0000) (2px outset #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 37x19
+              RenderText {#text} at (4,4) size 37x17
                 text run at (4,4) width 37: "outset"
             RenderTableCell {TD} at (55,70) size 55x25 [border: (3px ridge #00FF00)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 32x19
+              RenderText {#text} at (4,4) size 32x17
                 text run at (4,4) width 32: "ridge"
             RenderTableCell {TD} at (110,70) size 55x25 [border: (3px outset #00FF00) (3px outset #FF0000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 37x19
+              RenderText {#text} at (4,4) size 37x17
                 text run at (4,4) width 37: "outset"
           RenderTableRow {TR} at (0,110) size 165x55
             RenderTableCell {TD} at (0,125) size 55x25 [border: (3px outset #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 37x19
+              RenderText {#text} at (4,4) size 37x17
                 text run at (4,4) width 37: "outset"
             RenderTableCell {TD} at (55,125) size 55x25 [border: (3px outset #FF0000) (2px outset #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 37x19
+              RenderText {#text} at (4,4) size 37x17
                 text run at (4,4) width 37: "outset"
             RenderTableCell {TD} at (110,125) size 55x25 [border: (3px outset #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 37x19
+              RenderText {#text} at (4,4) size 37x17
                 text run at (4,4) width 37: "outset"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-088-expected.png b/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-088-expected.png
index bce48bc..44790ff 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-088-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-088-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-088-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-088-expected.txt
index 561e6e5..9c2954a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-088-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/border-conflict-style-088-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x308
     RenderBody {BODY} at (8,16) size 784x284
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 466x19
+        RenderText {#text} at (0,0) size 466x17
           text run at (0,0) width 466: "Test passes if the center box in the table below has a border similar to this:"
       RenderTable {TABLE} at (0,34) size 60x60 [border: (2px none #808080)]
         RenderTableSection {TBODY} at (2,2) size 55x55
@@ -14,31 +14,31 @@
         RenderTableSection {TBODY} at (2,2) size 165x165
           RenderTableRow {TR} at (0,0) size 165x55
             RenderTableCell {TD} at (0,15) size 55x25 [border: (3px ridge #00FF00)] [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 32x19
+              RenderText {#text} at (4,4) size 32x17
                 text run at (4,4) width 32: "ridge"
             RenderTableCell {TD} at (55,15) size 55x25 [border: (3px ridge #00FF00)] [r=0 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 32x19
+              RenderText {#text} at (4,4) size 32x17
                 text run at (4,4) width 32: "ridge"
             RenderTableCell {TD} at (110,15) size 55x25 [border: (3px ridge #00FF00)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 32x19
+              RenderText {#text} at (4,4) size 32x17
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,55) size 165x55
             RenderTableCell {TD} at (0,70) size 55x25 [border: (3px ridge #00FF00)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 32x19
+              RenderText {#text} at (4,4) size 32x17
                 text run at (4,4) width 32: "ridge"
             RenderTableCell {TD} at (55,70) size 55x25 [border: (3px outset #FF0000)] [r=1 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 37x19
+              RenderText {#text} at (4,4) size 37x17
                 text run at (4,4) width 37: "outset"
             RenderTableCell {TD} at (110,70) size 55x25 [border: (3px ridge #00FF00)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 32x19
+              RenderText {#text} at (4,4) size 32x17
                 text run at (4,4) width 32: "ridge"
           RenderTableRow {TR} at (0,110) size 165x55
             RenderTableCell {TD} at (0,125) size 55x25 [border: (3px ridge #00FF00)] [r=2 c=0 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 32x19
+              RenderText {#text} at (4,4) size 32x17
                 text run at (4,4) width 32: "ridge"
             RenderTableCell {TD} at (55,125) size 55x25 [border: (3px ridge #00FF00)] [r=2 c=1 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 32x19
+              RenderText {#text} at (4,4) size 32x17
                 text run at (4,4) width 32: "ridge"
             RenderTableCell {TD} at (110,125) size 55x25 [border: (3px ridge #00FF00)] [r=2 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,4) size 32x19
+              RenderText {#text} at (4,4) size 32x17
                 text run at (4,4) width 32: "ridge"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.png b/LayoutTests/platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.png
index bb4d54b..f9b6ba0 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.txt
index 54c721f..6fd2734 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/border-spacing-applies-to-015-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x298
     RenderBody {BODY} at (8,16) size 784x274
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 645x19
+        RenderText {#text} at (0,0) size 645x17
           text run at (0,0) width 645: "Test passes if there is a blue and orange square below and there is no vertical gap between the squares."
       RenderTable {DIV} at (0,34) size 120x240
         RenderBlock {DIV} at (0,0) size 120x120 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/c543-txt-decor-000-expected.png b/LayoutTests/platform/efl/css2.1/20110323/c543-txt-decor-000-expected.png
index b8fde60..f138aea 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/c543-txt-decor-000-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/c543-txt-decor-000-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/c543-txt-decor-000-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/c543-txt-decor-000-expected.txt
index 2a9dd98..200c4bf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/c543-txt-decor-000-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/c543-txt-decor-000-expected.txt
@@ -1,82 +1,82 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x428
-  RenderBlock {HTML} at (0,0) size 800x428
-    RenderBody {BODY} at (8,16) size 784x396
+layer at (0,0) size 800x430
+  RenderBlock {HTML} at (0,0) size 800x430
+    RenderBody {BODY} at (8,16) size 784x398
       RenderBlock {P} at (0,0) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 226x19
+        RenderText {#text} at (0,0) size 226x17
           text run at (0,0) width 226: "This sentence should be underlined."
       RenderBlock {P} at (0,34) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 218x19
+        RenderText {#text} at (0,0) size 218x17
           text run at (0,0) width 218: "This sentence should be overlined."
       RenderBlock {P} at (0,68) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 232x19
+        RenderText {#text} at (0,0) size 232x17
           text run at (0,0) width 232: "This sentence should be stricken out."
       RenderBlock {P} at (0,102) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 369x19
+        RenderText {#text} at (0,0) size 369x17
           text run at (0,0) width 369: "This sentence should be blinking (if the UA supports that)."
       RenderBlock {P} at (0,136) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 227x19
+        RenderText {#text} at (0,0) size 227x17
           text run at (0,0) width 227: "The sentence should be underlined. "
-        RenderInline {B} at (0,0) size 238x19
-          RenderText {#text} at (227,0) size 238x19
+        RenderInline {B} at (0,0) size 238x17
+          RenderText {#text} at (227,0) size 238x17
             text run at (227,0) width 238: "This sentence should be underlined"
-        RenderText {#text} at (465,0) size 4x19
+        RenderText {#text} at (465,0) size 4x17
           text run at (465,0) width 4: "."
       RenderBlock {P} at (0,170) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 316x19
+        RenderText {#text} at (0,0) size 316x17
           text run at (0,0) width 316: "This sentence should be underlined and overlined."
       RenderBlock {P} at (0,204) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 377x19
+        RenderText {#text} at (0,0) size 377x17
           text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken."
       RenderBlock {DIV} at (0,238) size 784x0 [color=#FF0000]
-      RenderBlock {P} at (0,238) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 285x19
-          text run at (0,0) width 285: "There should be no red at the end of this line."
+      RenderBlock {P} at (0,238) size 784x19 [color=#000080]
+        RenderText {#text} at (0,1) size 285x17
+          text run at (0,1) width 285: "There should be no red at the end of this line."
         RenderImage {IMG} at (285,0) size 15x15 [color=#FF0000]
-        RenderText {#text} at (300,0) size 4x19
-          text run at (300,0) width 4: " "
-      RenderBlock {P} at (0,272) size 784x38 [color=#000080]
-        RenderText {#text} at (0,2) size 199x19
-          text run at (0,2) width 199: "The text of this sentence and all"
-        RenderInline {SPAN} at (0,0) size 4x19
-          RenderText {#text} at (199,2) size 4x19
-            text run at (199,2) width 4: " "
-        RenderText {#text} at (203,2) size 14x19
-          text run at (203,2) width 14: "its"
-        RenderInline {SPAN} at (0,0) size 4x19
-          RenderText {#text} at (217,2) size 4x19
-            text run at (217,2) width 4: " "
-        RenderText {#text} at (221,2) size 308x19
-          text run at (221,2) width 308: "spaces (including the space between the images) "
+        RenderText {#text} at (300,1) size 4x17
+          text run at (300,1) width 4: " "
+      RenderBlock {P} at (0,273) size 784x39 [color=#000080]
+        RenderText {#text} at (0,3) size 199x17
+          text run at (0,3) width 199: "The text of this sentence and all"
+        RenderInline {SPAN} at (0,0) size 4x17
+          RenderText {#text} at (199,3) size 4x17
+            text run at (199,3) width 4: " "
+        RenderText {#text} at (203,3) size 14x17
+          text run at (203,3) width 14: "its"
+        RenderInline {SPAN} at (0,0) size 4x17
+          RenderText {#text} at (217,3) size 4x17
+            text run at (217,3) width 4: " "
+        RenderText {#text} at (221,3) size 308x17
+          text run at (221,3) width 308: "spaces (including the space between the images) "
         RenderImage {IMG} at (529,0) size 17x17 [color=#FF0000]
-        RenderText {#text} at (546,2) size 4x19
-          text run at (546,2) width 4: " "
+        RenderText {#text} at (546,3) size 4x17
+          text run at (546,3) width 4: " "
         RenderImage {IMG} at (550,0) size 17x17 [color=#FF0000]
-        RenderText {#text} at (567,2) size 754x37
-          text run at (567,2) width 4: " "
-          text run at (571,2) width 183: "should be underlined, but the"
-          text run at (0,20) width 167: "images themselves should "
-        RenderInline {EM} at (0,0) size 20x19
-          RenderText {#text} at (167,20) size 20x19
-            text run at (167,20) width 20: "not"
-        RenderText {#text} at (187,20) size 94x19
-          text run at (187,20) width 94: " be underlined."
-      RenderBlock {P} at (0,326) size 784x36 [color=#000080]
-        RenderText {#text} at (0,0) size 568x19
+        RenderText {#text} at (567,3) size 754x35
+          text run at (567,3) width 4: " "
+          text run at (571,3) width 183: "should be underlined, but the"
+          text run at (0,21) width 167: "images themselves should "
+        RenderInline {EM} at (0,0) size 20x17
+          RenderText {#text} at (167,21) size 20x17
+            text run at (167,21) width 20: "not"
+        RenderText {#text} at (187,21) size 94x17
+          text run at (187,21) width 94: " be underlined."
+      RenderBlock {P} at (0,328) size 784x36 [color=#000080]
+        RenderText {#text} at (0,0) size 568x17
           text run at (0,0) width 478: "This sentence should have a long blue underline including between the two "
           text run at (478,0) width 90: "arrows here\x{2192}"
-        RenderInline {SPAN} at (0,0) size 164x19 [color=#FFFFFF]
-          RenderText {#text} at (568,0) size 164x19
+        RenderInline {SPAN} at (0,0) size 164x17 [color=#FFFFFF]
+          RenderText {#text} at (568,0) size 164x17
             text run at (568,0) width 164: " FAIL FAIL FAIL FAIL "
-        RenderText {#text} at (732,0) size 771x37
+        RenderText {#text} at (732,0) size 771x35
           text run at (732,0) width 39: "\x{2190}and"
           text run at (0,18) width 31: "here."
-      RenderBlock {P} at (0,378) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 343x19
+      RenderBlock {P} at (0,380) size 784x18 [color=#000080]
+        RenderText {#text} at (0,0) size 343x17
           text run at (0,0) width 343: "There should be a long blue underline between here\x{2192}"
-        RenderInline {SPAN} at (0,0) size 88x19
-          RenderText {#text} at (343,0) size 88x19
+        RenderInline {SPAN} at (0,0) size 88x17
+          RenderText {#text} at (343,0) size 88x17
             text run at (343,0) width 88: "                      "
-        RenderText {#text} at (431,0) size 74x19
+        RenderText {#text} at (431,0) size 74x17
           text run at (431,0) width 74: "\x{2190}and here."
diff --git a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-001-expected.png
index 39ccb9a..5e54965 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-001-expected.txt
index 1d439a4..b32f19d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 150x19
+        RenderText {#text} at (0,0) size 150x17
           text run at (0,0) width 150: "There should be no red."
 layer at (8,146) size 100x100
   RenderBlock (positioned) {DIV} at (0,32) size 100x100 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-002-expected.png
index 5dcef65..d0c5926 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-002-expected.txt
index c9a95e2..456ae82 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 150x19
+        RenderText {#text} at (0,0) size 150x17
           text run at (0,0) width 150: "There should be no red."
 layer at (8,32) size 100x100
   RenderBlock (positioned) {DIV} at (8,32) size 100x100
diff --git a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-003-expected.png
index 5dcef65..d0c5926 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-003-expected.txt
index 379c5d4..c55b414 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 150x19
+        RenderText {#text} at (0,0) size 150x17
           text run at (0,0) width 150: "There should be no red."
 layer at (8,32) size 100x100
   RenderBlock (positioned) {DIV} at (8,32) size 100x100
diff --git a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-004-expected.png
index 5dcef65..d0c5926 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-004-expected.txt
index 5226bb5..d1472e4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/dynamic-top-change-004-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 150x19
+        RenderText {#text} at (0,0) size 150x17
           text run at (0,0) width 150: "There should be no red."
 layer at (8,32) size 100x100
   RenderBlock (positioned) {DIV} at (8,32) size 100x100
diff --git a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-001-expected.png
index 46e6ebc..239287a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-001-expected.txt
index b51acc2..3457827 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 261x19
+        RenderText {#text} at (0,0) size 261x17
           text run at (0,0) width 261: "Test passes if there is no red on this page."
       RenderBlock {DIV} at (0,34) size 784x0 [bgcolor=#FF0000]
         RenderInline {SPAN} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-002-expected.png
index ab68e5c..e6fee9a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-002-expected.txt
index 5b857eb..d2e9b9c 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-002-expected.txt
@@ -9,9 +9,9 @@
   RenderBlock {HTML} at (0,0) size 800x426
     RenderBody {BODY} at (8,16) size 784x402
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
       RenderBlock {DIV} at (0,114) size 784x288
         RenderBlock {DIV} at (0,0) size 528x144 [border: (24px solid #008000)]
-          RenderInline {SPAN} at (0,0) size 240x337 [bgcolor=#008000] [border: (24px solid #008000)]
+          RenderInline {SPAN} at (0,0) size 240x336 [bgcolor=#008000] [border: (24px solid #008000)]
           RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-003-expected.png
index bb6d0b3..72ab08a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-003-expected.txt
index b40f7e0..cd04720 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/empty-inline-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/empty-inline-003-expected.txt
@@ -3,17 +3,17 @@
 layer at (0,0) size 800x138 layerType: background only
 layer at (8,50) size 784x80
   RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 784x80 [bgcolor=#FF0000]
-    RenderText zI: -1 {#text} at (0,30) size 12x19
-      text run at (0,30) width 12: "X"
+    RenderText zI: -1 {#text} at (0,31) size 12x17
+      text run at (0,31) width 12: "X"
 layer at (0,0) size 800x138 layerType: foreground only
   RenderBlock {HTML} at (0,0) size 800x138
     RenderBody {BODY} at (8,16) size 784x114
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 617x19
+        RenderText {#text} at (0,0) size 617x17
           text run at (0,0) width 617: "Test passes if there is a wide bright green rectangle below with one \"X\" in it and if there is no red."
 layer at (8,50) size 784x80
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x80
     RenderBlock {DIV} at (0,0) size 784x80 [bgcolor=#00FF00]
-      RenderInline {SPAN} at (0,0) size 0x19
-      RenderText {#text} at (0,30) size 12x19
-        text run at (0,30) width 12: "X"
+      RenderInline {SPAN} at (0,0) size 0x17
+      RenderText {#text} at (0,31) size 12x17
+        text run at (0,31) width 12: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.png
index a92ee2e..8e066b4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.txt
index 732f66b..e0480e9 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-height-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x146
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x0
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.png
index 858eb27..71efdc3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.txt
index fdf8c44..bcce29d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 438x19
+        RenderText {#text} at (0,0) size 438x17
           text run at (0,0) width 438: "Test passes if the blue box is in the upper-left corner of the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderBlock (floating) {DIV} at (3,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.png
index ea587e3..2a14f13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.txt
index f033f84..e9cdd8e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 450x19
+        RenderText {#text} at (0,0) size 450x17
           text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderBlock (floating) {DIV} at (51,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.png
index 3dbcc62..8697e84 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.txt
index ae7f54c..9455092 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 447x19
+        RenderText {#text} at (0,0) size 447x17
           text run at (0,0) width 447: "Test passes if the blue box is in the upper-right corner of the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderBlock (floating) {DIV} at (99,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.png
index ea587e3..2a14f13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.txt
index f033f84..e9cdd8e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-004-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 450x19
+        RenderText {#text} at (0,0) size 450x17
           text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderBlock (floating) {DIV} at (51,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.png
index 858eb27..71efdc3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.txt
index fdf8c44..bcce29d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-005-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 438x19
+        RenderText {#text} at (0,0) size 438x17
           text run at (0,0) width 438: "Test passes if the blue box is in the upper-left corner of the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderBlock (floating) {DIV} at (3,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.png
index 22369e5..ba14cf1 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.txt
index a34c253..d828484 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-006-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x146
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
       RenderBlock (floating) {DIV} at (0,34) size 96x96 [color=#008000] [bgcolor=#FF0000]
-        RenderText {#text} at (0,0) size 96x97
+        RenderText {#text} at (0,0) size 96x96
           text run at (0,0) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.png
index d56b0e8..2d25835 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.txt
index de38996..4188891 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-007-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x196
     RenderBody {BODY} at (8,16) size 784x36
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 763x37
+        RenderText {#text} at (0,0) size 763x35
           text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it"
           text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
       RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000]
         RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000]
-          RenderText {#text} at (0,47) size 256x33
-            text run at (0,47) width 256: "XXXXXXXX"
+          RenderText {#text} at (0,48) size 256x32
+            text run at (0,48) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.png
index d56b0e8..2d25835 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.txt
index 202c203..dbe6109 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-008-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x196
     RenderBody {BODY} at (8,16) size 784x36
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 763x37
+        RenderText {#text} at (0,0) size 763x35
           text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it"
           text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
       RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000]
         RenderBlock (floating) {SPAN} at (0,0) size 128x128 [bgcolor=#008000]
-          RenderText {#text} at (0,47) size 256x33
-            text run at (0,47) width 256: "XXXXXXXX"
+          RenderText {#text} at (0,48) size 256x32
+            text run at (0,48) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.png
index d56b0e8..2d25835 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.txt
index 298ea83..c6fc78b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-009-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x196
     RenderBody {BODY} at (8,16) size 784x36
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 763x37
+        RenderText {#text} at (0,0) size 763x35
           text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it"
           text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
       RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000]
         RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000]
-          RenderText {#text} at (0,47) size 256x33
-            text run at (0,47) width 256: "XXXXXXXX"
+          RenderText {#text} at (0,48) size 256x32
+            text run at (0,48) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.png
index d56b0e8..2d25835 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.txt
index 298ea83..c6fc78b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-010-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x196
     RenderBody {BODY} at (8,16) size 784x36
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 763x37
+        RenderText {#text} at (0,0) size 763x35
           text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it"
           text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
       RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000]
         RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000]
-          RenderText {#text} at (0,47) size 256x33
-            text run at (0,47) width 256: "XXXXXXXX"
+          RenderText {#text} at (0,48) size 256x32
+            text run at (0,48) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.png
index d56b0e8..2d25835 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.txt
index 298ea83..c6fc78b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-011-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x196
     RenderBody {BODY} at (8,16) size 784x36
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 763x37
+        RenderText {#text} at (0,0) size 763x35
           text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it"
           text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
       RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#FF0000]
         RenderBlock (floating) {DIV} at (0,0) size 128x128 [bgcolor=#008000]
-          RenderText {#text} at (0,47) size 256x33
-            text run at (0,47) width 256: "XXXXXXXX"
+          RenderText {#text} at (0,48) size 256x32
+            text run at (0,48) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.png
index 49f1dc6..016c4bc 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.txt
index fc0c2f7..acd2eb7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-non-replaced-width-012-expected.txt
@@ -4,9 +4,9 @@
   RenderBlock {HTML} at (0,0) size 800x196
     RenderBody {BODY} at (8,16) size 784x36
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 763x37
+        RenderText {#text} at (0,0) size 763x35
           text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it"
           text run at (0,18) width 254: "and protruding out of it toward the right."
       RenderBlock (floating) {DIV} at (0,52) size 128x128 [bgcolor=#008000]
-        RenderText {#text} at (0,47) size 256x33
-          text run at (0,47) width 256: "XXXXXXXX"
+        RenderText {#text} at (0,48) size 256x32
+          text run at (0,48) width 256: "XXXXXXXX"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-001-expected.png
index d092cdf..0356189e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-001-expected.txt
index 0c0cd39..eabaaae 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x71
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 547x19
+        RenderText {#text} at (0,0) size 547x17
           text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines."
       RenderBlock (floating) {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
         RenderImage {IMG} at (0,3) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-002-expected.png
index 18ad8b3..7d23868 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-002-expected.txt
index 868d414..1ca1b3a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x65
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 15x15
   RenderBlock (floating) {DIV} at (0,34) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-003-expected.png
index a92ee2e..8e066b4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-003-expected.txt
index 35fa420..2e55ffe 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x146
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 96x96
   RenderBlock (floating) {DIV} at (0,34) size 96x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-004-expected.png
index f740da23..2bb44bf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-004-expected.txt
index 2e05046..a39fb05 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-004-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x206
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x0
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-005-expected.png
index 93b286f..6eb3b4f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-005-expected.txt
index 0064f9f..32fb2b0 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-005-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-007-expected.png
index f740da23..2bb44bf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-007-expected.txt
index 2e05046..a39fb05 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-height-007-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x206
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x0
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-001-expected.png
index 858eb27..71efdc3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-001-expected.txt
index 46c176e..bbef4a7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 438x19
+        RenderText {#text} at (0,0) size 438x17
           text run at (0,0) width 438: "Test passes if the blue box is in the upper-left corner of the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderImage {IMG} at (3,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-002-expected.png
index ea587e3..2a14f13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-002-expected.txt
index e57246f..3b94478 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 450x19
+        RenderText {#text} at (0,0) size 450x17
           text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderImage {IMG} at (51,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-003-expected.png
index 3dbcc62..8697e84 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-003-expected.txt
index 5e60ba6..b04a157 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 447x19
+        RenderText {#text} at (0,0) size 447x17
           text run at (0,0) width 447: "Test passes if the blue box is in the upper-right corner of the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderImage {IMG} at (99,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-004-expected.png
index ea587e3..2a14f13 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-004-expected.txt
index e57246f..3b94478 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-004-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 450x19
+        RenderText {#text} at (0,0) size 450x17
           text run at (0,0) width 450: "Test passes if the blue box is horizontally centered inside the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderImage {IMG} at (51,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-005-expected.png
index 858eb27..71efdc3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-005-expected.txt
index 46c176e..bbef4a7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-005-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 438x19
+        RenderText {#text} at (0,0) size 438x17
           text run at (0,0) width 438: "Test passes if the blue box is in the upper-left corner of the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderImage {IMG} at (3,3) size 96x96 [bgcolor=#0000FF]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-006-expected.png
index bbcfb5b..cefaffe 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-006-expected.txt
index 9bd6e06..146e8ac 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-006-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
       RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.png b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.png
index 130acde..9d43453 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.txt
index 6bedef1..33eccad 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/float-replaced-width-011-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
       RenderBlock {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.png
index bfad6bc..8adb458 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.txt
index 9c8e5a7..a500812 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/floating-replaced-height-008-expected.txt
@@ -1,33 +1,33 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x185
-  RenderBlock {HTML} at (0,0) size 800x185
+layer at (0,0) size 800x186
+  RenderBlock {HTML} at (0,0) size 800x186
     RenderBody {BODY} at (8,16) size 784x36
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 106x19
+        RenderText {#text} at (0,0) size 106x17
           text run at (0,0) width 106: "There should be "
-        RenderInline {STRONG} at (0,0) size 143x19
-          RenderText {#text} at (106,0) size 143x19
+        RenderInline {STRONG} at (0,0) size 143x17
+          RenderText {#text} at (106,0) size 143x17
             text run at (106,0) width 143: "5 filled green squares"
-        RenderText {#text} at (249,0) size 185x19
+        RenderText {#text} at (249,0) size 185x17
           text run at (249,0) width 185: " with the same width and the "
-        RenderInline {STRONG} at (0,0) size 80x19
-          RenderText {#text} at (434,0) size 80x19
+        RenderInline {STRONG} at (0,0) size 80x17
+          RenderText {#text} at (434,0) size 80x17
             text run at (434,0) width 80: "same height"
-        RenderText {#text} at (514,0) size 236x19
+        RenderText {#text} at (514,0) size 236x17
           text run at (514,0) width 236: ". The 5 filled green squares should be"
-        RenderInline {STRONG} at (0,0) size 57x19
-          RenderText {#text} at (0,18) size 57x19
+        RenderInline {STRONG} at (0,0) size 57x17
+          RenderText {#text} at (0,18) size 57x17
             text run at (0,18) width 57: "identical"
-        RenderText {#text} at (57,18) size 445x19
+        RenderText {#text} at (57,18) size 445x17
           text run at (57,18) width 445: " to each other. This should still remain true even after a window resize."
       RenderBlock {DIV} at (0,52) size 784x0
-        RenderImage {IMG} at (0,0) size 117x117
-        RenderImage {IMG} at (117,0) size 5x5
-        RenderImage {IMG} at (122,0) size 117x117
-        RenderImage {IMG} at (239,0) size 5x5
-        RenderImage {IMG} at (244,0) size 117x117
-        RenderImage {IMG} at (361,0) size 5x5
-        RenderImage {IMG} at (366,0) size 117x117
-        RenderImage {IMG} at (483,0) size 5x5
-        RenderImage {IMG} at (488,0) size 117x117
+        RenderImage {IMG} at (0,0) size 118x118
+        RenderImage {IMG} at (117,0) size 6x5
+        RenderImage {IMG} at (122,0) size 119x118
+        RenderImage {IMG} at (240,0) size 6x5
+        RenderImage {IMG} at (245,0) size 118x118
+        RenderImage {IMG} at (362,0) size 6x5
+        RenderImage {IMG} at (367,0) size 119x118
+        RenderImage {IMG} at (485,0) size 6x5
+        RenderImage {IMG} at (490,0) size 118x118
diff --git a/LayoutTests/platform/efl/css2.1/20110323/height-width-inline-table-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/height-width-inline-table-001-expected.png
index 78581f2..690ff51 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/height-width-inline-table-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/height-width-inline-table-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/height-width-inline-table-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/height-width-inline-table-001-expected.txt
index 832497a7..0bb1dd7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/height-width-inline-table-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/height-width-inline-table-001-expected.txt
@@ -1,19 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x161 layerType: background only
+layer at (0,0) size 800x162 layerType: background only
 layer at (8,50) size 100x100
   RenderBlock (positioned) zI: -1 {DIV} at (8,50) size 100x100 [bgcolor=#FF0000]
-layer at (0,0) size 800x161 layerType: foreground only
-  RenderBlock {HTML} at (0,0) size 800x161
-    RenderBody {BODY} at (8,16) size 784x137
+layer at (0,0) size 800x162 layerType: foreground only
+  RenderBlock {HTML} at (0,0) size 800x162
+    RenderBody {BODY} at (8,16) size 784x138
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 295x19
+        RenderText {#text} at (0,0) size 295x17
           text run at (0,0) width 295: "Test passes if there is a filled green square and "
-        RenderInline {STRONG} at (0,0) size 44x19
-          RenderText {#text} at (295,0) size 44x19
+        RenderInline {STRONG} at (0,0) size 44x17
+          RenderText {#text} at (295,0) size 44x17
             text run at (295,0) width 44: "no red"
-        RenderText {#text} at (339,0) size 4x19
+        RenderText {#text} at (339,0) size 4x17
           text run at (339,0) width 4: "."
-      RenderBlock (anonymous) at (0,34) size 784x103
+      RenderBlock (anonymous) at (0,34) size 784x104
         RenderTable {DIV} at (0,0) size 100x100 [bgcolor=#008000] [border: (25px solid #008000)]
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/height-width-table-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/height-width-table-001-expected.png
index 78581f2..690ff51 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/height-width-table-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/height-width-table-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/height-width-table-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/height-width-table-001-expected.txt
index 6bce658..edba4d5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/height-width-table-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/height-width-table-001-expected.txt
@@ -7,11 +7,11 @@
   RenderBlock {HTML} at (0,0) size 800x158
     RenderBody {BODY} at (8,16) size 784x134
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 295x19
+        RenderText {#text} at (0,0) size 295x17
           text run at (0,0) width 295: "Test passes if there is a filled green square and "
-        RenderInline {STRONG} at (0,0) size 44x19
-          RenderText {#text} at (295,0) size 44x19
+        RenderInline {STRONG} at (0,0) size 44x17
+          RenderText {#text} at (295,0) size 44x17
             text run at (295,0) width 44: "no red"
-        RenderText {#text} at (339,0) size 4x19
+        RenderText {#text} at (339,0) size 4x17
           text run at (339,0) width 4: "."
       RenderTable {DIV} at (0,34) size 100x100 [bgcolor=#008000] [border: (25px solid #008000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.png
index a92ee2e..8e066b4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt
index 79664d8..bdece11 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-001-expected.txt
@@ -1,13 +1,13 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x157
-  RenderBlock {HTML} at (0,0) size 800x157
-    RenderBody {BODY} at (8,16) size 784x133
+layer at (0,0) size 800x158
+  RenderBlock {HTML} at (0,0) size 800x158
+    RenderBody {BODY} at (8,16) size 784x134
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
-layer at (8,50) size 784x99
-  RenderBlock (relative positioned) {DIV} at (0,34) size 784x99
+layer at (8,50) size 784x100
+  RenderBlock (relative positioned) {DIV} at (0,34) size 784x100
     RenderBlock {DIV} at (0,0) size 96x96 [bgcolor=#0000FF]
       RenderBlock {DIV} at (0,0) size 96x96
     RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.png
index a92ee2e..8e066b4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt
index d815396..ba38077 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-height-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x154
     RenderBody {BODY} at (8,16) size 784x130
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x96
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.png
index 5593778..c80dce4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt
index f9ff3fe..913484b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-001-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x154
     RenderBody {BODY} at (8,16) size 784x130
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
       RenderBlock (anonymous) at (0,34) size 784x96
         RenderBlock {DIV} at (0,0) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
-          RenderText {#text} at (0,0) size 96x97
+          RenderText {#text} at (0,0) size 96x96
             text run at (0,0) width 96: "X"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.png
index 6770bf9..d5f2955 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt
index db2eb5d..194d489 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-002-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 680x19
+        RenderText {#text} at (0,0) size 680x17
           text run at (0,0) width 680: "Test passes if the blue box is in the upper-left corner of the black box and there is no red visible on the page."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 96x96 [color=#0000FF] [bgcolor=#FF0000]
-          RenderText {#text} at (0,0) size 96x97
+          RenderText {#text} at (0,0) size 96x96
             text run at (0,0) width 96: "X"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.png
index d56b0e8..2d25835 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt
index db8ee55..f010218 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-003-expected.txt
@@ -4,12 +4,12 @@
   RenderBlock {HTML} at (0,0) size 800x204
     RenderBody {BODY} at (8,16) size 784x180
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 763x37
+        RenderText {#text} at (0,0) size 763x35
           text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it"
           text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
       RenderBlock (anonymous) at (0,52) size 784x128
         RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#FF0000]
           RenderBlock {SPAN} at (0,0) size 128x128 [bgcolor=#008000]
-            RenderText {#text} at (0,47) size 256x33
-              text run at (0,47) width 256: "XXXXXXXX"
+            RenderText {#text} at (0,48) size 256x32
+              text run at (0,48) width 256: "XXXXXXXX"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.png
index d56b0e8..2d25835 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt
index bf1a8c1..44e56c5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-non-replaced-width-004-expected.txt
@@ -4,13 +4,13 @@
   RenderBlock {HTML} at (0,0) size 800x204
     RenderBody {BODY} at (8,16) size 784x180
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 763x37
+        RenderText {#text} at (0,0) size 763x35
           text run at (0,0) width 763: "Below there should be a green square. In the middle of such green square, a black horizontal stripe should be traversing it"
           text run at (0,18) width 484: "and protruding out of it toward the right. There should be no red in this page."
       RenderBlock (anonymous) at (0,52) size 784x128
         RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#FF0000]
           RenderBlock {DIV} at (0,0) size 128x128 [bgcolor=#008000]
-            RenderText {#text} at (0,47) size 256x33
-              text run at (0,47) width 256: "XXXXXXXX"
+            RenderText {#text} at (0,48) size 256x32
+              text run at (0,48) width 256: "XXXXXXXX"
           RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.png
index d092cdf..0356189e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt
index 094339f..f0eb1eb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x79
     RenderBody {BODY} at (8,16) size 784x55
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 547x19
+        RenderText {#text} at (0,0) size 547x17
           text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines."
       RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
         RenderImage {IMG} at (0,3) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.png
index 18ad8b3..7d23868 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.txt
index ea9034c..15574324 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x73
     RenderBody {BODY} at (8,16) size 784x49
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x15
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x15
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.png
index a92ee2e..8e066b4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.txt
index 3af584d..c4fe783 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x154
     RenderBody {BODY} at (8,16) size 784x130
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x96
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.png
index f740da23..2bb44bf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.txt
index 63a46b4..09e7562 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-004-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x214
     RenderBody {BODY} at (8,16) size 784x190
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x156
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.png
index 93b286f..6eb3b4f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.txt
index bc3c5fd..167b5ee 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-005-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.png
index f740da23..2bb44bf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.txt
index 63a46b4..09e7562 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-007-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x214
     RenderBody {BODY} at (8,16) size 784x190
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x156
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.png
index 56aa568..0fd0b57 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.txt
index a5154bb..86a5838 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-height-008-expected.txt
@@ -1,38 +1,38 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x196
-  RenderBlock {HTML} at (0,0) size 800x196
-    RenderBody {BODY} at (8,16) size 784x172
+layer at (0,0) size 800x198
+  RenderBlock {HTML} at (0,0) size 800x198
+    RenderBody {BODY} at (8,16) size 784x174
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 106x19
+        RenderText {#text} at (0,0) size 106x17
           text run at (0,0) width 106: "There should be "
-        RenderInline {STRONG} at (0,0) size 143x19
-          RenderText {#text} at (106,0) size 143x19
+        RenderInline {STRONG} at (0,0) size 143x17
+          RenderText {#text} at (106,0) size 143x17
             text run at (106,0) width 143: "5 filled green squares"
-        RenderText {#text} at (249,0) size 185x19
+        RenderText {#text} at (249,0) size 185x17
           text run at (249,0) width 185: " with the same width and the "
-        RenderInline {STRONG} at (0,0) size 80x19
-          RenderText {#text} at (434,0) size 80x19
+        RenderInline {STRONG} at (0,0) size 80x17
+          RenderText {#text} at (434,0) size 80x17
             text run at (434,0) width 80: "same height"
-        RenderText {#text} at (514,0) size 236x19
+        RenderText {#text} at (514,0) size 236x17
           text run at (514,0) width 236: ". The 5 filled green squares should be"
-        RenderInline {STRONG} at (0,0) size 57x19
-          RenderText {#text} at (0,18) size 57x19
+        RenderInline {STRONG} at (0,0) size 57x17
+          RenderText {#text} at (0,18) size 57x17
             text run at (0,18) width 57: "identical"
-        RenderText {#text} at (57,18) size 445x19
+        RenderText {#text} at (57,18) size 445x17
           text run at (57,18) width 445: " to each other. This should still remain true even after a window resize."
-      RenderBlock {DIV} at (0,52) size 784x120
-        RenderImage {OBJECT} at (0,0) size 117x117
-        RenderText {#text} at (117,102) size 4x19
-          text run at (117,102) width 4: " "
-        RenderImage {OBJECT} at (121,0) size 117x117
-        RenderText {#text} at (238,102) size 4x19
-          text run at (238,102) width 4: " "
-        RenderImage {OBJECT} at (242,0) size 117x117
-        RenderText {#text} at (359,102) size 4x19
-          text run at (359,102) width 4: " "
-        RenderImage {OBJECT} at (363,0) size 117x117
-        RenderText {#text} at (480,102) size 4x19
-          text run at (480,102) width 4: " "
-        RenderImage {OBJECT} at (484,0) size 117x117
+      RenderBlock {DIV} at (0,52) size 784x122
+        RenderImage {OBJECT} at (0,0) size 118x118
+        RenderText {#text} at (117,104) size 5x17
+          text run at (117,104) width 5: " "
+        RenderImage {OBJECT} at (121,0) size 119x118
+        RenderText {#text} at (239,104) size 5x17
+          text run at (239,104) width 5: " "
+        RenderImage {OBJECT} at (243,0) size 118x118
+        RenderText {#text} at (360,104) size 5x17
+          text run at (360,104) width 5: " "
+        RenderImage {OBJECT} at (364,0) size 119x118
+        RenderText {#text} at (482,104) size 5x17
+          text run at (482,104) width 5: " "
+        RenderImage {OBJECT} at (486,0) size 118x118
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.png
index bbcfb5b..cefaffe 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.txt
index bf5d9ff..8de4556 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x274
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
       RenderBlock {DIV} at (0,52) size 198x198 [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.png
index 130acde..9d43453 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.txt
index f2a0f80..a9b5d32 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-block-replaced-width-006-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
       RenderBlock {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.png
index 03cf797..3de3d74 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.txt
index e6f233f..d67bf0b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-002-expected.txt
@@ -4,13 +4,13 @@
   RenderBlock {HTML} at (0,0) size 800x282
     RenderBody {BODY} at (8,16) size 784x258
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,130) size 784x144
   RenderBlock (relative positioned) {DIV} at (0,114) size 784x144
-    RenderInline {SPAN} at (0,0) size 96x193 [color=#0000FF] [bgcolor=#0000FF]
-      RenderText {#text} at (0,23) size 96x97
-        text run at (0,23) width 96: "X"
+    RenderInline {SPAN} at (0,0) size 96x192 [color=#0000FF] [bgcolor=#0000FF]
+      RenderText {#text} at (0,24) size 96x96
+        text run at (0,24) width 96: "X"
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
 layer at (104,106) size 96x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.png
index 03cf797..3de3d74 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.txt
index 084a1867..a39cb21 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-height-003-expected.txt
@@ -4,13 +4,13 @@
   RenderBlock {HTML} at (0,0) size 800x282
     RenderBody {BODY} at (8,16) size 784x258
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,130) size 784x144
   RenderBlock (relative positioned) {DIV} at (0,114) size 784x144
-    RenderInline {SPAN} at (0,0) size 96x193 [color=#0000FF] [bgcolor=#0000FF] [border: (48px solid #0000FF) none (48px solid #0000FF) none]
-      RenderText {#text} at (0,23) size 96x97
-        text run at (0,23) width 96: "X"
+    RenderInline {SPAN} at (0,0) size 96x192 [color=#0000FF] [bgcolor=#0000FF] [border: (48px solid #0000FF) none (48px solid #0000FF) none]
+      RenderText {#text} at (0,24) size 96x96
+        text run at (0,24) width 96: "X"
     RenderText {#text} at (0,0) size 0x0
     RenderText {#text} at (0,0) size 0x0
 layer at (104,106) size 96x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.png
index 1fb6136..da3b7ff 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.txt
index 6b28942..52bdb94 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-001-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 481x19
+        RenderText {#text} at (0,0) size 481x17
           text run at (0,0) width 481: "Test passes if the blue box below is in the upper-left corner of the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderText {#text} at (0,0) size 0x0
-layer at (8,50) size 96x97
-  RenderInline (relative positioned) {SPAN} at (0,0) size 96x97 [color=#0000FF]
-    RenderText {#text} at (3,3) size 96x97
+layer at (8,50) size 96x96
+  RenderInline (relative positioned) {SPAN} at (0,0) size 96x96 [color=#0000FF]
+    RenderText {#text} at (3,3) size 96x96
       text run at (3,3) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.png
index 1fb6136..da3b7ff 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.txt
index 6b28942..52bdb94 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-non-replaced-width-002-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x256
     RenderBody {BODY} at (8,16) size 784x232
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 481x19
+        RenderText {#text} at (0,0) size 481x17
           text run at (0,0) width 481: "Test passes if the blue box below is in the upper-left corner of the black box."
       RenderBlock {DIV} at (0,34) size 198x198 [border: (3px solid #000000)]
         RenderText {#text} at (0,0) size 0x0
-layer at (8,50) size 96x97
-  RenderInline (relative positioned) {SPAN} at (0,0) size 96x97 [color=#0000FF]
-    RenderText {#text} at (3,3) size 96x97
+layer at (8,50) size 96x96
+  RenderInline (relative positioned) {SPAN} at (0,0) size 96x96 [color=#0000FF]
+    RenderText {#text} at (3,3) size 96x96
       text run at (3,3) width 96: "X"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-001-expected.png
index d092cdf..0356189e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-001-expected.txt
index 094339f..f0eb1eb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x79
     RenderBody {BODY} at (8,16) size 784x55
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 547x19
+        RenderText {#text} at (0,0) size 547x17
           text run at (0,0) width 547: "Test passes if there is no white space between the blue box below and the orange lines."
       RenderBlock {DIV} at (0,34) size 96x21 [border: (3px solid #FFA500) none (3px solid #FFA500) none]
         RenderImage {IMG} at (0,3) size 15x15
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.png
index 18ad8b3..7d23868 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.txt
index ea9034c..15574324 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x73
     RenderBody {BODY} at (8,16) size 784x49
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x15
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x15
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-003-expected.png
index a92ee2e..8e066b4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-003-expected.txt
index 3af584d..c4fe783 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x154
     RenderBody {BODY} at (8,16) size 784x130
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the blue and orange boxes below are the same height."
 layer at (8,50) size 784x96
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x96
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-004-expected.png
index f740da23..2bb44bf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-004-expected.txt
index 63a46b4..09e7562 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-004-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x214
     RenderBody {BODY} at (8,16) size 784x190
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x156
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-005-expected.png
index 93b286f..6eb3b4f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-005-expected.txt
index bc3c5fd..167b5ee 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-005-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x250
     RenderBody {BODY} at (8,16) size 784x226
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x192
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x192
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-007-expected.png
index f740da23..2bb44bf 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-007-expected.txt
index 63a46b4..09e7562 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-007-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x214
     RenderBody {BODY} at (8,16) size 784x190
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 303x19
+        RenderText {#text} at (0,0) size 303x17
           text run at (0,0) width 303: "Test passes if there is no red visible on the page."
 layer at (8,50) size 784x156
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x156
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-008-expected.png
index 56aa568..0fd0b57 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-008-expected.txt
index 9884ff4..c6b7e6f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-height-008-expected.txt
@@ -1,38 +1,38 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x196
-  RenderBlock {HTML} at (0,0) size 800x196
-    RenderBody {BODY} at (8,16) size 784x172
+layer at (0,0) size 800x198
+  RenderBlock {HTML} at (0,0) size 800x198
+    RenderBody {BODY} at (8,16) size 784x174
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 106x19
+        RenderText {#text} at (0,0) size 106x17
           text run at (0,0) width 106: "There should be "
-        RenderInline {STRONG} at (0,0) size 143x19
-          RenderText {#text} at (106,0) size 143x19
+        RenderInline {STRONG} at (0,0) size 143x17
+          RenderText {#text} at (106,0) size 143x17
             text run at (106,0) width 143: "5 filled green squares"
-        RenderText {#text} at (249,0) size 185x19
+        RenderText {#text} at (249,0) size 185x17
           text run at (249,0) width 185: " with the same width and the "
-        RenderInline {STRONG} at (0,0) size 80x19
-          RenderText {#text} at (434,0) size 80x19
+        RenderInline {STRONG} at (0,0) size 80x17
+          RenderText {#text} at (434,0) size 80x17
             text run at (434,0) width 80: "same height"
-        RenderText {#text} at (514,0) size 236x19
+        RenderText {#text} at (514,0) size 236x17
           text run at (514,0) width 236: ". The 5 filled green squares should be"
-        RenderInline {STRONG} at (0,0) size 57x19
-          RenderText {#text} at (0,18) size 57x19
+        RenderInline {STRONG} at (0,0) size 57x17
+          RenderText {#text} at (0,18) size 57x17
             text run at (0,18) width 57: "identical"
-        RenderText {#text} at (57,18) size 445x19
+        RenderText {#text} at (57,18) size 445x17
           text run at (57,18) width 445: " to each other. This should still remain true even after a window resize."
-      RenderBlock {DIV} at (0,52) size 784x120
-        RenderImage {IMG} at (0,0) size 117x117
-        RenderText {#text} at (117,102) size 4x19
-          text run at (117,102) width 4: " "
-        RenderImage {IMG} at (121,0) size 117x117
-        RenderText {#text} at (238,102) size 4x19
-          text run at (238,102) width 4: " "
-        RenderImage {IMG} at (242,0) size 117x117
-        RenderText {#text} at (359,102) size 4x19
-          text run at (359,102) width 4: " "
-        RenderImage {IMG} at (363,0) size 117x117
-        RenderText {#text} at (480,102) size 4x19
-          text run at (480,102) width 4: " "
-        RenderImage {IMG} at (484,0) size 117x117
+      RenderBlock {DIV} at (0,52) size 784x122
+        RenderImage {IMG} at (0,0) size 118x118
+        RenderText {#text} at (117,104) size 5x17
+          text run at (117,104) width 5: " "
+        RenderImage {IMG} at (121,0) size 119x118
+        RenderText {#text} at (239,104) size 5x17
+          text run at (239,104) width 5: " "
+        RenderImage {IMG} at (243,0) size 118x118
+        RenderText {#text} at (360,104) size 5x17
+          text run at (360,104) width 5: " "
+        RenderImage {IMG} at (364,0) size 119x118
+        RenderText {#text} at (482,104) size 5x17
+          text run at (482,104) width 5: " "
+        RenderImage {IMG} at (486,0) size 118x118
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-001-expected.png
index 157c2af..22e19ed 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-001-expected.txt
index b00f23a..9aaaa40 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-001-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
       RenderBlock {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
-        RenderBlock (anonymous) at (3,3) size 192x99
+        RenderBlock (anonymous) at (3,3) size 192x100
           RenderImage {IMG} at (0,0) size 96x96
           RenderText {#text} at (0,0) size 0x0
-        RenderBlock {DIV} at (3,102) size 96x96 [bgcolor=#FFA500]
+        RenderBlock {DIV} at (3,103) size 96x96 [bgcolor=#FFA500]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-006-expected.png
index 130acde..9d43453 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-006-expected.txt
index f2a0f80..a9b5d32 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-006-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x370
     RenderBody {BODY} at (8,16) size 784x346
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x37
+        RenderText {#text} at (0,0) size 771x35
           text run at (0,0) width 771: "Test passes if the blue and orange boxes below are the same width, and the blue box is in the upper-left corner of the black"
           text run at (0,18) width 28: "box."
       RenderBlock {DIV} at (0,52) size 198x294 [border: (3px solid #000000)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.png
index 5bc0b66..182f51c 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt
index f65b99b..a99e46f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-011-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x166
     RenderBody {BODY} at (8,16) size 784x134
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 193x19
+        RenderText {#text} at (0,0) size 193x17
           text run at (0,0) width 193: "There should be no red below."
       RenderBlock {DIV} at (0,34) size 784x100 [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 784x100
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-012-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-012-expected.png
index a7fa450..081e7b3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-012-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-012-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-012-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-012-expected.txt
index b76bea2..548a8f7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-012-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-012-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x258
     RenderBody {BODY} at (8,16) size 784x234
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 193x19
+        RenderText {#text} at (0,0) size 193x17
           text run at (0,0) width 193: "There should be no red below."
       RenderBlock {DIV} at (0,34) size 600x200 [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 600x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-013-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-013-expected.png
index a7fa450..081e7b3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-013-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-013-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-013-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-013-expected.txt
index b76bea2..548a8f7 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-013-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-013-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x258
     RenderBody {BODY} at (8,16) size 784x234
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 193x19
+        RenderText {#text} at (0,0) size 193x17
           text run at (0,0) width 193: "There should be no red below."
       RenderBlock {DIV} at (0,34) size 600x200 [bgcolor=#FF0000]
         RenderBlock {P} at (0,0) size 600x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-014-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-014-expected.png
index 832783a..dc0dd9b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-014-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-014-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-014-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-014-expected.txt
index 0b03f74..223d1cc 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-014-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-014-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x282
     RenderBody {BODY} at (8,16) size 784x250
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 632x19
+        RenderText {#text} at (0,0) size 632x17
           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 246: "rectangles seperated by 1em of margin."
       RenderBlock {DIV} at (0,34) size 300x100 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-015-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-015-expected.png
index f321c3f..edd45d2 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-015-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-015-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-015-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-015-expected.txt
index 2610e31..4c4d01e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-015-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-replaced-width-015-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x474
     RenderBody {BODY} at (8,16) size 784x450
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 444x19
+        RenderText {#text} at (0,0) size 444x17
           text run at (0,0) width 444: "There should be no red below, just two 300x200 pixel lime rectangles."
 layer at (8,50) size 300x200
   RenderBlock (relative positioned) {DIV} at (0,34) size 300x200 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-table-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-table-001-expected.png
index df84fbb..46dda77 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-table-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-table-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-table-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-table-001-expected.txt
index 89c464b..e813acd 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-table-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-table-001-expected.txt
@@ -4,18 +4,18 @@
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 377x19
+        RenderText {#text} at (0,0) size 377x17
           text run at (0,0) width 377: "Test passes if the \"Filler Text\" below is all on the same line."
       RenderBlock {DIV} at (0,34) size 784x96
-        RenderInline {SPAN} at (0,0) size 66x19
-          RenderText {#text} at (0,0) size 66x19
+        RenderInline {SPAN} at (0,0) size 66x17
+          RenderText {#text} at (0,0) size 66x17
             text run at (0,0) width 66: "Filler Text"
-        RenderText {#text} at (66,0) size 4x19
+        RenderText {#text} at (66,0) size 4x17
           text run at (66,0) width 4: " "
         RenderTable {DIV} at (70,0) size 96x96 [bgcolor=#FFA500]
           RenderTableSection (anonymous) at (0,0) size 96x96
             RenderTableRow {DIV} at (0,0) size 96x96
               RenderTableCell {DIV} at (0,0) size 96x18 [r=0 c=0 rs=1 cs=1]
-                RenderText {#text} at (0,0) size 66x19
+                RenderText {#text} at (0,0) size 66x17
                   text run at (0,0) width 66: "Filler Text"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-table-002a-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-table-002a-expected.png
index aa00d44..bf37a7e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-table-002a-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-table-002a-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-table-002a-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-table-002a-expected.txt
index 77e15b8..cc8163a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-table-002a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-table-002a-expected.txt
@@ -4,17 +4,17 @@
   RenderBlock {HTML} at (0,0) size 800x68
     RenderBody {BODY} at (8,16) size 784x36
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 7x19
+        RenderText {#text} at (0,0) size 7x17
           text run at (0,0) width 7: "a"
         RenderTable {SPAN} at (7,0) size 23x36
           RenderTableSection (anonymous) at (0,0) size 23x36
             RenderTableRow (anonymous) at (0,0) size 23x36
               RenderTableCell (anonymous) at (0,0) size 23x36 [r=0 c=0 rs=1 cs=1]
                 RenderBlock (anonymous) at (0,0) size 23x18
-                  RenderText {#text} at (0,0) size 23x19
+                  RenderText {#text} at (0,0) size 23x17
                     text run at (0,0) width 23: "bcd"
                 RenderBlock {SPAN} at (0,18) size 23x18
-                  RenderText {#text} at (0,0) size 8x19
+                  RenderText {#text} at (0,0) size 8x17
                     text run at (0,0) width 8: "x"
-        RenderText {#text} at (30,0) size 7x19
+        RenderText {#text} at (30,0) size 7x17
           text run at (30,0) width 7: "e"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-table-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/inline-table-003-expected.png
index 5ff5e6d..6030215 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-table-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-table-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/inline-table-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/inline-table-003-expected.txt
index d37b9a31..f53c2fe 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/inline-table-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/inline-table-003-expected.txt
@@ -4,13 +4,13 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 7x19
+        RenderText {#text} at (0,0) size 7x17
           text run at (0,0) width 7: "a"
         RenderTable {SPAN} at (7,0) size 8x18
           RenderTableSection (anonymous) at (0,0) size 8x18
             RenderTableRow (anonymous) at (0,0) size 8x18
               RenderTableCell (anonymous) at (0,0) size 8x18 [r=0 c=0 rs=1 cs=1]
-                RenderText {#text} at (0,0) size 8x19
+                RenderText {#text} at (0,0) size 8x17
                   text run at (0,0) width 8: "b"
-        RenderText {#text} at (15,0) size 7x19
+        RenderText {#text} at (15,0) size 7x17
           text run at (15,0) width 7: "c"
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-001-expected.png
index e9ee332..c4058ba 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-001-expected.txt
index d8f964f..284535e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 457x19
+        RenderText {#text} at (0,0) size 457x17
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
 layer at (8,50) size 240x240
   RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-002-expected.png
index e9ee332..c4058ba 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-002-expected.txt
index d8f964f..284535e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-002-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 457x19
+        RenderText {#text} at (0,0) size 457x17
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
 layer at (8,50) size 240x240
   RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-003-expected.png
index e9ee332..c4058ba 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-003-expected.txt
index d8f964f..284535e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-003-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 457x19
+        RenderText {#text} at (0,0) size 457x17
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
 layer at (8,50) size 240x240
   RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-004-expected.png
index e9ee332..c4058ba 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-004-expected.txt
index 415beba..0092f89 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-004-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 457x19
+        RenderText {#text} at (0,0) size 457x17
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
 layer at (8,50) size 240x240
   RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-005-expected.png
index e9ee332..c4058ba 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-005-expected.txt
index 87a4f45..f6ccb4a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-005-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 457x19
+        RenderText {#text} at (0,0) size 457x17
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
 layer at (8,50) size 240x240
   RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-006-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-006-expected.png
index e9ee332..c4058ba 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-006-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-006-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-006-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-006-expected.txt
index 87a4f45..f6ccb4a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-006-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-006-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 457x19
+        RenderText {#text} at (0,0) size 457x17
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
 layer at (8,50) size 240x240
   RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-007-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-007-expected.png
index e9ee332..c4058ba 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-007-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-007-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-007-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-007-expected.txt
index 415beba..0092f89 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-007-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-007-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 457x19
+        RenderText {#text} at (0,0) size 457x17
           text run at (0,0) width 457: "Test passes if there is no space between the blue and orange lines below."
 layer at (8,50) size 240x240
   RenderBlock (positioned) {DIV} at (8,50) size 240x240 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-008-expected.png
index 80d67af..aa26fd4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-009-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-009-expected.png
index 4d16d48..7a599b8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-009-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-009-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-009-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-009-expected.txt
index 575f702..81e00a5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-009-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-009-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 437x19
+        RenderText {#text} at (0,0) size 437x17
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
 layer at (8,50) size 340x340
   RenderBlock (positioned) {DIV} at (8,50) size 340x340 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-010-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-010-expected.png
index 449ba35..328f2cb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-010-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-010-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-010-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-010-expected.txt
index 425a82e..d7c3bda 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-010-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-010-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x68
     RenderBody {BODY} at (8,16) size 784x36
       RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 779x37
+        RenderText {#text} at (0,0) size 779x35
           text run at (0,0) width 779: "Test passes if there is space between the blue and orange lines below and there is a marker bullet on the left-hand side of the"
           text run at (0,18) width 75: "orange box."
 layer at (8,68) size 340x340
   RenderBlock (positioned) {DIV} at (8,68) size 340x340 [border: (10px solid #0000FF)]
     RenderListItem {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)]
-      RenderListMarker at (-18,10) size 7x19: bullet
+      RenderListMarker at (-17,10) size 7x17: bullet
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-012-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-012-expected.png
index b654923..f582adb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-012-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-012-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-012-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-012-expected.txt
index 999fdb0..11aa401 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-012-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-012-expected.txt
@@ -4,9 +4,9 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 437x19
+        RenderText {#text} at (0,0) size 437x17
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
-layer at (8,50) size 340x343
-  RenderBlock (positioned) {DIV} at (8,50) size 340x343 [border: (10px solid #0000FF)]
+layer at (8,50) size 340x344
+  RenderBlock (positioned) {DIV} at (8,50) size 340x344 [border: (10px solid #0000FF)]
     RenderBlock {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)]
     RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-013-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-013-expected.png
index 4d16d48..7a599b8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-013-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-013-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-013-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-013-expected.txt
index 5b0f4b4..0b7adbc 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-013-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-013-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 437x19
+        RenderText {#text} at (0,0) size 437x17
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
 layer at (8,50) size 340x340
   RenderBlock (positioned) {DIV} at (8,50) size 340x340 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-014-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-014-expected.png
index b654923..f582adb 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-014-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-014-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-014-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-014-expected.txt
index 9a288d0..151f28b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-014-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-014-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 437x19
+        RenderText {#text} at (0,0) size 437x17
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
-layer at (8,50) size 340x343
-  RenderBlock (positioned) {DIV} at (8,50) size 340x343 [border: (10px solid #0000FF)]
+layer at (8,50) size 340x344
+  RenderBlock (positioned) {DIV} at (8,50) size 340x344 [border: (10px solid #0000FF)]
     RenderTable {DIV} at (60,60) size 220x220 [border: (10px solid #FFA500)]
       RenderTableSection (anonymous) at (10,10) size 200x200
         RenderTableRow {DIV} at (0,0) size 200x200
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-015-expected.png b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-015-expected.png
index 4d16d48..7a599b8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-015-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-015-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-015-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-015-expected.txt
index 825a49b..1717f35 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-015-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/margin-applies-to-015-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 437x19
+        RenderText {#text} at (0,0) size 437x17
           text run at (0,0) width 437: "Test passes if there is space between the blue and orange lines below."
 layer at (8,50) size 340x340
   RenderBlock (positioned) {DIV} at (8,50) size 340x340 [border: (10px solid #0000FF)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.png b/LayoutTests/platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.png
index 0f1ce11..c844b2e3 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.txt
index 7a995d1..5fd83b1 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/outline-color-applies-to-008-expected.txt
@@ -4,10 +4,10 @@
   RenderBlock {HTML} at (0,0) size 800x76
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 227x19
+        RenderText {#text} at (0,0) size 227x17
           text run at (0,0) width 227: "Test passes if the box below is blue."
       RenderBlock (anonymous) at (0,34) size 784x18
-        RenderInline {DIV} at (0,0) size 66x19
-          RenderText {#text} at (0,0) size 66x19
+        RenderInline {DIV} at (0,0) size 66x17
+          RenderText {#text} at (0,0) size 66x17
             text run at (0,0) width 66: "Filler Text"
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-elements-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/replaced-elements-001-expected.png
index 23a7ee5..27e938f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-elements-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-elements-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-elements-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/replaced-elements-001-expected.txt
index cac8f0f..94190d2 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-elements-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-elements-001-expected.txt
@@ -4,16 +4,16 @@
   RenderBlock {HTML} at (0,0) size 800x176
     RenderBody {BODY} at (8,16) size 784x144
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 598x19
+        RenderText {#text} at (0,0) size 598x17
           text run at (0,0) width 598: "Below, there should be 2 orange boxes horizontally centered within their respective green bars."
       RenderBlock {DIV} at (16,34) size 752x47 [bgcolor=#008000]
         RenderBlock (anonymous) at (0,0) size 752x18
-          RenderText {#text} at (0,0) size 36x19
+          RenderText {#text} at (0,0) size 36x17
             text run at (0,0) width 36: "         "
         RenderButton {INPUT} at (368,20) size 16x27 [bgcolor=#FFA500] [border: (2px outset #C0C0C0)]
       RenderBlock {FORM} at (0,97) size 784x47
         RenderBlock {DIV} at (16,0) size 752x47 [bgcolor=#008000]
           RenderBlock (anonymous) at (0,0) size 752x18
-            RenderText {#text} at (0,0) size 36x19
+            RenderText {#text} at (0,0) size 36x17
               text run at (0,0) width 36: "         "
           RenderButton {INPUT} at (368,20) size 16x27 [bgcolor=#FFA500] [border: (2px outset #C0C0C0)]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.png
index e3aa306..7813c00 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.txt
index 37da99c..a192376 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-001-expected.txt
@@ -1,23 +1,23 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (8,8) size 150x243 layerType: background only
+layer at (8,8) size 150x244 layerType: background only
 layer at (6,96) size 154x154
   RenderBlock (positioned) zI: -1 {P} at (6,96) size 154x154 [bgcolor=#FF0000] [border: (2px solid #00FF00)]
-    RenderText zI: -1 {#text} at (2,2) size 97x55
+    RenderText zI: -1 {#text} at (2,2) size 97x53
       text run at (2,2) width 97: "FAIL (absolute"
       text run at (2,20) width 94: "positioning not"
       text run at (2,38) width 67: "supported)"
-layer at (8,8) size 150x243 layerType: foreground only
-  RenderBlock {HTML} at (8,8) size 150x243
-    RenderBody {BODY} at (0,0) size 150x243
+layer at (8,8) size 150x244 layerType: foreground only
+  RenderBlock {HTML} at (8,8) size 150x244
+    RenderBody {BODY} at (0,0) size 150x244
       RenderBlock {P} at (0,0) size 150x90
-        RenderText {#text} at (0,0) size 149x91
+        RenderText {#text} at (0,0) size 149x89
           text run at (0,0) width 113: "There should be a"
           text run at (0,18) width 149: "green square below this"
           text run at (0,36) width 117: "line, exactly fitting"
           text run at (0,54) width 107: "inside a 2px lime"
           text run at (0,72) width 45: "border."
-      RenderBlock {P} at (0,90) size 150x153
+      RenderBlock {P} at (0,90) size 150x154
         RenderEmbeddedObject {OBJECT} at (0,0) size 150x150
           layer at (0,0) size 150x150
             RenderView at (0,0) size 150x150
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.png
index e47c0a7..400c813 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.txt
index d397c84..8d074b4 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-002-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock (relative positioned) {HTML} at (8,8) size 150x175
     RenderBody {BODY} at (0,0) size 150x175
       RenderBlock {P} at (0,0) size 150x175
-        RenderText {#text} at (0,0) size 359x19
-          text run at (0,0) width 359: "There should be an exact square of green below this line:"
+        RenderText {#text} at (0,1) size 359x17
+          text run at (0,1) width 359: "There should be an exact square of green below this line:"
         RenderEmbeddedObject {OBJECT} at (0,20) size 150x150
           layer at (0,0) size 150x150
             RenderView at (0,0) size 150x150
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.png b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.png
index 7e59936..8474f65 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.txt
index 10dad0f..2121377 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-003-expected.txt
@@ -11,5 +11,5 @@
             layer at (0,0) size 100x200
               RenderSVGRoot {svg} at (0,0) size 0x0
       RenderBlock {P} at (0,216) size 784x18
-        RenderText {#text} at (0,0) size 428x19
+        RenderText {#text} at (0,0) size 428x17
           text run at (0,0) width 428: "There should be a complete unbroken yin-yang symbol (\x{E2}\x{2DC}\x{AF}) above."
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.png b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.png
index ee365cc..eec965a 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.txt
index 19fb750..42aab75 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-004-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x161
-  RenderBlock {HTML} at (0,0) size 800x161
-    RenderBody {BODY} at (8,16) size 784x137
+layer at (0,0) size 800x162
+  RenderBlock {HTML} at (0,0) size 800x162
+    RenderBody {BODY} at (8,16) size 784x138
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 286x19
+        RenderText {#text} at (0,0) size 286x17
           text run at (0,0) width 286: "There must be a green box below and no red."
-      RenderBlock {DIV} at (0,34) size 784x103
+      RenderBlock {DIV} at (0,34) size 784x104
         RenderEmbeddedObject {OBJECT} at (0,0) size 100x100 [bgcolor=#008000] [border: (20px solid #FF0000)]
           layer at (0,0) size 60x60
             RenderView at (0,0) size 60x60
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.png b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.png
index 44fc229..1dc623c 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.txt
index bbeecf8..171b221 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-005-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x251
-  RenderBlock {HTML} at (0,0) size 800x251
-    RenderBody {BODY} at (8,16) size 784x227
+layer at (0,0) size 800x252
+  RenderBlock {HTML} at (0,0) size 800x252
+    RenderBody {BODY} at (8,16) size 784x228
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 286x19
+        RenderText {#text} at (0,0) size 286x17
           text run at (0,0) width 286: "There must be a green box below and no red."
-      RenderBlock {DIV} at (0,34) size 784x193
+      RenderBlock {DIV} at (0,34) size 784x194
         RenderEmbeddedObject {OBJECT} at (0,0) size 100x190 [bgcolor=#008000] [border: (20px solid #FF0000)]
           layer at (0,0) size 60x150
             RenderView at (0,0) size 60x150
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
index 10a52360..c5cf38e 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-min-max-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/replaced-min-max-001-expected.png
index d844001..98133cd 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-min-max-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-min-max-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/replaced-min-max-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/replaced-min-max-001-expected.txt
index 9855fb0..c1ed08f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/replaced-min-max-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/replaced-min-max-001-expected.txt
@@ -1,106 +1,106 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x268
-  RenderBlock {HTML} at (0,0) size 800x268
-    RenderBody {BODY} at (8,8) size 784x252
+layer at (0,0) size 800x271
+  RenderBlock {HTML} at (0,0) size 800x271
+    RenderBody {BODY} at (8,8) size 784x255
       RenderBlock {DIV} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 298x19
+        RenderText {#text} at (0,0) size 298x17
           text run at (0,0) width 298: "All twenty images should be identically square."
-      RenderBlock (anonymous) at (0,18) size 784x234
-        RenderInline {P} at (0,0) size 75x19
+      RenderBlock (anonymous) at (0,18) size 784x237
+        RenderInline {P} at (0,0) size 75x17
           RenderImage {IMG} at (0,0) size 75x75
-        RenderText {#text} at (75,60) size 4x19
-          text run at (75,60) width 4: " "
+        RenderText {#text} at (75,61) size 4x17
+          text run at (75,61) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
+        RenderInline {P} at (0,0) size 75x17
           RenderImage {IMG} at (79,0) size 75x75
-        RenderText {#text} at (154,60) size 4x19
-          text run at (154,60) width 4: " "
+        RenderText {#text} at (154,61) size 4x17
+          text run at (154,61) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
+        RenderInline {P} at (0,0) size 75x17
           RenderImage {IMG} at (158,0) size 75x75
-        RenderText {#text} at (233,60) size 4x19
-          text run at (233,60) width 4: " "
+        RenderText {#text} at (233,61) size 4x17
+          text run at (233,61) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
+        RenderInline {P} at (0,0) size 75x17
           RenderImage {IMG} at (237,0) size 75x75
-        RenderText {#text} at (312,60) size 4x19
-          text run at (312,60) width 4: " "
+        RenderText {#text} at (312,61) size 4x17
+          text run at (312,61) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
+        RenderInline {P} at (0,0) size 75x17
           RenderImage {IMG} at (316,0) size 75x75
-        RenderText {#text} at (391,60) size 4x19
-          text run at (391,60) width 4: " "
+        RenderText {#text} at (391,61) size 4x17
+          text run at (391,61) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
+        RenderInline {P} at (0,0) size 75x17
           RenderImage {IMG} at (395,0) size 75x75
-        RenderText {#text} at (470,60) size 4x19
-          text run at (470,60) width 4: " "
+        RenderText {#text} at (470,61) size 4x17
+          text run at (470,61) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
+        RenderInline {P} at (0,0) size 75x17
           RenderImage {IMG} at (474,0) size 75x75
-        RenderText {#text} at (549,60) size 4x19
-          text run at (549,60) width 4: " "
+        RenderText {#text} at (549,61) size 4x17
+          text run at (549,61) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
+        RenderInline {P} at (0,0) size 75x17
           RenderImage {IMG} at (553,0) size 75x75
-        RenderText {#text} at (628,60) size 4x19
-          text run at (628,60) width 4: " "
+        RenderText {#text} at (628,61) size 4x17
+          text run at (628,61) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
+        RenderInline {P} at (0,0) size 75x17
           RenderImage {IMG} at (632,0) size 75x75
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (0,78) size 75x75
-        RenderText {#text} at (75,138) size 4x19
-          text run at (75,138) width 4: " "
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (0,79) size 75x75
+        RenderText {#text} at (75,140) size 4x17
+          text run at (75,140) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (79,78) size 75x75
-        RenderText {#text} at (154,138) size 4x19
-          text run at (154,138) width 4: " "
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (79,79) size 75x75
+        RenderText {#text} at (154,140) size 4x17
+          text run at (154,140) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (158,78) size 75x75
-        RenderText {#text} at (233,138) size 4x19
-          text run at (233,138) width 4: " "
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (158,79) size 75x75
+        RenderText {#text} at (233,140) size 4x17
+          text run at (233,140) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (237,78) size 75x75
-        RenderText {#text} at (312,138) size 4x19
-          text run at (312,138) width 4: " "
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (237,79) size 75x75
+        RenderText {#text} at (312,140) size 4x17
+          text run at (312,140) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (316,78) size 75x75
-        RenderText {#text} at (391,138) size 4x19
-          text run at (391,138) width 4: " "
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (316,79) size 75x75
+        RenderText {#text} at (391,140) size 4x17
+          text run at (391,140) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (395,78) size 75x75
-        RenderText {#text} at (470,138) size 4x19
-          text run at (470,138) width 4: " "
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (395,79) size 75x75
+        RenderText {#text} at (470,140) size 4x17
+          text run at (470,140) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (474,78) size 75x75
-        RenderText {#text} at (549,138) size 4x19
-          text run at (549,138) width 4: " "
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (474,79) size 75x75
+        RenderText {#text} at (549,140) size 4x17
+          text run at (549,140) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (553,78) size 75x75
-        RenderText {#text} at (628,138) size 4x19
-          text run at (628,138) width 4: " "
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (553,79) size 75x75
+        RenderText {#text} at (628,140) size 4x17
+          text run at (628,140) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (632,78) size 75x75
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (632,79) size 75x75
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (0,156) size 75x75
-        RenderText {#text} at (75,216) size 4x19
-          text run at (75,216) width 4: " "
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (0,158) size 75x75
+        RenderText {#text} at (75,219) size 4x17
+          text run at (75,219) width 4: " "
         RenderText {#text} at (0,0) size 0x0
-        RenderInline {P} at (0,0) size 75x19
-          RenderImage {IMG} at (79,156) size 75x75
+        RenderInline {P} at (0,0) size 75x17
+          RenderImage {IMG} at (79,158) size 75x75
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/table-caption-001-expected.png
index bbcedb5..297d2af 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/table-caption-001-expected.txt
index f8254d6..5a3e40b 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-001-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x172
     RenderBody {BODY} at (8,16) size 784x148
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 302x19
+        RenderText {#text} at (0,0) size 302x17
           text run at (0,0) width 302: "Test passes if the \"Filler Text\" is above the box."
       RenderTable {DIV} at (0,34) size 96x114
         RenderBlock {DIV} at (0,0) size 96x18
-          RenderText {#text} at (0,0) size 66x19
+          RenderText {#text} at (0,0) size 66x17
             text run at (0,0) width 66: "Filler Text"
         RenderTableSection (anonymous) at (0,18) size 96x96
           RenderTableRow {DIV} at (0,0) size 96x48
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/table-caption-002-expected.png
index 975b2b5..15049f0 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/table-caption-002-expected.txt
index a3ffeb9..3047dec 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-002-expected.txt
@@ -6,29 +6,29 @@
       RenderTableSection (anonymous) at (0,54) size 784x54
         RenderTableRow (anonymous) at (0,0) size 784x36
           RenderTableCell {DIV} at (0,0) size 784x36 [r=0 c=0 rs=1 cs=1]
-            RenderText {#text} at (0,0) size 743x37
+            RenderText {#text} at (0,0) size 743x35
               text run at (0,0) width 743: "Test passes if the numbers above are in order from top-to-bottom (1-3) and the number below are in order from top-to-"
               text run at (0,18) width 83: "bottom (4-6)."
         RenderTableRow {DIV} at (0,36) size 784x18 [color=#008000]
           RenderTableCell (anonymous) at (0,36) size 784x18 [r=1 c=0 rs=1 cs=1]
-            RenderText {#text} at (0,0) size 179x19
+            RenderText {#text} at (0,0) size 179x17
               text run at (0,0) width 179: "4. This line should be green."
       RenderBlock {DIV} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 179x19
+        RenderText {#text} at (0,0) size 179x17
           text run at (0,0) width 179: "1. This line should be green."
       RenderBlock {DIV} at (0,18) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 179x19
+        RenderText {#text} at (0,0) size 179x17
           text run at (0,0) width 179: "2. This line should be green."
       RenderTableSection (anonymous) at (0,108) size 784x18
         RenderTableRow {DIV} at (0,0) size 784x18 [color=#008000]
           RenderTableCell (anonymous) at (0,0) size 784x18 [r=0 c=0 rs=1 cs=1]
-            RenderText {#text} at (0,0) size 179x19
+            RenderText {#text} at (0,0) size 179x17
               text run at (0,0) width 179: "5. This line should be green."
       RenderBlock {DIV} at (0,36) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 179x19
+        RenderText {#text} at (0,0) size 179x17
           text run at (0,0) width 179: "3. This line should be green."
       RenderTableSection (anonymous) at (0,126) size 784x18
         RenderTableRow {DIV} at (0,0) size 784x18 [color=#008000]
           RenderTableCell (anonymous) at (0,0) size 784x18 [r=0 c=0 rs=1 cs=1]
-            RenderText {#text} at (0,0) size 179x19
+            RenderText {#text} at (0,0) size 179x17
               text run at (0,0) width 179: "6. This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png
index 0adf1cb..68d43e1 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt
index d0fbc91..9b5c2b6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-horizontal-alignment-001-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x60
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 425x19
+        RenderText {#text} at (0,0) size 425x17
           text run at (0,0) width 425: "Test passes if the \"Filler Text\" below is on the right side of the box."
       RenderTable {TABLE} at (0,34) size 202x26
         RenderBlock {CAPTION} at (0,0) size 202x20 [border: (1px solid #000000)]
-          RenderText {#text} at (135,1) size 66x19
+          RenderText {#text} at (135,1) size 66x17
             text run at (135,1) width 66: "Filler Text"
         RenderTableSection {TBODY} at (0,20) size 202x6
           RenderTableRow {TR} at (0,2) size 202x2
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-margins-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/table-caption-margins-001-expected.png
index 0d548cd..74bfe5f 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-margins-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-margins-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-margins-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/table-caption-margins-001-expected.txt
index 42a63e1..ea7f341 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-margins-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-margins-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x245
     RenderBody {BODY} at (8,16) size 784x214
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 393x19
+        RenderText {#text} at (0,0) size 393x17
           text run at (0,0) width 393: "There must be four evenly-spaced blue bars below and no red."
       RenderBlock {DIV} at (15,34) size 96x180 [border: (15px solid #FF0000) none (15px solid #FF0000) none]
         RenderBlock {DIV} at (0,0) size 96x180 [border: (15px solid #0000FF) none (15px solid #0000FF) none]
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-001-expected.png
index 8b7b72e..7852920 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-001-expected.txt
index 0e54fc8..36ef928 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-001-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x294
     RenderBody {BODY} at (8,16) size 784x270
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 637x19
+        RenderText {#text} at (0,0) size 637x17
           text run at (0,0) width 637: "Test passes if the top square below has \"Filler Text\" directly above it and the bottom square does not."
       RenderTable {DIV} at (0,34) size 100x118
         RenderBlock {DIV} at (0,0) size 100x18
-          RenderText {#text} at (0,0) size 66x19
+          RenderText {#text} at (0,0) size 66x17
             text run at (0,0) width 66: "Filler Text"
         RenderTableSection (anonymous) at (0,18) size 100x100
           RenderTableRow {DIV} at (0,0) size 100x50
@@ -18,7 +18,7 @@
             RenderTableCell {DIV} at (0,50) size 50x0 [bgcolor=#000000] [r=1 c=0 rs=1 cs=1]
             RenderTableCell {DIV} at (50,50) size 50x0 [bgcolor=#000000] [r=1 c=1 rs=1 cs=1]
       RenderBlock {DIV} at (0,152) size 784x18
-        RenderText {#text} at (0,0) size 4x19
+        RenderText {#text} at (0,0) size 4x17
           text run at (0,0) width 4: " "
       RenderTable {DIV} at (0,170) size 100x100
         RenderTableSection (anonymous) at (0,0) size 100x100
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-002-expected.png b/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-002-expected.png
index 9adca02..4f2fca6 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-002-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-002-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-002-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-002-expected.txt
index 845c2e1..1c5696d 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-002-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-caption-optional-002-expected.txt
@@ -1,15 +1,15 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x179
-  RenderBlock {HTML} at (0,0) size 800x179
-    RenderBody {BODY} at (8,16) size 784x155
+layer at (0,0) size 800x180
+  RenderBlock {HTML} at (0,0) size 800x180
+    RenderBody {BODY} at (8,16) size 784x156
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 665x19
+        RenderText {#text} at (0,0) size 665x17
           text run at (0,0) width 665: "Test passes if the left square below has \"Filler Text\" directly above it and the square on the right does not."
-      RenderBlock {DIV} at (0,34) size 784x121
+      RenderBlock {DIV} at (0,34) size 784x122
         RenderTable {SPAN} at (0,0) size 100x118
           RenderBlock {SPAN} at (0,0) size 100x18
-            RenderText {#text} at (0,0) size 66x19
+            RenderText {#text} at (0,0) size 66x17
               text run at (0,0) width 66: "Filler Text"
           RenderTableSection (anonymous) at (0,18) size 100x100
             RenderTableRow {SPAN} at (0,0) size 100x50
@@ -18,9 +18,9 @@
             RenderTableRow {SPAN} at (0,50) size 100x50
               RenderTableCell {SPAN} at (0,50) size 50x0 [bgcolor=#000000] [r=1 c=0 rs=1 cs=1]
               RenderTableCell {SPAN} at (50,50) size 50x0 [bgcolor=#000000] [r=1 c=1 rs=1 cs=1]
-        RenderText {#text} at (100,103) size 16x19
-          text run at (100,103) width 4: " "
-          text run at (104,103) width 12: "   "
+        RenderText {#text} at (100,104) size 16x17
+          text run at (100,104) width 4: " "
+          text run at (104,104) width 12: "   "
         RenderTable {SPAN} at (116,18) size 100x100
           RenderTableSection (anonymous) at (0,0) size 100x100
             RenderTableRow {SPAN} at (0,0) size 100x50
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-023-expected.png b/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-023-expected.png
index 6af940d..01dada8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-023-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-023-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-023-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-023-expected.txt
index 53121d8..cc04af8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-023-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-023-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x158
     RenderBody {BODY} at (8,16) size 784x134
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 390x19
+        RenderText {#text} at (0,0) size 390x17
           text run at (0,0) width 390: "Test passes if the bottom of the \"Filler Text\" below is aligned."
       RenderTable {TABLE} at (0,34) size 358x100
         RenderTableSection {TBODY} at (0,0) size 358x100
@@ -13,9 +13,9 @@
               RenderBlock {DIV} at (1,1) size 57x15
                 RenderText {#text} at (0,0) size 57x15
                   text run at (0,0) width 57: "Filler Text"
-            RenderTableCell {TD} at (63,13) size 120x33 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (63,14) size 120x33 [r=0 c=1 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 118x31
-                RenderText {#text} at (0,0) size 118x31
+                RenderText {#text} at (0,0) size 118x30
                   text run at (0,0) width 118: "Filler Text"
             RenderTableCell {TD} at (185,2) size 171x48 [r=0 c=2 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 169x46
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-024-expected.png b/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-024-expected.png
index 6af940d..01dada8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-024-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-024-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-024-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-024-expected.txt
index 53121d8..cc04af8 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-024-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/table-height-algorithm-024-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x158
     RenderBody {BODY} at (8,16) size 784x134
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 390x19
+        RenderText {#text} at (0,0) size 390x17
           text run at (0,0) width 390: "Test passes if the bottom of the \"Filler Text\" below is aligned."
       RenderTable {TABLE} at (0,34) size 358x100
         RenderTableSection {TBODY} at (0,0) size 358x100
@@ -13,9 +13,9 @@
               RenderBlock {DIV} at (1,1) size 57x15
                 RenderText {#text} at (0,0) size 57x15
                   text run at (0,0) width 57: "Filler Text"
-            RenderTableCell {TD} at (63,13) size 120x33 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (63,14) size 120x33 [r=0 c=1 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 118x31
-                RenderText {#text} at (0,0) size 118x31
+                RenderText {#text} at (0,0) size 118x30
                   text run at (0,0) width 118: "Filler Text"
             RenderTableCell {TD} at (185,2) size 171x48 [r=0 c=2 rs=1 cs=1]
               RenderBlock {DIV} at (1,1) size 169x46
diff --git a/LayoutTests/platform/efl/css2.1/20110323/width-non-replaced-inline-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/width-non-replaced-inline-001-expected.png
index f17d081..33dba87 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/width-non-replaced-inline-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/width-non-replaced-inline-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/width-replaced-element-001-expected.png b/LayoutTests/platform/efl/css2.1/20110323/width-replaced-element-001-expected.png
index 8e36d2f..6e2ea23 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/width-replaced-element-001-expected.png
+++ b/LayoutTests/platform/efl/css2.1/20110323/width-replaced-element-001-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/20110323/width-replaced-element-001-expected.txt b/LayoutTests/platform/efl/css2.1/20110323/width-replaced-element-001-expected.txt
index efa2d28..c1837c5 100644
--- a/LayoutTests/platform/efl/css2.1/20110323/width-replaced-element-001-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/20110323/width-replaced-element-001-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x73
     RenderBody {BODY} at (8,16) size 784x49
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 491x19
+        RenderText {#text} at (0,0) size 491x17
           text run at (0,0) width 491: "Test passes if the blue square is the same size or larger than the orange square."
 layer at (8,50) size 784x15
   RenderBlock (relative positioned) {DIV} at (0,34) size 784x15
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-border-00-c-expected.png b/LayoutTests/platform/efl/css2.1/t010403-shand-border-00-c-expected.png
index ccb2302..558817b 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-border-00-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-border-00-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-border-00-c-expected.txt b/LayoutTests/platform/efl/css2.1/t010403-shand-border-00-c-expected.txt
index 20c38e3..70685db 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-border-00-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-border-00-c-expected.txt
@@ -4,6 +4,6 @@
   RenderBlock {HTML} at (0,0) size 800x56
     RenderBody {BODY} at (8,16) size 784x24 [bgcolor=#FFFFFF]
       RenderBlock {P} at (0,0) size 784x24 [color=#008000] [border: (3px solid #008000)]
-        RenderInline {SPAN} at (0,0) size 234x19 [color=#000000]
-          RenderText {#text} at (3,3) size 234x19
+        RenderInline {SPAN} at (0,0) size 234x17 [color=#000000]
+          RenderText {#text} at (3,3) size 234x17
             text run at (3,3) width 234: "This text should have a green border."
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-00-b-expected.png b/LayoutTests/platform/efl/css2.1/t010403-shand-font-00-b-expected.png
index afece2d..fb5d258 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-font-00-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-font-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t010403-shand-font-00-b-expected.txt
index 4943e54..f4a435f 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-font-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-font-00-b-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x118
     RenderBody {BODY} at (8,16) size 784x86
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 289x19
+        RenderText {#text} at (0,0) size 289x17
           text run at (0,0) width 289: "The following paragraphs should be identical:"
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 248x19
+        RenderText {#text} at (0,0) size 248x17
           text run at (0,0) width 248: "This should be in a normal weight font."
       RenderBlock {P} at (0,68) size 784x18
-        RenderText {#text} at (0,0) size 248x19
+        RenderText {#text} at (0,0) size 248x17
           text run at (0,0) width 248: "This should be in a normal weight font."
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.png b/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.png
index afece2d..fb5d258 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.txt
index 4943e54..f4a435f 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-font-01-b-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x118
     RenderBody {BODY} at (8,16) size 784x86
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 289x19
+        RenderText {#text} at (0,0) size 289x17
           text run at (0,0) width 289: "The following paragraphs should be identical:"
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 248x19
+        RenderText {#text} at (0,0) size 248x17
           text run at (0,0) width 248: "This should be in a normal weight font."
       RenderBlock {P} at (0,68) size 784x18
-        RenderText {#text} at (0,0) size 248x19
+        RenderText {#text} at (0,0) size 248x17
           text run at (0,0) width 248: "This should be in a normal weight font."
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.png b/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.png
index 9ba97da..8bba1aa 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.txt
index afefac8..1f24ec3 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-font-02-b-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x118
     RenderBody {BODY} at (8,16) size 784x86
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 289x19
+        RenderText {#text} at (0,0) size 289x17
           text run at (0,0) width 289: "The following paragraphs should be identical:"
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 197x19
+        RenderText {#text} at (0,0) size 197x17
           text run at (0,0) width 197: "This should be in a bold font."
       RenderBlock {P} at (0,68) size 784x18
-        RenderText {#text} at (0,0) size 197x19
+        RenderText {#text} at (0,0) size 197x17
           text run at (0,0) width 197: "This should be in a bold font."
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.png b/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.png
index 9ba97da..8bba1aa 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.txt
index afefac8..1f24ec3 100644
--- a/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t010403-shand-font-03-b-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x118
     RenderBody {BODY} at (8,16) size 784x86
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 289x19
+        RenderText {#text} at (0,0) size 289x17
           text run at (0,0) width 289: "The following paragraphs should be identical:"
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 197x19
+        RenderText {#text} at (0,0) size 197x17
           text run at (0,0) width 197: "This should be in a bold font."
       RenderBlock {P} at (0,68) size 784x18
-        RenderText {#text} at (0,0) size 197x19
+        RenderText {#text} at (0,0) size 197x17
           text run at (0,0) width 197: "This should be in a bold font."
diff --git a/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.png b/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.txt
index f3bbf9a..838e730 100644
--- a/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040102-keywords-00-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040102-keywords-01-b-expected.png b/LayoutTests/platform/efl/css2.1/t040102-keywords-01-b-expected.png
index 1a62cf4..dcba903 100644
--- a/LayoutTests/platform/efl/css2.1/t040102-keywords-01-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040102-keywords-01-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040102-keywords-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040102-keywords-01-b-expected.txt
index f460b8c..a5aa4a5 100644
--- a/LayoutTests/platform/efl/css2.1/t040102-keywords-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040102-keywords-01-b-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x130
     RenderBody {BODY} at (8,16) size 784x98
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 296x19
+        RenderText {#text} at (0,0) size 296x17
           text run at (0,0) width 296: "The next two paragraphs should look identical:"
       RenderBlock {P} at (0,34) size 166x24 [border: (3px solid #000000)]
-        RenderText {#text} at (3,3) size 31x19
+        RenderText {#text} at (3,3) size 31x17
           text run at (3,3) width 31: "Test."
       RenderBlock {P} at (0,74) size 166x24 [border: (3px solid #000000)]
-        RenderText {#text} at (3,3) size 31x19
+        RenderText {#text} at (3,3) size 31x17
           text run at (3,3) width 31: "Test."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-case-00-b-expected.png b/LayoutTests/platform/efl/css2.1/t040103-case-00-b-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-case-00-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-case-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-case-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-case-00-b-expected.txt
index f3bbf9a..838e730 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-case-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-case-00-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-case-01-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-case-01-c-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-case-01-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-case-01-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-case-01-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-case-01-c-expected.txt
index e598ce2..39a3c3b 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-case-01-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-case-01-c-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-00-b-expected.png b/LayoutTests/platform/efl/css2.1/t040103-escapes-00-b-expected.png
index 594c8a6..a9d2eee 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-00-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-00-b-expected.txt
index b76312a..8290d15 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-00-b-expected.txt
@@ -4,20 +4,20 @@
   RenderBlock {HTML} at (0,0) size 800x152
     RenderBody {BODY} at (8,16) size 784x120
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 337x19
+        RenderText {#text} at (0,0) size 337x17
           text run at (0,0) width 337: "The following three paragraphs should look identical:"
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 149x19
+        RenderText {#text} at (0,0) size 149x17
           text run at (0,0) width 149: "This is a test paragraph."
       RenderBlock {P} at (0,68) size 784x18
-        RenderInline (generated) at (0,0) size 32x19
-          RenderText at (0,0) size 32x19
+        RenderInline (generated) at (0,0) size 32x17
+          RenderText at (0,0) size 32x17
             text run at (0,0) width 32: "This "
-        RenderText {#text} at (32,0) size 117x19
+        RenderText {#text} at (32,0) size 117x17
           text run at (32,0) width 117: "is a test paragraph."
       RenderBlock {P} at (0,102) size 784x18
-        RenderInline (generated) at (0,0) size 32x19
-          RenderText at (0,0) size 32x19
+        RenderInline (generated) at (0,0) size 32x17
+          RenderText at (0,0) size 32x17
             text run at (0,0) width 32: "This "
-        RenderText {#text} at (32,0) size 117x19
+        RenderText {#text} at (32,0) size 117x17
           text run at (32,0) width 117: "is a test paragraph."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-01-b-expected.png b/LayoutTests/platform/efl/css2.1/t040103-escapes-01-b-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-01-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-01-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-01-b-expected.txt
index f3bbf9a..838e730 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-01-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-02-d-expected.png b/LayoutTests/platform/efl/css2.1/t040103-escapes-02-d-expected.png
index 13d4b21..63bc4bc 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-02-d-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-02-d-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-02-d-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-02-d-expected.txt
index 273c071..1f947b1 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-02-d-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-02-d-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 308x19
+        RenderText {#text} at (0,0) size 308x17
           text run at (0,0) width 308: "This paragraph should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-03-b-expected.png b/LayoutTests/platform/efl/css2.1/t040103-escapes-03-b-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-03-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-03-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-03-b-expected.txt
index f3bbf9a..838e730 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-03-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-04-b-expected.png b/LayoutTests/platform/efl/css2.1/t040103-escapes-04-b-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-04-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-04-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-04-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-04-b-expected.txt
index f3bbf9a..838e730 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-04-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-04-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-05-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-escapes-05-c-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-05-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-05-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-05-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-05-c-expected.txt
index f3bbf9a..838e730 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-05-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-05-c-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-06-b-expected.png b/LayoutTests/platform/efl/css2.1/t040103-escapes-06-b-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-06-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-06-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-06-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-06-b-expected.txt
index f3bbf9a..838e730 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-06-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-06-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-07-b-expected.png b/LayoutTests/platform/efl/css2.1/t040103-escapes-07-b-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-07-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-07-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-07-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-07-b-expected.txt
index f3bbf9a..838e730 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-07-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-07-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-08-b-expected.png b/LayoutTests/platform/efl/css2.1/t040103-escapes-08-b-expected.png
index 2518b4e..0480ec9 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-08-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-08-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-escapes-08-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-escapes-08-b-expected.txt
index f3bbf9a..838e730 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-escapes-08-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-escapes-08-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#FFFFFF] [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 241x19
+        RenderText {#text} at (0,0) size 241x17
           text run at (0,0) width 241: "This should have a green background."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-00-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-00-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-00-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-00-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-00-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-00-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-00-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-00-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-01-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-01-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-01-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-01-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-01-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-01-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-01-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-01-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-02-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-02-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-02-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-02-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-02-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-02-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-02-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-02-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-03-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-03-c-expected.png
index 1302a74..f479fdd 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-03-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-03-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-03-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-03-c-expected.txt
index b70a0a9..bece796 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-03-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-03-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#FF0000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#FF0000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-04-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-04-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-04-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-04-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-04-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-04-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-04-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-04-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-05-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-05-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-05-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-05-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-05-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-05-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-05-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-05-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-06-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-06-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-06-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-06-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-06-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-06-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-06-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-06-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-07-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-07-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-07-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-07-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-07-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-07-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-07-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-07-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-08-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-08-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-08-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-08-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-08-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-08-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-08-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-08-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-09-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-09-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-09-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-09-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-09-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-09-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-09-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-09-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-10-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-10-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-10-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-10-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-10-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-10-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-10-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-10-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-11-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-11-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-11-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-11-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-11-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-11-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-11-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-11-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-12-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-12-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-12-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-12-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-12-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-12-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-12-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-12-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-13-c-expected.png b/LayoutTests/platform/efl/css2.1/t040103-ident-13-c-expected.png
index 1976efa..c1c0bfe 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-13-c-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-13-c-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040103-ident-13-c-expected.txt b/LayoutTests/platform/efl/css2.1/t040103-ident-13-c-expected.txt
index a28eea7..ce22222 100644
--- a/LayoutTests/platform/efl/css2.1/t040103-ident-13-c-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040103-ident-13-c-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52
       RenderBlock {P} at (0,0) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-00-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-00-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-00-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-00-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-00-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-01-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-01-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-01-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-01-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-01-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-01-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-02-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-02-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-02-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-02-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-02-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atkeyw-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-atkeyw-02-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-00-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-atrule-00-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-00-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-atrule-00-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-00-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-01-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-atrule-01-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-01-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-01-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-atrule-01-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-01-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-02-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-atrule-02-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-02-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-02-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-02-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-atrule-02-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-02-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-02-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-03-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-atrule-03-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-03-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-03-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-03-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-atrule-03-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-03-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-03-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-04-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-atrule-04-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-04-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-04-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-atrule-04-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-atrule-04-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-atrule-04-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-atrule-04-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-import-00-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-import-00-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-import-00-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-import-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-import-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-import-00-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-import-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-import-00-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-import-01-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-import-01-b-expected.png
index a5d92ea..7faae57 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-import-01-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-import-01-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-import-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-import-01-b-expected.txt
index d2eaa14..2de35c7 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-import-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-import-01-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 136x19
+        RenderText {#text} at (0,0) size 136x17
           text run at (0,0) width 136: "This should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040105-import-10-b-expected.png b/LayoutTests/platform/efl/css2.1/t040105-import-10-b-expected.png
index f26385d..abb7337 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-import-10-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040105-import-10-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040105-import-10-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040105-import-10-b-expected.txt
index 5ac6b3c..bae1d6e 100644
--- a/LayoutTests/platform/efl/css2.1/t040105-import-10-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040105-import-10-b-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 182x19
+        RenderText {#text} at (0,0) size 182x17
           text run at (0,0) width 182: "This sentence must be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040109-c17-comments-00-b-expected.png b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-00-b-expected.png
index 65be504..75f04f4 100644
--- a/LayoutTests/platform/efl/css2.1/t040109-c17-comments-00-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040109-c17-comments-00-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-00-b-expected.txt
index e0e9f86..74ace99 100644
--- a/LayoutTests/platform/efl/css2.1/t040109-c17-comments-00-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-00-b-expected.txt
@@ -4,20 +4,20 @@
   RenderBlock {HTML} at (0,0) size 800x220
     RenderBody {BODY} at (8,16) size 784x188 [color=#FF0000]
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,68) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,102) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,136) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,170) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t040109-c17-comments-01-b-expected.png b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-01-b-expected.png
index bc7c263..54d7596 100644
--- a/LayoutTests/platform/efl/css2.1/t040109-c17-comments-01-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-01-b-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040109-c17-comments-01-b-expected.txt b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-01-b-expected.txt
index 4976567..459a8ac 100644
--- a/LayoutTests/platform/efl/css2.1/t040109-c17-comments-01-b-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040109-c17-comments-01-b-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x84
     RenderBody {BODY} at (8,16) size 784x52 [color=#008000]
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.png
index a220665..a7e6a74 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt
index 597a4be..072db0a 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-00-f-expected.txt
@@ -4,30 +4,30 @@
   RenderBlock {HTML} at (0,0) size 800x322
     RenderBody {BODY} at (8,16) size 784x290
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,34) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {DIV} at (0,68) size 784x18 [color=#008000] [bgcolor=#FFFFFF]
         RenderBlock {P} at (0,0) size 784x18
-          RenderText {#text} at (0,0) size 163x19
+          RenderText {#text} at (0,0) size 163x17
             text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,102) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,136) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,170) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,204) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,238) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,272) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.png
index 7d4c08b..7f751f7 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt
index 8fda5b6..ba7952d 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt
@@ -4,17 +4,17 @@
   RenderBlock {HTML} at (0,0) size 800x210
     RenderBody {BODY} at (8,16) size 784x178 [color=#000080]
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 348x19
+        RenderText {#text} at (0,0) size 348x17
           text run at (0,0) width 348: "The next four blocks should look identical, to the pixel."
       RenderBlock {P} at (0,34) size 784x24 [border: (3px solid #000080)]
-        RenderText {#text} at (3,3) size 27x19
+        RenderText {#text} at (3,3) size 27x17
           text run at (3,3) width 27: "Test"
       RenderBlock {P} at (0,74) size 784x24 [border: (3px solid #000080)]
-        RenderText {#text} at (3,3) size 27x19
+        RenderText {#text} at (3,3) size 27x17
           text run at (3,3) width 27: "Test"
       RenderBlock {P} at (0,114) size 784x24 [border: (3px solid #000080)]
-        RenderText {#text} at (3,3) size 27x19
+        RenderText {#text} at (3,3) size 27x17
           text run at (3,3) width 27: "Test"
       RenderBlock {P} at (0,154) size 784x24 [border: (3px solid #000080)]
-        RenderText {#text} at (3,3) size 27x19
+        RenderText {#text} at (3,3) size 27x17
           text run at (3,3) width 27: "Test"
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
index 287e79d..11ae8b1 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt
index 8eec8d0..e7134ba 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-02-f-expected.txt
@@ -4,59 +4,59 @@
   RenderBlock {HTML} at (0,0) size 800x560
     RenderBody {BODY} at (8,16) size 784x528 [color=#008000]
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,68) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,102) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {OL} at (0,136) size 784x18
         RenderListItem {LI} at (40,0) size 744x18
-          RenderListMarker at (-21,0) size 16x19: "1"
-          RenderText {#text} at (0,0) size 163x19
+          RenderListMarker at (-20,0) size 16x17: "1"
+          RenderText {#text} at (0,0) size 163x17
             text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,170) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {UL} at (0,204) size 784x18
         RenderListItem {LI} at (40,0) size 744x18
-          RenderListMarker at (-18,0) size 7x19: bullet
-          RenderText {#text} at (0,0) size 163x19
+          RenderListMarker at (-17,0) size 7x17: bullet
+          RenderText {#text} at (0,0) size 163x17
             text run at (0,0) width 163: "This line should be green."
       RenderBlock {BLOCKQUOTE} at (40,238) size 704x18
         RenderBlock {P} at (0,0) size 704x18
-          RenderText {#text} at (0,0) size 163x19
+          RenderText {#text} at (0,0) size 163x17
             text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,272) size 784x18
-        RenderInline {ACRONYM} at (0,0) size 163x19
-          RenderText {#text} at (0,0) size 163x19
+        RenderInline {ACRONYM} at (0,0) size 163x17
+          RenderText {#text} at (0,0) size 163x17
             text run at (0,0) width 163: "This line should be green."
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {ADDRESS} at (0,306) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,340) size 784x18
-        RenderInline {SPAN} at (0,0) size 163x19
-          RenderText {#text} at (0,0) size 163x19
+        RenderInline {SPAN} at (0,0) size 163x17
+          RenderText {#text} at (0,0) size 163x17
             text run at (0,0) width 163: "This line should be green."
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,374) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,408) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,442) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
       RenderBlock {P} at (0,476) size 784x18
-        RenderText {#text} at (48,0) size 163x19
+        RenderText {#text} at (48,0) size 163x17
           text run at (48,0) width 163: "This line should be green."
       RenderBlock {P} at (0,510) size 784x18
-        RenderText {#text} at (0,0) size 163x19
+        RenderText {#text} at (0,0) size 163x17
           text run at (0,0) width 163: "This line should be green."
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.png
index 9d476bf..a842018 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt
index cf3c26f..b024d9d 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-03-f-expected.txt
@@ -4,14 +4,14 @@
   RenderBlock {HTML} at (0,0) size 800x152
     RenderBody {BODY} at (8,16) size 784x120 [color=#000080]
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 318x19
+        RenderText {#text} at (0,0) size 318x17
           text run at (0,0) width 318: "These four lines should look identical, to the pixel."
       RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (0,0) size 318x19
+        RenderText {#text} at (0,0) size 318x17
           text run at (0,0) width 318: "These four lines should look identical, to the pixel."
       RenderBlock {P} at (0,68) size 784x18
-        RenderText {#text} at (0,0) size 318x19
+        RenderText {#text} at (0,0) size 318x17
           text run at (0,0) width 318: "These four lines should look identical, to the pixel."
       RenderBlock {P} at (0,102) size 784x18
-        RenderText {#text} at (0,0) size 318x19
+        RenderText {#text} at (0,0) size 318x17
           text run at (0,0) width 318: "These four lines should look identical, to the pixel."
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.png
index d90a2c0..dd14298 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt
index 2cafc7a..45f5bd3 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-04-f-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [bgcolor=#00FF00]
-        RenderText {#text} at (48,0) size 204x19
+        RenderText {#text} at (48,0) size 204x17
           text run at (48,0) width 204: "This line should be bright green."
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-01-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-syntax-01-f-expected.png
index 094055e..9a71cca 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-01-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-01-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-01-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-01-f-expected.txt
index 31bab81..7c08a13d 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-01-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-01-f-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 159x19
+        RenderText {#text} at (0,0) size 159x17
           text run at (0,0) width 159: "This text should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-02-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-syntax-02-f-expected.png
index 094055e..9a71cca 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-02-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-02-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-02-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-02-f-expected.txt
index 31bab81..7c08a13d 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-02-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-02-f-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 159x19
+        RenderText {#text} at (0,0) size 159x17
           text run at (0,0) width 159: "This text should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-03-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-syntax-03-f-expected.png
index 094055e..9a71cca 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-03-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-03-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-03-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-03-f-expected.txt
index 31bab81..7c08a13d 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-03-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-03-f-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 159x19
+        RenderText {#text} at (0,0) size 159x17
           text run at (0,0) width 159: "This text should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-04-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-syntax-04-f-expected.png
index 094055e..9a71cca 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-04-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-04-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-04-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-04-f-expected.txt
index 31bab81..7c08a13d 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-04-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-04-f-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 159x19
+        RenderText {#text} at (0,0) size 159x17
           text run at (0,0) width 159: "This text should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.png
index 094055e..9a71cca 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.txt
index 31bab81..7c08a13d 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-05-f-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 159x19
+        RenderText {#text} at (0,0) size 159x17
           text run at (0,0) width 159: "This text should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-06-f-expected.png b/LayoutTests/platform/efl/css2.1/t0402-syntax-06-f-expected.png
index 094055e..9a71cca 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-06-f-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-06-f-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t0402-syntax-06-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-syntax-06-f-expected.txt
index 31bab81..7c08a13d 100644
--- a/LayoutTests/platform/efl/css2.1/t0402-syntax-06-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-syntax-06-f-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x50
     RenderBody {BODY} at (8,16) size 784x18
       RenderBlock {P} at (0,0) size 784x18 [color=#008000]
-        RenderText {#text} at (0,0) size 159x19
+        RenderText {#text} at (0,0) size 159x17
           text run at (0,0) width 159: "This text should be green"
diff --git a/LayoutTests/platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.png b/LayoutTests/platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.png
index 94bbf66..a447389 100644
--- a/LayoutTests/platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.png
Binary files differ
diff --git a/LayoutTests/platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.txt b/LayoutTests/platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.txt
index 649b059..dbfbdb4 100644
--- a/LayoutTests/platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t040302-c61-ex-len-00-b-a-expected.txt
@@ -4,7 +4,7 @@
   RenderBlock {HTML} at (0,0) size 800x118
     RenderBody {BODY} at (8,16) size 784x86
       RenderBlock {P} at (0,0) size 784x18 [color=#000080]
-        RenderText {#text} at (0,0) size 327x19
+        RenderText {#text} at (0,0) size 327x17
           text run at (0,0) width 327: "The two blocks below should have the same height."
       RenderTable {TABLE} at (80,34) size 102x52
         RenderTableSection {TBODY} at (0,0) size 102x52
diff --git a/LayoutTests/platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.png b/LayoutTests/platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.png
index fffdab3..a4210de 100644
--- a/LayoutTests/platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.png
+++ b/LayoutTests/platform/efl/css2.1/t040302-c61-phys-len-00-b-expected.png
Binary files differ